diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmConfigController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmConfigController.java index b9d5b97c..7e975ff9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmConfigController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmConfigController.java @@ -3,7 +3,7 @@ package com.bonus.material.basic.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; import com.bonus.common.log.enums.OperaType; -import com.bonus.material.annotation.PreventRepeatSubmit; +import com.bonus.material.common.annotation.PreventRepeatSubmit; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/annotation/PreventRepeatSubmit.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/annotation/PreventRepeatSubmit.java similarity index 90% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/annotation/PreventRepeatSubmit.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/common/annotation/PreventRepeatSubmit.java index c43f8657..c2230c7f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/annotation/PreventRepeatSubmit.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/annotation/PreventRepeatSubmit.java @@ -1,4 +1,4 @@ -package com.bonus.material.annotation; +package com.bonus.material.common.annotation; import java.lang.annotation.*; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/aspect/PreventRepeatSubmitAspect.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/aspect/PreventRepeatSubmitAspect.java similarity index 92% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/aspect/PreventRepeatSubmitAspect.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/common/aspect/PreventRepeatSubmitAspect.java index c8bc7d09..78975585 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/aspect/PreventRepeatSubmitAspect.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/aspect/PreventRepeatSubmitAspect.java @@ -1,10 +1,10 @@ -package com.bonus.material.aspect; +package com.bonus.material.common.aspect; import com.alibaba.fastjson2.JSON; import com.bonus.common.biz.exception.BusinessException; import com.bonus.common.biz.enums.HttpCodeEnum; -import com.bonus.material.annotation.PreventRepeatSubmit; -import com.bonus.material.utils.RedisCache; +import com.bonus.material.common.annotation.PreventRepeatSubmit; +import com.bonus.material.common.utils.RedisCache; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -30,7 +30,7 @@ public class PreventRepeatSubmitAspect { private RedisCache redisCache; // 定义一个切入点 - @Pointcut("@annotation(com.bonus.material.annotation.PreventRepeatSubmit)") + @Pointcut("@annotation(com.bonus.material.common.annotation.PreventRepeatSubmit)") public void preventRepeatSubmit() { } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/constant/BmConfigItems.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/constant/BmConfigItems.java deleted file mode 100644 index 748e58a7..00000000 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/constant/BmConfigItems.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.bonus.material.common.constant; - -public class BmConfigItems { - public final String LEASE_AUDIT_ROLE_KEYS = "LeaseAuditRoleKeys"; - -} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/constant/MaterialConstants.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/constant/MaterialConstants.java deleted file mode 100644 index 8dae6d63..00000000 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/constant/MaterialConstants.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.bonus.material.common.constant; - -/** - * 仓储通用常量信息 - * - * @author bonus - */ -public class MaterialConstants -{ - private MaterialConstants(){} - /** - * UTF-8 字符集 - */ - public static final String UTF8 = "UTF-8"; - - -} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/utils/RedisCache.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/utils/RedisCache.java similarity index 99% rename from bonus-modules/bonus-material/src/main/java/com/bonus/material/utils/RedisCache.java rename to bonus-modules/bonus-material/src/main/java/com/bonus/material/common/utils/RedisCache.java index c84f4119..57d60ed5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/utils/RedisCache.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/common/utils/RedisCache.java @@ -1,4 +1,4 @@ -package com.bonus.material.utils; +package com.bonus.material.common.utils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.BoundSetOperations;