diff --git a/chushang-common/chushang-common-bom/pom.xml b/chushang-common/chushang-common-bom/pom.xml index 29ddd54..16bb033 100644 --- a/chushang-common/chushang-common-bom/pom.xml +++ b/chushang-common/chushang-common-bom/pom.xml @@ -97,6 +97,11 @@ chushang-common-security ${common.version} + + com.chushang + chushang-common-web + ${common.version} + diff --git a/chushang-common/chushang-common-web/pom.xml b/chushang-common/chushang-common-web/pom.xml new file mode 100644 index 0000000..c58dc7d --- /dev/null +++ b/chushang-common/chushang-common-web/pom.xml @@ -0,0 +1,41 @@ + + + + chushang-common + com.chushang + 1.0.0 + + + 4.0.0 + + chushang-common-web + + + com.chushang + chushang-common-core + + + com.chushang + chushang-common-redis + + + org.springframework.boot + spring-boot-starter-web + + + com.alibaba.fastjson2 + fastjson2 + + + + + + src/main/resources + false + + + + + diff --git a/chushang-common/chushang-common-core/src/main/java/com/chushang/common/core/web/advice/CacheLRUMap.java b/chushang-common/chushang-common-web/src/main/java/com/chushang/common/web/advice/CacheLRUMap.java similarity index 94% rename from chushang-common/chushang-common-core/src/main/java/com/chushang/common/core/web/advice/CacheLRUMap.java rename to chushang-common/chushang-common-web/src/main/java/com/chushang/common/web/advice/CacheLRUMap.java index 960193c..8e16c69 100644 --- a/chushang-common/chushang-common-core/src/main/java/com/chushang/common/core/web/advice/CacheLRUMap.java +++ b/chushang-common/chushang-common-web/src/main/java/com/chushang/common/web/advice/CacheLRUMap.java @@ -1,4 +1,4 @@ -package com.chushang.common.core.web.advice; +package com.chushang.common.web.advice; import java.io.Serial; import java.util.LinkedHashMap; diff --git a/chushang-common/chushang-common-core/src/main/java/com/chushang/common/core/web/advice/IdempotentAdvice.java b/chushang-common/chushang-common-web/src/main/java/com/chushang/common/web/advice/IdempotentAdvice.java similarity index 88% rename from chushang-common/chushang-common-core/src/main/java/com/chushang/common/core/web/advice/IdempotentAdvice.java rename to chushang-common/chushang-common-web/src/main/java/com/chushang/common/web/advice/IdempotentAdvice.java index b705d3a..aaa99ec 100644 --- a/chushang-common/chushang-common-core/src/main/java/com/chushang/common/core/web/advice/IdempotentAdvice.java +++ b/chushang-common/chushang-common-web/src/main/java/com/chushang/common/web/advice/IdempotentAdvice.java @@ -1,4 +1,3 @@ -package com.chushang.common.core.web.advice; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; @@ -6,8 +5,8 @@ import cn.hutool.extra.servlet.ServletUtil; import com.alibaba.fastjson2.JSON; import com.chushang.common.core.exception.utils.AssertUtil; import com.chushang.common.core.util.IPUtils; -import com.chushang.common.core.util.StringUtils; -import com.chushang.common.core.web.annotation.AutoIdempotent; +import com.chushang.common.web.advice.CacheLRUMap; +import com.chushang.common.web.annotation.AutoIdempotent; import lombok.RequiredArgsConstructor; import org.springframework.core.MethodParameter; import org.springframework.http.HttpInputMessage; @@ -15,12 +14,8 @@ import org.springframework.http.converter.HttpMessageConverter; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.servlet.mvc.method.annotation.RequestBodyAdviceAdapter; -import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Type; -import java.time.Duration; -import java.util.LinkedHashMap; -import java.util.Map; @RestControllerAdvice @SuppressWarnings("all") diff --git a/chushang-common/chushang-common-core/src/main/java/com/chushang/common/core/web/annotation/AutoIdempotent.java b/chushang-common/chushang-common-web/src/main/java/com/chushang/common/web/annotation/AutoIdempotent.java similarity index 87% rename from chushang-common/chushang-common-core/src/main/java/com/chushang/common/core/web/annotation/AutoIdempotent.java rename to chushang-common/chushang-common-web/src/main/java/com/chushang/common/web/annotation/AutoIdempotent.java index 789612e..5004d3c 100644 --- a/chushang-common/chushang-common-core/src/main/java/com/chushang/common/core/web/annotation/AutoIdempotent.java +++ b/chushang-common/chushang-common-web/src/main/java/com/chushang/common/web/annotation/AutoIdempotent.java @@ -1,4 +1,4 @@ -package com.chushang.common.core.web.annotation; +package com.chushang.common.web.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/chushang-common/chushang-common-web/src/main/resources/META-INF/spring.factories b/chushang-common/chushang-common-web/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..ab43764 --- /dev/null +++ b/chushang-common/chushang-common-web/src/main/resources/META-INF/spring.factories @@ -0,0 +1 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration= diff --git a/chushang-common/pom.xml b/chushang-common/pom.xml index b7294bd..8f65f23 100644 --- a/chushang-common/pom.xml +++ b/chushang-common/pom.xml @@ -31,5 +31,6 @@ chushang-common-mybatis-plugin chushang-common-redis chushang-common-security + chushang-common-web diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/pom.xml b/chushang-modules/chushang-module-inspection/inspection-feign/pom.xml index 6b1a3f4..276bc39 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/pom.xml +++ b/chushang-modules/chushang-module-inspection/inspection-feign/pom.xml @@ -21,6 +21,10 @@ com.chushang oss-feign + + com.chushang + chushang-common-web + diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java index 626c533..24613cc 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java @@ -35,10 +35,6 @@ import java.util.List; public class WrkProjectService extends ServiceImpl implements IService { @Resource WrkProjectContractService contractService; - @Resource - WrkAuditService auditService; - - @DataScope public PageResult pageList(WrkProject project, CommonParam commonParam) { diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkIcbcJsController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkIcbcJsController.java index fd063ea..ff2ac60 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkIcbcJsController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkIcbcJsController.java @@ -2,9 +2,9 @@ package com.chushang.inspection.work.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import com.chushang.common.core.web.AjaxResult; -import com.chushang.common.core.web.annotation.AutoIdempotent; import com.chushang.common.log.annotation.SysLog; import com.chushang.common.log.enums.BusinessType; +import com.chushang.common.web.annotation.AutoIdempotent; import com.chushang.inspection.work.dto.BankDispatchQuery; import com.chushang.inspection.work.dto.WrkIcbcJsReceive; import com.chushang.inspection.work.po.WrkIcbcJs;