From 47f2a74ca7b3c6db87d12e5a1e1d230a3d0a8850 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 27 Jan 2025 22:43:09 +0800 Subject: [PATCH] pwd --- bonus-common-biz/pom.xml | 6 ++++++ .../main/java/net/xnzn/{utils => constant}/RetCodeEnum.java | 6 +----- .../src/main/java/net/xnzn}/utils/AesEncryptUtil.java | 4 ++-- .../src/main/java/net/xnzn}/utils/DataEncDecProperties.java | 2 +- .../src/main/java/net/xnzn}/utils/Id.java | 2 +- .../src/main/java/net/xnzn}/utils/SM4EncryptUtils.java | 2 +- bonus-modules/bonus-smart-canteen/pom.xml | 5 ----- 7 files changed, 12 insertions(+), 15 deletions(-) rename bonus-common-biz/src/main/java/net/xnzn/{utils => constant}/RetCodeEnum.java (71%) rename {bonus-cust-auth/src/main/java/com/bonus/auth => bonus-common-biz/src/main/java/net/xnzn}/utils/AesEncryptUtil.java (97%) rename {bonus-cust-auth/src/main/java/com/bonus/auth => bonus-common-biz/src/main/java/net/xnzn}/utils/DataEncDecProperties.java (96%) rename {bonus-cust-auth/src/main/java/com/bonus/auth => bonus-common-biz/src/main/java/net/xnzn}/utils/Id.java (98%) rename {bonus-cust-auth/src/main/java/com/bonus/auth => bonus-common-biz/src/main/java/net/xnzn}/utils/SM4EncryptUtils.java (98%) diff --git a/bonus-common-biz/pom.xml b/bonus-common-biz/pom.xml index 7d05a851..02219f0d 100644 --- a/bonus-common-biz/pom.xml +++ b/bonus-common-biz/pom.xml @@ -215,6 +215,12 @@ com.bonus bonus-common-security + + com.google.guava + guava + 33.0.0-jre + compile + diff --git a/bonus-common-biz/src/main/java/net/xnzn/utils/RetCodeEnum.java b/bonus-common-biz/src/main/java/net/xnzn/constant/RetCodeEnum.java similarity index 71% rename from bonus-common-biz/src/main/java/net/xnzn/utils/RetCodeEnum.java rename to bonus-common-biz/src/main/java/net/xnzn/constant/RetCodeEnum.java index 13bfa2ba..7d056317 100644 --- a/bonus-common-biz/src/main/java/net/xnzn/utils/RetCodeEnum.java +++ b/bonus-common-biz/src/main/java/net/xnzn/constant/RetCodeEnum.java @@ -1,4 +1,4 @@ -package net.xnzn.utils; +package net.xnzn.constant; public enum RetCodeEnum { SUCC(10000, "成功"), @@ -173,8 +173,4 @@ public enum RetCodeEnum { return this.desc; } - // $FF: synthetic method - private static RetCodeEnum[] $values() { - return new RetCodeEnum[]{SUCC, SUCC_MAC_ORD, FAIL, PAY_BALANCE_NO_ENOUGH, PAY_PERSONAL_NO_EXIT, PAY_CARD_NO_EXIT, PAY_CARD_STATE_ABNORMAL, PAY_ACC_STATE_ABNORMAL, PAY_MACHINE_NO_EXIT, PAY_MACHINE_NO_ALLOW, PAY_PERSONAL_NO_ALLOWTYPE, PAY_TIME_NO_EXIT, PAY_TIME_QUOTA_LIMIT, PAY_SELECT_ORD_NO_EXIT, PAY_QRCODE_ORD_ERROR, PAY_QRCODE_ING, PAY_TYPE_NO_OPEN, PAY_ORD_ID_EXIT, PAY_RECHARGE_NO_EXIT, PAY_THIRD_PAY_FAIL, PAY_QR_ILLEGAL, PAY_QR_NOT_PAY, PAY_COUPON_UNIVERSAL_DISABLED, PAY_ORD_LOSE, PAY_ORD_CANCEL, PAY_ORD_ING, PAY_ORD_END, CORE_PARAM_ERROR, BAS_CONF_NOT_SET, CORE_DATE_START_GREATER_END, BAS_INTERVAL_NO_EXIT, CORE_IMPORT_FORMAT_ERR, CORE_IMPORT_EMPTY, CORE_IMPORT_FIELD_EMPTY, ACC_CRAD_NUM_EXIST, ACC_STATE_EXCEPTION, ACC_CARD_NUM_MAX_LIMIT, ACC_DATA_ALREADY_EXIST, ACC_SUBRULE_ALREADY_EXIST, RECHARGE_NO_AUTH, ACC_INFO_NO_EXIT, RECHARGE_NO_EXIST, REFUND_AMOUNT_GREATER, PAY_FAIL_REFUSE_REFUND, CUST_CLOSE_REFUSE_REFUND, NOT_REPEAT_REFUND, ACC_BAL_NOT_ENOUGH, BAS_TABLE_IN_USE, BAS_TABLE_NOT_IN_USE, BAS_TABLE_NOT_BIND_ORD, BAS_CANTEEN_NO_EXIT, BAS_NO_SYS_CARDINFO, CUST_PERSONAL_NO_EXIT, CUST_CASUAL_NO_BIND, CUSTINFO_ALREADY_EXISTS, CUST_ROOT_DEL_NOT_ALLOW, CUST_EXIST_RELAT, CUST_PHOTO_FACE_FAIL, CUST_STATE_EXCEPTION, CUST_LIMIT_ID_MAX_LIMIT, CUST_PSN_TYPE_OUT_RANGE, CUST_CASUAL_UNABLE_BIND, CUST_IMPORT_FORMAT_ERR, MAC_NO_HEADER_SN, MAC_APP_VERSION_NOEXIT, MAC_APP_VERSION_NOTUP, MAC_IS_NOT_EMPTY_MEALS_COUNTER, MAC_NO_PARAM_LIST, MAC_NO_PARAM_ENTITY, MAC_NO_PARAM_VARIABLE, MAC_ERR_SQL_DATE, MAC_ERR_BIND, MAC_MACHINE_NO_EXIT, MAC_MACHINE_NO_BIND_CANTEEN, MENU_NO_RECIPE, MENU_NO_RECIPE_TYPE, MENU_REPEAT_NAME, MENU_IS_USED_DISHES_COOK, MENU_REPEAT_DISHES_LABEL, MENU_IS_USED_DISHES_LABEL, MENU_EXCEED_MAX_LIMIT, MENU_NO_MATERIAL, MENU_IS_USED_DISHES, MENU_NOT_EXIST_DISHES, MENU_NOT_EXIST_RECIPE_DETAIL, MENU_NOT_EXIST_RECIPE, MENU_REPEAT_DISHES_TASTE, MENU_IS_USED_DISHES_TASTE, MENU_REPEAT_DISHES_TYPE, MENU_IS_USED_DISHES_TYPE, MENU_IS_USED_MATERIAL, MENU_NO_DISHES, MENU_NOT_EXIST_PACKAGE_MEAL, MENU_NO_PROPORTION, MENU_IS_USED_PRODUCT, MENU_NOT_EXIST_PRODUCT, MENU_ERR_RECIPE_TYPE, MENU_ERR_RECIPE_DEFAULT_LIMIT, MENU_REPEAT_DISHES, MENU_REPEAT_PRODUCT, MENU_REPEAT_PACKAGE_MEAL, MENU_NO_APPLY_DATE, MENU_NO_PARAM_LIST, MENU_NO_PARAM_ENTITY, MENU_NO_PARAM_VARIABLE, MENU_ERR_SQL_DATE, MENU_EXCEED_RESTRICT_NUM, MENU_EXCEED_SURPLUS_NUM, MENU_NOT_EXIST_TIME_INTERVAL, MENU_REPEAT_RECIPE, MENU_NOT_IN_TIME_INTERVAL, MENU_REPEAT_DISHES_COOK, MENU_IS_USED_DISHES_CLASSIFY, MENU_IS_USED_DISHES_EFFECT, MENU_IS_USED_DISHES_STYLE, MENU_IS_USED_DISHES_SUIT, MERCHANT_NOT_REGISTER, MKT_ERROR_PARAM, MGR_REPEAT_ROLE_NAME, MGR_REPEAT_USER_NAME, DRP_NO_SUPPLIER_ID, DRP_NO_WAREHOUSE_ID, DRP_NO_UNIT_ID, DRP_REPEAT_UNIT, DRP_REPEAT_HOUSE_MATERIAL, DRP_EXIST_MATERIAL_NUM, DRP_NOT_EXIST_HOUSE_MATERIAL, DRP_IS_USED_HOUSE_MATERIAL, DRP_ERR_SQL_DATE, DRP_NOT_EXIST_INTO_INVENTORY, DRP_ALREADY_INTO_INVENTORY, DRP_INVENTORY_DEFICIENCY, DRP_NOT_EXIST_OUT_INVENTORY, DRP_ALREADY_OUT_INVENTORY, DRP_NOT_EXIST_PURCHASE_ORDER, DRP_NOT_EXIST_PURCHASE_PLAN, DRP_NOT_EXIST_ISSUE, DRP_REPEAT_MATERIAL_CATEGORY, DRP_NOT_EXIST_CHECK_INVENTORY, DRP_ALREADY_CHECK_INVENTORY, ORD_TRADE_ASSEM_ERR, ORD_REFUND_FAIL, ORD_INFO_NO_EXIT, ORD_UNABLE_SUBSCRIBE, ORD_STATE_ERR, PRE_ORDER_FAIL, PRE_API_FAIL, MENUAI_NO_CONFIG, MENUAI_NO_UPLOAD_DTO, MENUAI_NO_RECIPE, MENUAI_REGIST_EXCEPTION, MENUAI_REGISTING, DD_LACK_DD_CONFIG_PARAM, DD_NOT_EXIT_SOURCE, FACE_REGISTER_FAIL}; - } } diff --git a/bonus-cust-auth/src/main/java/com/bonus/auth/utils/AesEncryptUtil.java b/bonus-common-biz/src/main/java/net/xnzn/utils/AesEncryptUtil.java similarity index 97% rename from bonus-cust-auth/src/main/java/com/bonus/auth/utils/AesEncryptUtil.java rename to bonus-common-biz/src/main/java/net/xnzn/utils/AesEncryptUtil.java index 15548cb1..afca50da 100644 --- a/bonus-cust-auth/src/main/java/com/bonus/auth/utils/AesEncryptUtil.java +++ b/bonus-common-biz/src/main/java/net/xnzn/utils/AesEncryptUtil.java @@ -1,4 +1,4 @@ -package com.bonus.auth.utils; +package net.xnzn.utils; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.StrUtil; @@ -10,7 +10,7 @@ import cn.hutool.crypto.symmetric.AES; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import javax.annotation.Resource; + import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; import java.nio.charset.StandardCharsets; diff --git a/bonus-cust-auth/src/main/java/com/bonus/auth/utils/DataEncDecProperties.java b/bonus-common-biz/src/main/java/net/xnzn/utils/DataEncDecProperties.java similarity index 96% rename from bonus-cust-auth/src/main/java/com/bonus/auth/utils/DataEncDecProperties.java rename to bonus-common-biz/src/main/java/net/xnzn/utils/DataEncDecProperties.java index c7ca99e5..e5754fcd 100644 --- a/bonus-cust-auth/src/main/java/com/bonus/auth/utils/DataEncDecProperties.java +++ b/bonus-common-biz/src/main/java/net/xnzn/utils/DataEncDecProperties.java @@ -1,4 +1,4 @@ -package com.bonus.auth.utils; +package net.xnzn.utils; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/bonus-cust-auth/src/main/java/com/bonus/auth/utils/Id.java b/bonus-common-biz/src/main/java/net/xnzn/utils/Id.java similarity index 98% rename from bonus-cust-auth/src/main/java/com/bonus/auth/utils/Id.java rename to bonus-common-biz/src/main/java/net/xnzn/utils/Id.java index 3cdb66aa..756ad3d2 100644 --- a/bonus-cust-auth/src/main/java/com/bonus/auth/utils/Id.java +++ b/bonus-common-biz/src/main/java/net/xnzn/utils/Id.java @@ -1,4 +1,4 @@ -package com.bonus.auth.utils; +package net.xnzn.utils; import com.google.common.base.Preconditions; diff --git a/bonus-cust-auth/src/main/java/com/bonus/auth/utils/SM4EncryptUtils.java b/bonus-common-biz/src/main/java/net/xnzn/utils/SM4EncryptUtils.java similarity index 98% rename from bonus-cust-auth/src/main/java/com/bonus/auth/utils/SM4EncryptUtils.java rename to bonus-common-biz/src/main/java/net/xnzn/utils/SM4EncryptUtils.java index 3c55b346..281690ac 100644 --- a/bonus-cust-auth/src/main/java/com/bonus/auth/utils/SM4EncryptUtils.java +++ b/bonus-common-biz/src/main/java/net/xnzn/utils/SM4EncryptUtils.java @@ -1,4 +1,4 @@ -package com.bonus.auth.utils; +package net.xnzn.utils; import cn.hutool.core.util.DesensitizedUtil; import cn.hutool.crypto.SecureUtil; diff --git a/bonus-modules/bonus-smart-canteen/pom.xml b/bonus-modules/bonus-smart-canteen/pom.xml index a4ad1a33..9e973958 100644 --- a/bonus-modules/bonus-smart-canteen/pom.xml +++ b/bonus-modules/bonus-smart-canteen/pom.xml @@ -123,11 +123,6 @@ alipay-sdk-java 4.34.0.ALL - - - - -