From 18495e0f37d6afbb3ad54cd9737e7531ad890b4b Mon Sep 17 00:00:00 2001 From: toesbieya <1647775459@qq.com> Date: Mon, 3 Aug 2020 16:17:54 +0800 Subject: [PATCH] =?UTF-8?q?cloud=E7=89=88=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/toesbieya/jxc/api/FileApi.java | 15 ++++ .../jxc/api/{service => }/RecordApi.java | 5 +- .../jxc/api/{service => }/StockApi.java | 2 +- .../{service => }/system/DepartmentApi.java | 2 +- .../api/{service => }/system/ResourceApi.java | 2 +- .../jxc/api/{service => }/system/RoleApi.java | 2 +- .../jxc/api/vo/AttachmentOperation.java | 18 ----- .../jxc/common/{utils => util}/DateUtil.java | 2 +- .../jxc/common/{utils => util}/RedisUtil.java | 2 +- .../common/{utils => util}/SessionUtil.java | 2 +- .../common/{utils => util}/SpringUtil.java | 2 +- .../jxc/common/{utils => util}/Util.java | 2 +- .../common/{utils => util}/WebSocketUtil.java | 2 +- .../jxc/gateway/filter/SecurityFilter.java | 4 +- .../nacos-config/jxc-common-database.yml | 2 +- java/cloud/nacos-config/jxc-gateway.yml | 5 ++ ...{jxc-common-qiniu.yml => jxc-web-file.yml} | 3 + java/cloud/nacos-config/jxc-web-message.yml | 2 +- java/cloud/nacos-config/jxc-web-record.yml | 2 +- java/cloud/nacos-config/jxc-web-statistic.yml | 2 +- java/cloud/nacos-config/jxc-web-stock.yml | 2 +- java/cloud/nacos-config/jxc-web-system.yml | 2 +- .../toesbieya/jxc/schedule/task/DocTask.java | 4 +- .../jxc/schedule/task/SessionTask.java | 2 +- .../jxc/schedule/task/StatisticTask.java | 2 +- java/cloud/web/file/pom.xml | 20 +++++ .../toesbieya/jxc/file/FileApplication.java | 11 +++ .../jxc/file/config/QiniuConfig.java | 16 ++++ .../jxc/file/config/QiniuProperty.java | 45 +++++++++++ .../jxc/file/config/QiniuTemplate.java | 54 +++++++++++++ .../jxc/file/controller/FileController.java | 33 ++++++++ .../jxc/file/service/FileService.java | 34 +++++++++ .../web/file/src/main/resources/bootstrap.yml | 22 ++++++ java/cloud/web/pom.xml | 2 +- java/cloud/web/web-common/pom.xml | 22 +----- .../jxc/web/common/aspect/LockAspect.java | 4 +- .../common/aspect/RestExceptionAspect.java | 13 ++-- .../web/common/aspect/UserActionAspect.java | 6 +- .../jxc/web/common/config/QiniuConfig.java | 24 ------ .../interceptor/SecurityInterceptor.java | 17 +---- .../interceptor/UserActionInterceptor.java | 2 +- .../web/common/{utils => util}/ExcelUtil.java | 2 +- .../web/common/{utils => util}/HttpUtil.java | 2 +- .../web/common/{utils => util}/IpUtil.java | 4 +- .../common/{utils => util}/SecurityUtil.java | 2 +- .../common/{utils => util}/SessionUtil.java | 4 +- .../common/{utils => util}/ThreadUtil.java | 4 +- .../web/common/{utils => util}/WebUtil.java | 3 +- .../jxc/web/common/utils/QiniuUtil.java | 76 ------------------- .../account/controller/AccountController.java | 4 +- .../jxc/account/service/AccountService.java | 20 ++--- .../account/src/main/resources/bootstrap.yml | 3 +- .../controller/PurchaseInboundController.java | 2 +- .../controller/PurchaseOrderController.java | 2 +- .../doc/controller/SellOrderController.java | 2 +- .../controller/SellOutboundController.java | 2 +- .../jxc/doc/model/vo/DocHistorySearch.java | 7 +- .../jxc/doc/service/DocHistoryService.java | 8 +- .../doc/service/PurchaseInboundService.java | 13 ++-- .../jxc/doc/service/PurchaseOrderService.java | 9 +-- .../jxc/doc/service/SellOrderService.java | 11 ++- .../jxc/doc/service/SellOutboundService.java | 13 ++-- .../cn/toesbieya/jxc/doc/util/DocUtil.java | 4 +- .../message/controller/ManageController.java | 2 +- .../message/controller/UserController.java | 2 +- .../jxc/message/service/ManageService.java | 2 +- .../jxc/record/service/RecordService.java | 34 +++++---- .../record/src/main/resources/bootstrap.yml | 5 +- .../statistic/service/StatisticService.java | 4 +- .../jxc/stock/service/StockService.java | 4 +- .../jxc/system/controller/RoleController.java | 2 +- .../jxc/system/controller/UserController.java | 2 +- .../jxc/system/service/CustomerService.java | 2 +- .../jxc/system/service/DepartmentService.java | 4 +- .../jxc/system/service/ResourceService.java | 2 +- .../jxc/system/service/RoleService.java | 2 +- .../jxc/system/service/SupplierService.java | 2 +- .../jxc/system/service/UserService.java | 4 +- .../config/RedisEventListenerConfig.java | 4 +- .../jxc/socket/server/WebSocketServer.java | 4 +- 80 files changed, 407 insertions(+), 286 deletions(-) create mode 100644 java/cloud/api/src/main/java/cn/toesbieya/jxc/api/FileApi.java rename java/cloud/api/src/main/java/cn/toesbieya/jxc/api/{service => }/RecordApi.java (75%) rename java/cloud/api/src/main/java/cn/toesbieya/jxc/api/{service => }/StockApi.java (92%) rename java/cloud/api/src/main/java/cn/toesbieya/jxc/api/{service => }/system/DepartmentApi.java (89%) rename java/cloud/api/src/main/java/cn/toesbieya/jxc/api/{service => }/system/ResourceApi.java (85%) rename java/cloud/api/src/main/java/cn/toesbieya/jxc/api/{service => }/system/RoleApi.java (73%) delete mode 100644 java/cloud/api/src/main/java/cn/toesbieya/jxc/api/vo/AttachmentOperation.java rename java/cloud/common/src/main/java/cn/toesbieya/jxc/common/{utils => util}/DateUtil.java (97%) rename java/cloud/common/src/main/java/cn/toesbieya/jxc/common/{utils => util}/RedisUtil.java (99%) rename java/cloud/common/src/main/java/cn/toesbieya/jxc/common/{utils => util}/SessionUtil.java (97%) rename java/cloud/common/src/main/java/cn/toesbieya/jxc/common/{utils => util}/SpringUtil.java (96%) rename java/cloud/common/src/main/java/cn/toesbieya/jxc/common/{utils => util}/Util.java (98%) rename java/cloud/common/src/main/java/cn/toesbieya/jxc/common/{utils => util}/WebSocketUtil.java (96%) rename java/cloud/nacos-config/{jxc-common-qiniu.yml => jxc-web-file.yml} (76%) create mode 100644 java/cloud/web/file/pom.xml create mode 100644 java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/FileApplication.java create mode 100644 java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/config/QiniuConfig.java create mode 100644 java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/config/QiniuProperty.java create mode 100644 java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/config/QiniuTemplate.java create mode 100644 java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/controller/FileController.java create mode 100644 java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/service/FileService.java create mode 100644 java/cloud/web/file/src/main/resources/bootstrap.yml delete mode 100644 java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/config/QiniuConfig.java rename java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/{utils => util}/ExcelUtil.java (99%) rename java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/{utils => util}/HttpUtil.java (93%) rename java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/{utils => util}/IpUtil.java (98%) rename java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/{utils => util}/SecurityUtil.java (92%) rename java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/{utils => util}/SessionUtil.java (62%) rename java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/{utils => util}/ThreadUtil.java (94%) rename java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/{utils => util}/WebUtil.java (95%) delete mode 100644 java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/QiniuUtil.java diff --git a/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/FileApi.java b/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/FileApi.java new file mode 100644 index 0000000..24ce9e7 --- /dev/null +++ b/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/FileApi.java @@ -0,0 +1,15 @@ +package cn.toesbieya.jxc.api; + +import java.util.List; + +public interface FileApi { + String getToken(); + + void delete(String key); + + void deleteBatch(String... key); + + default void deleteBatch(List key) { + deleteBatch(key.toArray(new String[0])); + } +} diff --git a/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/service/RecordApi.java b/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/RecordApi.java similarity index 75% rename from java/cloud/api/src/main/java/cn/toesbieya/jxc/api/service/RecordApi.java rename to java/cloud/api/src/main/java/cn/toesbieya/jxc/api/RecordApi.java index 91172a9..eda07ff 100644 --- a/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/service/RecordApi.java +++ b/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/RecordApi.java @@ -1,6 +1,5 @@ -package cn.toesbieya.jxc.api.service; +package cn.toesbieya.jxc.api; -import cn.toesbieya.jxc.api.vo.AttachmentOperation; import cn.toesbieya.jxc.common.model.entity.RecAttachment; import cn.toesbieya.jxc.common.model.entity.RecLoginHistory; import cn.toesbieya.jxc.common.model.entity.RecUserAction; @@ -10,7 +9,7 @@ import java.util.List; public interface RecordApi { List getAttachmentByPid(String pid); - void handleAttachment(AttachmentOperation vo); + void handleAttachment(List upload, List delete); void delAttachmentByPid(String pid); diff --git a/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/service/StockApi.java b/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/StockApi.java similarity index 92% rename from java/cloud/api/src/main/java/cn/toesbieya/jxc/api/service/StockApi.java rename to java/cloud/api/src/main/java/cn/toesbieya/jxc/api/StockApi.java index fc88b13..53c321b 100644 --- a/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/service/StockApi.java +++ b/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/StockApi.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.api.service; +package cn.toesbieya.jxc.api; import cn.toesbieya.jxc.common.model.entity.BizStock; import cn.toesbieya.jxc.common.model.vo.StockOutboundVo; diff --git a/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/service/system/DepartmentApi.java b/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/system/DepartmentApi.java similarity index 89% rename from java/cloud/api/src/main/java/cn/toesbieya/jxc/api/service/system/DepartmentApi.java rename to java/cloud/api/src/main/java/cn/toesbieya/jxc/api/system/DepartmentApi.java index 34bb452..83d894c 100644 --- a/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/service/system/DepartmentApi.java +++ b/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/system/DepartmentApi.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.api.service.system; +package cn.toesbieya.jxc.api.system; import cn.toesbieya.jxc.common.model.entity.SysUser; import cn.toesbieya.jxc.common.model.vo.DepartmentVo; diff --git a/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/service/system/ResourceApi.java b/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/system/ResourceApi.java similarity index 85% rename from java/cloud/api/src/main/java/cn/toesbieya/jxc/api/service/system/ResourceApi.java rename to java/cloud/api/src/main/java/cn/toesbieya/jxc/api/system/ResourceApi.java index 49d8019..75d1ad0 100644 --- a/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/service/system/ResourceApi.java +++ b/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/system/ResourceApi.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.api.service.system; +package cn.toesbieya.jxc.api.system; import cn.toesbieya.jxc.common.model.entity.SysRole; import cn.toesbieya.jxc.common.model.vo.ResourceVo; diff --git a/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/service/system/RoleApi.java b/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/system/RoleApi.java similarity index 73% rename from java/cloud/api/src/main/java/cn/toesbieya/jxc/api/service/system/RoleApi.java rename to java/cloud/api/src/main/java/cn/toesbieya/jxc/api/system/RoleApi.java index e9707dc..3c5499f 100644 --- a/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/service/system/RoleApi.java +++ b/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/system/RoleApi.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.api.service.system; +package cn.toesbieya.jxc.api.system; import cn.toesbieya.jxc.common.model.entity.SysRole; diff --git a/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/vo/AttachmentOperation.java b/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/vo/AttachmentOperation.java deleted file mode 100644 index 5900568..0000000 --- a/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/vo/AttachmentOperation.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.toesbieya.jxc.api.vo; - -import cn.toesbieya.jxc.common.model.entity.RecAttachment; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.List; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class AttachmentOperation implements Serializable { - private static final long serialVersionUID = 1L; - private List uploadImageList; - private List deleteImageList; -} diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/DateUtil.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/DateUtil.java similarity index 97% rename from java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/DateUtil.java rename to java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/DateUtil.java index 2af02f7..282fee0 100644 --- a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/DateUtil.java +++ b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/DateUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.common.utils; +package cn.toesbieya.jxc.common.util; import java.time.Instant; import java.time.LocalDateTime; diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/RedisUtil.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/RedisUtil.java similarity index 99% rename from java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/RedisUtil.java rename to java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/RedisUtil.java index 8e2eba4..39a8a6c 100644 --- a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/RedisUtil.java +++ b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/RedisUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.common.utils; +package cn.toesbieya.jxc.common.util; import com.google.common.io.ByteStreams; import lombok.extern.slf4j.Slf4j; diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/SessionUtil.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/SessionUtil.java similarity index 97% rename from java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/SessionUtil.java rename to java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/SessionUtil.java index 90e515a..2f48e3b 100644 --- a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/SessionUtil.java +++ b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/SessionUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.common.utils; +package cn.toesbieya.jxc.common.util; import cn.toesbieya.jxc.common.model.entity.SysUser; import cn.toesbieya.jxc.common.model.vo.UserVo; diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/SpringUtil.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/SpringUtil.java similarity index 96% rename from java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/SpringUtil.java rename to java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/SpringUtil.java index b0e7a37..7198e4d 100644 --- a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/SpringUtil.java +++ b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/SpringUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.common.utils; +package cn.toesbieya.jxc.common.util; import org.springframework.expression.EvaluationContext; import org.springframework.expression.ExpressionParser; diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/Util.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/Util.java similarity index 98% rename from java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/Util.java rename to java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/Util.java index bea2786..6188222 100644 --- a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/Util.java +++ b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/Util.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.common.utils; +package cn.toesbieya.jxc.common.util; import org.springframework.util.StringUtils; diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/WebSocketUtil.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/WebSocketUtil.java similarity index 96% rename from java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/WebSocketUtil.java rename to java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/WebSocketUtil.java index 65f0a23..cfde600 100644 --- a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/utils/WebSocketUtil.java +++ b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/util/WebSocketUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.common.utils; +package cn.toesbieya.jxc.common.util; import cn.toesbieya.jxc.common.model.vo.SocketEventVo; import cn.toesbieya.jxc.common.constant.SocketConstant; diff --git a/java/cloud/gateway/src/main/java/cn/toesbieya/jxc/gateway/filter/SecurityFilter.java b/java/cloud/gateway/src/main/java/cn/toesbieya/jxc/gateway/filter/SecurityFilter.java index 059c476..5388884 100644 --- a/java/cloud/gateway/src/main/java/cn/toesbieya/jxc/gateway/filter/SecurityFilter.java +++ b/java/cloud/gateway/src/main/java/cn/toesbieya/jxc/gateway/filter/SecurityFilter.java @@ -6,8 +6,8 @@ import cn.toesbieya.jxc.gateway.config.ResourceConfig; import com.alibaba.fastjson.JSON; import cn.toesbieya.jxc.common.constant.SessionConstant; import cn.toesbieya.jxc.common.model.vo.Result; -import cn.toesbieya.jxc.common.utils.SessionUtil; -import cn.toesbieya.jxc.common.utils.Util; +import cn.toesbieya.jxc.common.util.SessionUtil; +import cn.toesbieya.jxc.common.util.Util; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.gateway.filter.GlobalFilter; diff --git a/java/cloud/nacos-config/jxc-common-database.yml b/java/cloud/nacos-config/jxc-common-database.yml index e0e85c0..c2cdc7c 100644 --- a/java/cloud/nacos-config/jxc-common-database.yml +++ b/java/cloud/nacos-config/jxc-common-database.yml @@ -11,7 +11,7 @@ mybatis-plus: configuration: local-cache-scope: STATEMENT cache-enabled: false - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl global-config: banner: false db-config: diff --git a/java/cloud/nacos-config/jxc-gateway.yml b/java/cloud/nacos-config/jxc-gateway.yml index 62d0f38..563ce64 100644 --- a/java/cloud/nacos-config/jxc-gateway.yml +++ b/java/cloud/nacos-config/jxc-gateway.yml @@ -27,6 +27,11 @@ spring: predicates: - Path=/doc/** + - id: jxc-web-file + uri: lb://jxc-web-file + predicates: + - Path=/file/** + - id: jxc-web-message uri: lb://jxc-web-message predicates: diff --git a/java/cloud/nacos-config/jxc-common-qiniu.yml b/java/cloud/nacos-config/jxc-web-file.yml similarity index 76% rename from java/cloud/nacos-config/jxc-common-qiniu.yml rename to java/cloud/nacos-config/jxc-web-file.yml index a45af94..c1f0ec4 100644 --- a/java/cloud/nacos-config/jxc-common-qiniu.yml +++ b/java/cloud/nacos-config/jxc-web-file.yml @@ -1,3 +1,6 @@ +server: + port: 8002 + qiniu: access-key: secret-key: diff --git a/java/cloud/nacos-config/jxc-web-message.yml b/java/cloud/nacos-config/jxc-web-message.yml index 4027033..88cd6c3 100644 --- a/java/cloud/nacos-config/jxc-web-message.yml +++ b/java/cloud/nacos-config/jxc-web-message.yml @@ -1,4 +1,4 @@ server: - port: 8002 + port: 8003 servlet: context-path: /message \ No newline at end of file diff --git a/java/cloud/nacos-config/jxc-web-record.yml b/java/cloud/nacos-config/jxc-web-record.yml index c49070b..6753dd0 100644 --- a/java/cloud/nacos-config/jxc-web-record.yml +++ b/java/cloud/nacos-config/jxc-web-record.yml @@ -1,2 +1,2 @@ server: - port: 8003 \ No newline at end of file + port: 8004 \ No newline at end of file diff --git a/java/cloud/nacos-config/jxc-web-statistic.yml b/java/cloud/nacos-config/jxc-web-statistic.yml index 6753dd0..ab8fc62 100644 --- a/java/cloud/nacos-config/jxc-web-statistic.yml +++ b/java/cloud/nacos-config/jxc-web-statistic.yml @@ -1,2 +1,2 @@ server: - port: 8004 \ No newline at end of file + port: 8005 \ No newline at end of file diff --git a/java/cloud/nacos-config/jxc-web-stock.yml b/java/cloud/nacos-config/jxc-web-stock.yml index ab8fc62..5ce9bb6 100644 --- a/java/cloud/nacos-config/jxc-web-stock.yml +++ b/java/cloud/nacos-config/jxc-web-stock.yml @@ -1,2 +1,2 @@ server: - port: 8005 \ No newline at end of file + port: 8006 \ No newline at end of file diff --git a/java/cloud/nacos-config/jxc-web-system.yml b/java/cloud/nacos-config/jxc-web-system.yml index df87794..f407ed2 100644 --- a/java/cloud/nacos-config/jxc-web-system.yml +++ b/java/cloud/nacos-config/jxc-web-system.yml @@ -1,4 +1,4 @@ server: - port: 8006 + port: 8007 servlet: context-path: /system \ No newline at end of file diff --git a/java/cloud/schedule/src/main/java/cn/toesbieya/jxc/schedule/task/DocTask.java b/java/cloud/schedule/src/main/java/cn/toesbieya/jxc/schedule/task/DocTask.java index ebd4ac5..64f937a 100644 --- a/java/cloud/schedule/src/main/java/cn/toesbieya/jxc/schedule/task/DocTask.java +++ b/java/cloud/schedule/src/main/java/cn/toesbieya/jxc/schedule/task/DocTask.java @@ -1,8 +1,8 @@ package cn.toesbieya.jxc.schedule.task; import cn.toesbieya.jxc.common.constant.DocConstant; -import cn.toesbieya.jxc.common.utils.DateUtil; -import cn.toesbieya.jxc.common.utils.RedisUtil; +import cn.toesbieya.jxc.common.util.DateUtil; +import cn.toesbieya.jxc.common.util.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.context.annotation.DependsOn; diff --git a/java/cloud/schedule/src/main/java/cn/toesbieya/jxc/schedule/task/SessionTask.java b/java/cloud/schedule/src/main/java/cn/toesbieya/jxc/schedule/task/SessionTask.java index 14bd9ce..b01ceb1 100644 --- a/java/cloud/schedule/src/main/java/cn/toesbieya/jxc/schedule/task/SessionTask.java +++ b/java/cloud/schedule/src/main/java/cn/toesbieya/jxc/schedule/task/SessionTask.java @@ -3,7 +3,7 @@ package cn.toesbieya.jxc.schedule.task; import cn.toesbieya.jxc.common.constant.SessionConstant; import cn.toesbieya.jxc.common.constant.SocketConstant; import cn.toesbieya.jxc.common.model.vo.SocketOfflineVo; -import cn.toesbieya.jxc.common.utils.RedisUtil; +import cn.toesbieya.jxc.common.util.RedisUtil; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; diff --git a/java/cloud/schedule/src/main/java/cn/toesbieya/jxc/schedule/task/StatisticTask.java b/java/cloud/schedule/src/main/java/cn/toesbieya/jxc/schedule/task/StatisticTask.java index 0826d95..5e0e4d5 100644 --- a/java/cloud/schedule/src/main/java/cn/toesbieya/jxc/schedule/task/StatisticTask.java +++ b/java/cloud/schedule/src/main/java/cn/toesbieya/jxc/schedule/task/StatisticTask.java @@ -3,7 +3,7 @@ package cn.toesbieya.jxc.schedule.task; import cn.toesbieya.jxc.common.model.entity.StatFinishOrder; import cn.toesbieya.jxc.common.model.entity.StatProfitGoods; import cn.toesbieya.jxc.common.model.entity.StatProfitTotal; -import cn.toesbieya.jxc.common.utils.DateUtil; +import cn.toesbieya.jxc.common.util.DateUtil; import cn.toesbieya.jxc.schedule.mapper.StatisticMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; diff --git a/java/cloud/web/file/pom.xml b/java/cloud/web/file/pom.xml new file mode 100644 index 0000000..7124ebf --- /dev/null +++ b/java/cloud/web/file/pom.xml @@ -0,0 +1,20 @@ + + + + web + cn.toesbieya + 0.0.1-SNAPSHOT + + 4.0.0 + + file + + + + com.qiniu + qiniu-java-sdk + + + \ No newline at end of file diff --git a/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/FileApplication.java b/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/FileApplication.java new file mode 100644 index 0000000..735083c --- /dev/null +++ b/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/FileApplication.java @@ -0,0 +1,11 @@ +package cn.toesbieya.jxc.file; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication(scanBasePackages = "cn.toesbieya.jxc") +public class FileApplication { + public static void main(String[] args) { + SpringApplication.run(FileApplication.class, args); + } +} diff --git a/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/config/QiniuConfig.java b/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/config/QiniuConfig.java new file mode 100644 index 0000000..faf14b9 --- /dev/null +++ b/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/config/QiniuConfig.java @@ -0,0 +1,16 @@ +package cn.toesbieya.jxc.file.config; + +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; + +@Configuration +@EnableConfigurationProperties(QiniuProperty.class) +@DependsOn("redisUtil") +public class QiniuConfig { + @Bean + public QiniuTemplate qiniuTemplate(QiniuProperty property) { + return new QiniuTemplate(property); + } +} diff --git a/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/config/QiniuProperty.java b/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/config/QiniuProperty.java new file mode 100644 index 0000000..880ca4c --- /dev/null +++ b/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/config/QiniuProperty.java @@ -0,0 +1,45 @@ +package cn.toesbieya.jxc.file.config; + +import com.qiniu.storage.Region; +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; + +@Data +@ConfigurationProperties("qiniu") +@RefreshScope +public class QiniuProperty { + private String accessKey; + + private String secretKey; + + private String bucket; + + //机房区域，默认为自动 + private QiniuRegion region = QiniuRegion.auto; + + //临时上传凭证的有效期，单位秒 + private Integer tokenExpire = 3600; + + //临时上传凭证的redis键名 + private String redisCacheKey = "qiniu-token"; + + enum QiniuRegion { + auto(Region.autoRegion()), + huadong(Region.huadong()), + huabei(Region.huabei()), + huanan(Region.huanan()), + beimei(Region.beimei()), + xinjiapo(Region.xinjiapo()); + + private final Region region; + + QiniuRegion(Region region) { + this.region = region; + } + + public Region getRegion() { + return this.region; + } + } +} diff --git a/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/config/QiniuTemplate.java b/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/config/QiniuTemplate.java new file mode 100644 index 0000000..5ba409d --- /dev/null +++ b/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/config/QiniuTemplate.java @@ -0,0 +1,54 @@ +package cn.toesbieya.jxc.file.config; + +import cn.toesbieya.jxc.common.util.RedisUtil; +import com.qiniu.common.QiniuException; +import com.qiniu.storage.BucketManager; +import com.qiniu.storage.Configuration; +import com.qiniu.util.Auth; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class QiniuTemplate { + private final QiniuProperty property; + private final Auth auth; + private final BucketManager bucketManager; + + public QiniuTemplate(QiniuProperty property) { + this.property = property; + this.auth = Auth.create(property.getAccessKey(), property.getSecretKey()); + this.bucketManager = new BucketManager(this.auth, new Configuration(property.getRegion().getRegion())); + } + + public String getToken() { + String key = property.getRedisCacheKey(); + + String token = (String) RedisUtil.get(key); + + if (token == null) { + token = auth.uploadToken(property.getBucket()); + RedisUtil.set(key, token, property.getTokenExpire()); + } + + return token; + } + + public void delete(String key) { + try { + bucketManager.delete(property.getBucket(), key); + } + catch (QiniuException e) { + log.info("七牛云删除单个文件失败,{}", e.getMessage()); + } + } + + public void deleteBatch(String... key) { + BucketManager.BatchOperations batchOperations = new BucketManager.BatchOperations(); + batchOperations.addDeleteOp(property.getBucket(), key); + try { + bucketManager.batch(batchOperations); + } + catch (QiniuException e) { + log.info("七牛云批量删除文件失败,{}", e.getMessage()); + } + } +} diff --git a/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/controller/FileController.java b/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/controller/FileController.java new file mode 100644 index 0000000..f1ac157 --- /dev/null +++ b/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/controller/FileController.java @@ -0,0 +1,33 @@ +package cn.toesbieya.jxc.file.controller; + +import cn.toesbieya.jxc.common.model.vo.Result; +import cn.toesbieya.jxc.file.service.FileService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; + +@Controller +@RequestMapping("file") +public class FileController { + @Resource + private FileService service; + + @GetMapping("delete") + @ResponseBody + public Result delete(@RequestParam String url) throws UnsupportedEncodingException { + service.delete(URLDecoder.decode(url, "utf-8")); + return Result.success("删除成功"); + } + + @GetMapping("getToken") + @ResponseBody + public Result getToken() { + return Result.success(null, service.getToken()); + } +} diff --git a/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/service/FileService.java b/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/service/FileService.java new file mode 100644 index 0000000..6f0cd59 --- /dev/null +++ b/java/cloud/web/file/src/main/java/cn/toesbieya/jxc/file/service/FileService.java @@ -0,0 +1,34 @@ +package cn.toesbieya.jxc.file.service; + +import cn.toesbieya.jxc.api.FileApi; +import cn.toesbieya.jxc.file.config.QiniuTemplate; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +@org.apache.dubbo.config.annotation.Service +public class FileService implements FileApi { + @Resource + private QiniuTemplate template; + + @Override + public String getToken() { + return template.getToken(); + } + + @Override + public void delete(String key) { + template.delete(key); + } + + @Override + public void deleteBatch(String... key) { + template.deleteBatch(key); + } + + /*@Override + public void deleteBatch(List key) { + deleteBatch(key.toArray(new String[0])); + }*/ +} diff --git a/java/cloud/web/file/src/main/resources/bootstrap.yml b/java/cloud/web/file/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..67e34b1 --- /dev/null +++ b/java/cloud/web/file/src/main/resources/bootstrap.yml @@ -0,0 +1,22 @@ +spring: + application: + name: jxc-web-file + + cloud: + nacos: + config: + server-addr: 127.0.0.1:8848 + file-extension: yml + shared-configs: + - data-id: jxc-common-redis.yml + discovery: + server-addr: 127.0.0.1:8848 + +dubbo: + protocol: + port: -1 + name: dubbo + scan: + base-packages: cn.toesbieya.jxc.file.service + registry: + address: nacos://127.0.0.1:8848 \ No newline at end of file diff --git a/java/cloud/web/pom.xml b/java/cloud/web/pom.xml index 3b1da8b..1596bbe 100644 --- a/java/cloud/web/pom.xml +++ b/java/cloud/web/pom.xml @@ -11,6 +11,7 @@ web-modules web-common + file 4.0.0 @@ -41,7 +42,6 @@ - com.alibaba.cloud spring-cloud-starter-dubbo diff --git a/java/cloud/web/web-common/pom.xml b/java/cloud/web/web-common/pom.xml index a05761e..c4c877b 100644 --- a/java/cloud/web/web-common/pom.xml +++ b/java/cloud/web/web-common/pom.xml @@ -18,27 +18,13 @@ - com.alibaba - easyexcel - - - com.qiniu - qiniu-java-sdk - - - com.squareup.okhttp3 - okhttp - compile - - - com.google.code.gson - gson - compile + com.github.pagehelper + pagehelper-spring-boot-starter - com.github.pagehelper - pagehelper-spring-boot-starter + com.alibaba + easyexcel \ No newline at end of file diff --git a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/aspect/LockAspect.java b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/aspect/LockAspect.java index 30902c4..a9734b7 100644 --- a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/aspect/LockAspect.java +++ b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/aspect/LockAspect.java @@ -1,8 +1,8 @@ package cn.toesbieya.jxc.web.common.aspect; import cn.toesbieya.jxc.common.model.vo.Result; -import cn.toesbieya.jxc.common.utils.RedisUtil; -import cn.toesbieya.jxc.common.utils.SpringUtil; +import cn.toesbieya.jxc.common.util.RedisUtil; +import cn.toesbieya.jxc.common.util.SpringUtil; import cn.toesbieya.jxc.web.common.annoation.Lock; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/aspect/RestExceptionAspect.java b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/aspect/RestExceptionAspect.java index 4233ff4..1741400 100644 --- a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/aspect/RestExceptionAspect.java +++ b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/aspect/RestExceptionAspect.java @@ -1,12 +1,13 @@ package cn.toesbieya.jxc.web.common.aspect; -import cn.toesbieya.jxc.api.service.RecordApi; +import cn.toesbieya.jxc.api.RecordApi; import cn.toesbieya.jxc.common.exception.JsonResultException; import cn.toesbieya.jxc.common.model.entity.RecUserAction; import cn.toesbieya.jxc.common.model.vo.Result; -import cn.toesbieya.jxc.common.utils.Util; +import cn.toesbieya.jxc.common.util.Util; import cn.toesbieya.jxc.web.common.enumeration.UserActionEnum; -import cn.toesbieya.jxc.web.common.utils.ThreadUtil; +import cn.toesbieya.jxc.web.common.util.ThreadUtil; +import cn.toesbieya.jxc.web.common.util.WebUtil; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.Reference; import org.springframework.http.converter.HttpMessageNotReadableException; @@ -39,14 +40,14 @@ public class RestExceptionAspect { //@RequestParam没有匹配到值 @ExceptionHandler(MissingServletRequestParameterException.class) public Result handle(MissingServletRequestParameterException e) { - log.error(e.getMessage(), e); + log.error(e.getMessage()); return Result.fail("get参数有误"); } //@RequestBody没有匹配到值 @ExceptionHandler(HttpMessageNotReadableException.class) public Result handle(HttpMessageNotReadableException e) { - log.error(e.getMessage(), e); + log.error(e.getMessage()); return Result.fail("post参数有误"); } @@ -61,7 +62,7 @@ public class RestExceptionAspect { //最终捕获 @ExceptionHandler(Exception.class) public Result handle(Exception e) { - log.error("服务运行异常", e); + log.error(String.format("服务运行异常,访问路径：%s", WebUtil.getRequest().getServletPath()), e); recordUserAction(e); return Result.fail("服务运行异常"); } diff --git a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/aspect/UserActionAspect.java b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/aspect/UserActionAspect.java index 41bb880..4aed8b5 100644 --- a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/aspect/UserActionAspect.java +++ b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/aspect/UserActionAspect.java @@ -1,12 +1,12 @@ package cn.toesbieya.jxc.web.common.aspect; -import cn.toesbieya.jxc.api.service.RecordApi; +import cn.toesbieya.jxc.api.RecordApi; import cn.toesbieya.jxc.common.model.entity.RecUserAction; import cn.toesbieya.jxc.common.model.vo.Result; -import cn.toesbieya.jxc.common.utils.SpringUtil; +import cn.toesbieya.jxc.common.util.SpringUtil; import cn.toesbieya.jxc.web.common.annoation.UserAction; import cn.toesbieya.jxc.web.common.enumeration.UserActionEnum; -import cn.toesbieya.jxc.web.common.utils.ThreadUtil; +import cn.toesbieya.jxc.web.common.util.ThreadUtil; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.Reference; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/config/QiniuConfig.java b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/config/QiniuConfig.java deleted file mode 100644 index 03b0260..0000000 --- a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/config/QiniuConfig.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.toesbieya.jxc.web.common.config; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.context.config.annotation.RefreshScope; -import org.springframework.stereotype.Component; - -@Component -@ConfigurationProperties("qiniu") -@RefreshScope -@Data -public class QiniuConfig { - private String accessKey; - - private String secretKey; - - private String bucket; - - //临时上传凭证的有效期，单位秒 - private Integer tokenExpire = 3600; - - //临时上传凭证的redis键名 - private String redisCacheKey = "qiniu-token"; -} diff --git a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/interceptor/SecurityInterceptor.java b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/interceptor/SecurityInterceptor.java index 6f2da73..525aa0e 100644 --- a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/interceptor/SecurityInterceptor.java +++ b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/interceptor/SecurityInterceptor.java @@ -1,10 +1,8 @@ package cn.toesbieya.jxc.web.common.interceptor; -import cn.toesbieya.jxc.common.model.vo.Result; import cn.toesbieya.jxc.common.model.vo.UserVo; -import cn.toesbieya.jxc.common.utils.SessionUtil; -import cn.toesbieya.jxc.web.common.utils.ThreadUtil; -import cn.toesbieya.jxc.web.common.utils.WebUtil; +import cn.toesbieya.jxc.common.util.SessionUtil; +import cn.toesbieya.jxc.web.common.util.ThreadUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.web.servlet.HandlerInterceptor; @@ -16,15 +14,8 @@ public class SecurityInterceptor implements HandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { UserVo user = SessionUtil.get(request); - - if (user == null) { - WebUtil.responseJson(response, Result.requireLogin()); - ThreadUtil.clearAll(); - return false; - } - - ThreadUtil.setUser(user); - + if (user == null) ThreadUtil.clearAll(); + else ThreadUtil.setUser(user); return true; } } diff --git a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/interceptor/UserActionInterceptor.java b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/interceptor/UserActionInterceptor.java index fadc78a..230b6ab 100644 --- a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/interceptor/UserActionInterceptor.java +++ b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/interceptor/UserActionInterceptor.java @@ -1,7 +1,7 @@ package cn.toesbieya.jxc.web.common.interceptor; import cn.toesbieya.jxc.web.common.interceptor.predicate.UserActionPredicate; -import cn.toesbieya.jxc.web.common.utils.ThreadUtil; +import cn.toesbieya.jxc.web.common.util.ThreadUtil; import org.springframework.web.servlet.HandlerInterceptor; import javax.servlet.http.HttpServletRequest; diff --git a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/ExcelUtil.java b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/ExcelUtil.java similarity index 99% rename from java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/ExcelUtil.java rename to java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/ExcelUtil.java index 0d2263c..3f3ce0c 100644 --- a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/ExcelUtil.java +++ b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/ExcelUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.web.common.utils; +package cn.toesbieya.jxc.web.common.util; import cn.toesbieya.jxc.common.model.vo.Result; import com.alibaba.excel.EasyExcel; diff --git a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/HttpUtil.java b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/HttpUtil.java similarity index 93% rename from java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/HttpUtil.java rename to java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/HttpUtil.java index 7fccdd2..192652b 100644 --- a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/HttpUtil.java +++ b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/HttpUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.web.common.utils; +package cn.toesbieya.jxc.web.common.util; import okhttp3.Call; import okhttp3.OkHttpClient; diff --git a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/IpUtil.java b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/IpUtil.java similarity index 98% rename from java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/IpUtil.java rename to java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/IpUtil.java index ec62026..c3bd496 100644 --- a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/IpUtil.java +++ b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/IpUtil.java @@ -1,6 +1,6 @@ -package cn.toesbieya.jxc.web.common.utils; +package cn.toesbieya.jxc.web.common.util; -import cn.toesbieya.jxc.common.utils.RedisUtil; +import cn.toesbieya.jxc.common.util.RedisUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/SecurityUtil.java b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/SecurityUtil.java similarity index 92% rename from java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/SecurityUtil.java rename to java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/SecurityUtil.java index c33b697..ed1b29f 100644 --- a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/SecurityUtil.java +++ b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/SecurityUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.web.common.utils; +package cn.toesbieya.jxc.web.common.util; import cn.toesbieya.jxc.common.model.vo.UserVo; diff --git a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/SessionUtil.java b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/SessionUtil.java similarity index 62% rename from java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/SessionUtil.java rename to java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/SessionUtil.java index 9d6f424..8f00b0b 100644 --- a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/SessionUtil.java +++ b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/SessionUtil.java @@ -1,8 +1,8 @@ -package cn.toesbieya.jxc.web.common.utils; +package cn.toesbieya.jxc.web.common.util; import cn.toesbieya.jxc.common.model.vo.UserVo; -public class SessionUtil extends cn.toesbieya.jxc.common.utils.SessionUtil { +public class SessionUtil extends cn.toesbieya.jxc.common.util.SessionUtil { public static UserVo get() { UserVo user = ThreadUtil.getUser(); return user == null ? get(WebUtil.getRequest()) : user; diff --git a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/ThreadUtil.java b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/ThreadUtil.java similarity index 94% rename from java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/ThreadUtil.java rename to java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/ThreadUtil.java index 12dc4d8..0518477 100644 --- a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/ThreadUtil.java +++ b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/ThreadUtil.java @@ -1,8 +1,8 @@ -package cn.toesbieya.jxc.web.common.utils; +package cn.toesbieya.jxc.web.common.util; import cn.toesbieya.jxc.common.model.entity.RecUserAction; import cn.toesbieya.jxc.common.model.vo.UserVo; -import cn.toesbieya.jxc.common.utils.SessionUtil; +import cn.toesbieya.jxc.common.util.SessionUtil; import javax.servlet.http.HttpServletRequest; diff --git a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/WebUtil.java b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/WebUtil.java similarity index 95% rename from java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/WebUtil.java rename to java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/WebUtil.java index 8265ef1..4ed52dc 100644 --- a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/WebUtil.java +++ b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/util/WebUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.web.common.utils; +package cn.toesbieya.jxc.web.common.util; import cn.toesbieya.jxc.common.model.vo.Result; import com.alibaba.fastjson.JSON; @@ -14,7 +14,6 @@ public class WebUtil { public static void responseJson(HttpServletResponse response, Result result) throws IOException { response.setCharacterEncoding("UTF-8"); response.setContentType("application/json; charset=utf-8"); - response.getWriter().print(JSON.toJSONString(result)); } diff --git a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/QiniuUtil.java b/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/QiniuUtil.java deleted file mode 100644 index a5135aa..0000000 --- a/java/cloud/web/web-common/src/main/java/cn/toesbieya/jxc/web/common/utils/QiniuUtil.java +++ /dev/null @@ -1,76 +0,0 @@ -package cn.toesbieya.jxc.web.common.utils; - -import cn.toesbieya.jxc.common.utils.RedisUtil; -import cn.toesbieya.jxc.web.common.config.QiniuConfig; -import com.qiniu.common.QiniuException; -import com.qiniu.storage.BucketManager; -import com.qiniu.storage.Configuration; -import com.qiniu.storage.Region; -import com.qiniu.util.Auth; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.DependsOn; -import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; - -import java.util.List; - -@Slf4j -@Component -@DependsOn("redisUtil") -public class QiniuUtil { - private final QiniuConfig config; - private final Auth auth; - private final BucketManager bucketManager; - - @Autowired - public QiniuUtil(QiniuConfig config) { - this.config = config; - - if (StringUtils.isEmpty(config.getAccessKey())) { - this.auth = null; - this.bucketManager = null; - return; - } - - this.auth = Auth.create(config.getAccessKey(), config.getSecretKey()); - this.bucketManager = new BucketManager(this.auth, new Configuration(Region.huadong())); - } - - public String getToken() { - String key = config.getRedisCacheKey(); - - String token = (String) RedisUtil.get(key); - - if (token == null) { - token = auth.uploadToken(config.getBucket()); - RedisUtil.set(key, token, config.getTokenExpire()); - } - - return token; - } - - public void delete(String key) { - try { - bucketManager.delete(config.getBucket(), key); - } - catch (QiniuException e) { - log.info("七牛云删除单个文件失败,{}", e.getMessage()); - } - } - - public void deleteBatch(String... key) { - BucketManager.BatchOperations batchOperations = new BucketManager.BatchOperations(); - batchOperations.addDeleteOp(config.getBucket(), key); - try { - bucketManager.batch(batchOperations); - } - catch (QiniuException e) { - log.info("七牛云批量删除文件失败,{}", e.getMessage()); - } - } - - public void deleteBatch(List key) { - deleteBatch(key.toArray(new String[0])); - } -} diff --git a/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/controller/AccountController.java b/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/controller/AccountController.java index c8af6fb..0b39b55 100644 --- a/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/controller/AccountController.java +++ b/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/controller/AccountController.java @@ -7,8 +7,8 @@ import cn.toesbieya.jxc.account.vo.RegisterParam; import cn.toesbieya.jxc.common.model.entity.SysUser; import cn.toesbieya.jxc.common.model.vo.UserVo; import cn.toesbieya.jxc.common.model.vo.Result; -import cn.toesbieya.jxc.web.common.utils.IpUtil; -import cn.toesbieya.jxc.web.common.utils.SessionUtil; +import cn.toesbieya.jxc.web.common.util.IpUtil; +import cn.toesbieya.jxc.web.common.util.SessionUtil; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/service/AccountService.java b/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/service/AccountService.java index 3a22873..1ee03bb 100644 --- a/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/service/AccountService.java +++ b/java/cloud/web/web-modules/account/src/main/java/cn/toesbieya/jxc/account/service/AccountService.java @@ -6,10 +6,11 @@ import cn.toesbieya.jxc.account.vo.LoginParam; import cn.toesbieya.jxc.account.vo.LoginSuccessInfo; import cn.toesbieya.jxc.account.vo.PasswordUpdateParam; import cn.toesbieya.jxc.account.vo.RegisterParam; -import cn.toesbieya.jxc.api.service.RecordApi; -import cn.toesbieya.jxc.api.service.system.DepartmentApi; -import cn.toesbieya.jxc.api.service.system.ResourceApi; -import cn.toesbieya.jxc.api.service.system.RoleApi; +import cn.toesbieya.jxc.api.FileApi; +import cn.toesbieya.jxc.api.RecordApi; +import cn.toesbieya.jxc.api.system.DepartmentApi; +import cn.toesbieya.jxc.api.system.ResourceApi; +import cn.toesbieya.jxc.api.system.RoleApi; import cn.toesbieya.jxc.common.enumeration.GeneralStatusEnum; import cn.toesbieya.jxc.common.model.entity.RecLoginHistory; import cn.toesbieya.jxc.common.model.entity.SysRole; @@ -18,10 +19,9 @@ import cn.toesbieya.jxc.common.model.vo.DepartmentVo; import cn.toesbieya.jxc.common.model.vo.ResourceVo; import cn.toesbieya.jxc.common.model.vo.Result; import cn.toesbieya.jxc.common.model.vo.UserVo; -import cn.toesbieya.jxc.common.utils.SessionUtil; +import cn.toesbieya.jxc.common.util.SessionUtil; import cn.toesbieya.jxc.web.common.annoation.TimeCost; import cn.toesbieya.jxc.web.common.annoation.UserAction; -import cn.toesbieya.jxc.web.common.utils.QiniuUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.Reference; @@ -36,8 +36,8 @@ import java.util.*; public class AccountService { @Resource private SysUserMapper userMapper; - @Resource - private QiniuUtil qiniuUtil; + @Reference + private FileApi fileApi; @Reference private RecordApi recordApi; @Reference @@ -210,7 +210,7 @@ public class AccountService { if (rows > 0) { String oldAvatar = user.getAvatar(); if (!StringUtils.isEmpty(oldAvatar)) { - qiniuUtil.delete(oldAvatar); + fileApi.delete(oldAvatar); } user.setAvatar(avatar); SessionUtil.save(user); @@ -218,7 +218,7 @@ public class AccountService { } //否则删除此次上传至云的头像 - qiniuUtil.delete(avatar); + fileApi.delete(avatar); return Result.fail("上传头像失败"); } diff --git a/java/cloud/web/web-modules/account/src/main/resources/bootstrap.yml b/java/cloud/web/web-modules/account/src/main/resources/bootstrap.yml index 70bef34..7ecb4c5 100644 --- a/java/cloud/web/web-modules/account/src/main/resources/bootstrap.yml +++ b/java/cloud/web/web-modules/account/src/main/resources/bootstrap.yml @@ -10,7 +10,6 @@ spring: shared-configs: - data-id: jxc-common-database.yml - data-id: jxc-common-redis.yml - - data-id: jxc-common-qiniu.yml discovery: server-addr: 127.0.0.1:8848 @@ -18,4 +17,4 @@ dubbo: registry: address: nacos://127.0.0.1:8848 cloud: - subscribed-services: jxc-web-record,jxc-web-system \ No newline at end of file + subscribed-services: jxc-web-file,jxc-web-record,jxc-web-system \ No newline at end of file diff --git a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/controller/PurchaseInboundController.java b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/controller/PurchaseInboundController.java index 8fd6c32..7187ff4 100644 --- a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/controller/PurchaseInboundController.java +++ b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/controller/PurchaseInboundController.java @@ -9,7 +9,7 @@ import cn.toesbieya.jxc.doc.model.vo.DocStatusUpdate; import cn.toesbieya.jxc.doc.model.vo.PurchaseInboundSearch; import cn.toesbieya.jxc.doc.model.vo.PurchaseInboundVo; import cn.toesbieya.jxc.doc.service.PurchaseInboundService; -import cn.toesbieya.jxc.web.common.utils.SessionUtil; +import cn.toesbieya.jxc.web.common.util.SessionUtil; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/controller/PurchaseOrderController.java b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/controller/PurchaseOrderController.java index 6784fd5..2521cc1 100644 --- a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/controller/PurchaseOrderController.java +++ b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/controller/PurchaseOrderController.java @@ -10,7 +10,7 @@ import cn.toesbieya.jxc.doc.model.vo.DocStatusUpdate; import cn.toesbieya.jxc.doc.model.vo.PurchaseOrderSearch; import cn.toesbieya.jxc.doc.model.vo.PurchaseOrderVo; import cn.toesbieya.jxc.doc.service.PurchaseOrderService; -import cn.toesbieya.jxc.web.common.utils.SessionUtil; +import cn.toesbieya.jxc.web.common.util.SessionUtil; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/controller/SellOrderController.java b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/controller/SellOrderController.java index 2a4987b..69af6c7 100644 --- a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/controller/SellOrderController.java +++ b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/controller/SellOrderController.java @@ -9,7 +9,7 @@ import cn.toesbieya.jxc.doc.model.vo.DocStatusUpdate; import cn.toesbieya.jxc.doc.model.vo.SellOrderSearch; import cn.toesbieya.jxc.doc.model.vo.SellOrderVo; import cn.toesbieya.jxc.doc.service.SellOrderService; -import cn.toesbieya.jxc.web.common.utils.SessionUtil; +import cn.toesbieya.jxc.web.common.util.SessionUtil; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/controller/SellOutboundController.java b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/controller/SellOutboundController.java index 7860fdd..d17da26 100644 --- a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/controller/SellOutboundController.java +++ b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/controller/SellOutboundController.java @@ -9,7 +9,7 @@ import cn.toesbieya.jxc.doc.model.vo.DocStatusUpdate; import cn.toesbieya.jxc.doc.model.vo.SellOutboundSearch; import cn.toesbieya.jxc.doc.model.vo.SellOutboundVo; import cn.toesbieya.jxc.doc.service.SellOutboundService; -import cn.toesbieya.jxc.web.common.utils.SessionUtil; +import cn.toesbieya.jxc.web.common.util.SessionUtil; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/model/vo/DocHistorySearch.java b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/model/vo/DocHistorySearch.java index f982cb7..7485e5c 100644 --- a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/model/vo/DocHistorySearch.java +++ b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/model/vo/DocHistorySearch.java @@ -1,9 +1,14 @@ package cn.toesbieya.jxc.doc.model.vo; +import cn.toesbieya.jxc.common.model.vo.BaseSearch; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; @Data -public class DocHistorySearch { +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class DocHistorySearch extends BaseSearch { private String pid; private String type; private String uid; diff --git a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/DocHistoryService.java b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/DocHistoryService.java index da51b5e..6a51ad9 100644 --- a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/DocHistoryService.java +++ b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/DocHistoryService.java @@ -3,20 +3,21 @@ package cn.toesbieya.jxc.doc.service; import cn.toesbieya.jxc.common.model.entity.BizDocHistory; import cn.toesbieya.jxc.doc.mapper.DocHistoryMapper; import cn.toesbieya.jxc.doc.model.vo.DocHistorySearch; +import cn.toesbieya.jxc.web.common.model.vo.PageResult; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import javax.annotation.Resource; -import java.util.List; @Service public class DocHistoryService { @Resource private DocHistoryMapper mapper; - public List search(DocHistorySearch vo) { + public PageResult search(DocHistorySearch vo) { String pid = vo.getPid(); String type = vo.getType(); String uid = vo.getUid(); @@ -29,6 +30,7 @@ public class DocHistoryService { .like(!StringUtils.isEmpty(uname), BizDocHistory::getUname, uname) .orderByDesc(BizDocHistory::getId); - return mapper.selectList(wrapper); + PageHelper.startPage(vo.getPage(), vo.getPageSize()); + return new PageResult<>(mapper.selectList(wrapper)); } } diff --git a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseInboundService.java b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseInboundService.java index 40c5f45..9508409 100644 --- a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseInboundService.java +++ b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseInboundService.java @@ -1,13 +1,12 @@ package cn.toesbieya.jxc.doc.service; -import cn.toesbieya.jxc.api.service.RecordApi; -import cn.toesbieya.jxc.api.service.StockApi; -import cn.toesbieya.jxc.api.vo.AttachmentOperation; +import cn.toesbieya.jxc.api.RecordApi; +import cn.toesbieya.jxc.api.StockApi; import cn.toesbieya.jxc.common.exception.JsonResultException; import cn.toesbieya.jxc.common.model.entity.*; import cn.toesbieya.jxc.common.model.vo.Result; import cn.toesbieya.jxc.common.model.vo.UserVo; -import cn.toesbieya.jxc.common.utils.Util; +import cn.toesbieya.jxc.common.util.Util; import cn.toesbieya.jxc.doc.enumeration.DocFinishEnum; import cn.toesbieya.jxc.doc.enumeration.DocHistoryEnum; import cn.toesbieya.jxc.doc.enumeration.DocStatusEnum; @@ -20,7 +19,7 @@ import cn.toesbieya.jxc.doc.util.DocUtil; import cn.toesbieya.jxc.web.common.annoation.Lock; import cn.toesbieya.jxc.web.common.annoation.UserAction; import cn.toesbieya.jxc.web.common.model.vo.PageResult; -import cn.toesbieya.jxc.web.common.utils.ExcelUtil; +import cn.toesbieya.jxc.web.common.util.ExcelUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; @@ -312,7 +311,7 @@ public class PurchaseInboundService { attachment.setPid(id); attachment.setTime(time); } - recordApi.handleAttachment(new AttachmentOperation(uploadImageList, null)); + recordApi.handleAttachment(uploadImageList, null); return Result.success("添加成功", id); } @@ -347,7 +346,7 @@ public class PurchaseInboundService { attachment.setPid(docId); attachment.setTime(time); } - recordApi.handleAttachment(new AttachmentOperation(uploadImageList, doc.getDeleteImageList())); + recordApi.handleAttachment(uploadImageList, doc.getDeleteImageList()); return Result.success("修改成功"); } diff --git a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseOrderService.java b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseOrderService.java index 158b8bf..c509ce7 100644 --- a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseOrderService.java +++ b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseOrderService.java @@ -1,7 +1,6 @@ package cn.toesbieya.jxc.doc.service; -import cn.toesbieya.jxc.api.service.RecordApi; -import cn.toesbieya.jxc.api.vo.AttachmentOperation; +import cn.toesbieya.jxc.api.RecordApi; import cn.toesbieya.jxc.common.model.entity.BizDocHistory; import cn.toesbieya.jxc.common.model.entity.BizPurchaseOrder; import cn.toesbieya.jxc.common.model.entity.BizPurchaseOrderSub; @@ -21,7 +20,7 @@ import cn.toesbieya.jxc.doc.util.DocUtil; import cn.toesbieya.jxc.web.common.annoation.Lock; import cn.toesbieya.jxc.web.common.annoation.UserAction; import cn.toesbieya.jxc.web.common.model.vo.PageResult; -import cn.toesbieya.jxc.web.common.utils.ExcelUtil; +import cn.toesbieya.jxc.web.common.util.ExcelUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; @@ -247,7 +246,7 @@ public class PurchaseOrderService { attachment.setPid(id); attachment.setTime(time); } - recordApi.handleAttachment(new AttachmentOperation(uploadImageList, null)); + recordApi.handleAttachment(uploadImageList, null); return Result.success("添加成功", id); } @@ -285,7 +284,7 @@ public class PurchaseOrderService { attachment.setPid(docId); attachment.setTime(time); } - recordApi.handleAttachment(new AttachmentOperation(uploadImageList, doc.getDeleteImageList())); + recordApi.handleAttachment(uploadImageList, doc.getDeleteImageList()); return Result.success("修改成功"); } diff --git a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOrderService.java b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOrderService.java index 7936fb5..ef98c5e 100644 --- a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOrderService.java +++ b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOrderService.java @@ -1,8 +1,7 @@ package cn.toesbieya.jxc.doc.service; -import cn.toesbieya.jxc.api.service.RecordApi; -import cn.toesbieya.jxc.api.service.StockApi; -import cn.toesbieya.jxc.api.vo.AttachmentOperation; +import cn.toesbieya.jxc.api.RecordApi; +import cn.toesbieya.jxc.api.StockApi; import cn.toesbieya.jxc.common.model.entity.*; import cn.toesbieya.jxc.common.model.vo.Result; import cn.toesbieya.jxc.common.model.vo.StockSearch; @@ -21,7 +20,7 @@ import cn.toesbieya.jxc.doc.util.DocUtil; import cn.toesbieya.jxc.web.common.annoation.Lock; import cn.toesbieya.jxc.web.common.annoation.UserAction; import cn.toesbieya.jxc.web.common.model.vo.PageResult; -import cn.toesbieya.jxc.web.common.utils.ExcelUtil; +import cn.toesbieya.jxc.web.common.util.ExcelUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; @@ -252,7 +251,7 @@ public class SellOrderService { attachment.setPid(id); attachment.setTime(time); } - recordApi.handleAttachment(new AttachmentOperation(uploadImageList, null)); + recordApi.handleAttachment(uploadImageList, null); return Result.success("添加成功", id); } @@ -291,7 +290,7 @@ public class SellOrderService { attachment.setPid(docId); attachment.setTime(time); } - recordApi.handleAttachment(new AttachmentOperation(uploadImageList, doc.getDeleteImageList())); + recordApi.handleAttachment(uploadImageList, doc.getDeleteImageList()); return Result.success("修改成功"); } diff --git a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOutboundService.java b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOutboundService.java index dcd33ac..f36b511 100644 --- a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOutboundService.java +++ b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOutboundService.java @@ -1,14 +1,13 @@ package cn.toesbieya.jxc.doc.service; -import cn.toesbieya.jxc.api.service.RecordApi; -import cn.toesbieya.jxc.api.service.StockApi; -import cn.toesbieya.jxc.api.vo.AttachmentOperation; +import cn.toesbieya.jxc.api.RecordApi; +import cn.toesbieya.jxc.api.StockApi; import cn.toesbieya.jxc.common.exception.JsonResultException; import cn.toesbieya.jxc.common.model.entity.*; import cn.toesbieya.jxc.common.model.vo.Result; import cn.toesbieya.jxc.common.model.vo.StockOutboundVo; import cn.toesbieya.jxc.common.model.vo.UserVo; -import cn.toesbieya.jxc.common.utils.Util; +import cn.toesbieya.jxc.common.util.Util; import cn.toesbieya.jxc.doc.enumeration.DocFinishEnum; import cn.toesbieya.jxc.doc.enumeration.DocHistoryEnum; import cn.toesbieya.jxc.doc.enumeration.DocStatusEnum; @@ -21,7 +20,7 @@ import cn.toesbieya.jxc.doc.util.DocUtil; import cn.toesbieya.jxc.web.common.annoation.Lock; import cn.toesbieya.jxc.web.common.annoation.UserAction; import cn.toesbieya.jxc.web.common.model.vo.PageResult; -import cn.toesbieya.jxc.web.common.utils.ExcelUtil; +import cn.toesbieya.jxc.web.common.util.ExcelUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; @@ -315,7 +314,7 @@ public class SellOutboundService { attachment.setPid(id); attachment.setTime(time); } - recordApi.handleAttachment(new AttachmentOperation(uploadImageList, null)); + recordApi.handleAttachment(uploadImageList, null); return Result.success("添加成功", id); } @@ -350,7 +349,7 @@ public class SellOutboundService { attachment.setPid(docId); attachment.setTime(time); } - recordApi.handleAttachment(new AttachmentOperation(uploadImageList, doc.getDeleteImageList())); + recordApi.handleAttachment(uploadImageList, doc.getDeleteImageList()); return Result.success("修改成功"); } diff --git a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/util/DocUtil.java b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/util/DocUtil.java index 78caa89..5994119 100644 --- a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/util/DocUtil.java +++ b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/util/DocUtil.java @@ -2,8 +2,8 @@ package cn.toesbieya.jxc.doc.util; import cn.toesbieya.jxc.common.constant.DocConstant; import cn.toesbieya.jxc.common.model.entity.BizDoc; -import cn.toesbieya.jxc.common.utils.DateUtil; -import cn.toesbieya.jxc.common.utils.RedisUtil; +import cn.toesbieya.jxc.common.util.DateUtil; +import cn.toesbieya.jxc.common.util.RedisUtil; import cn.toesbieya.jxc.doc.model.vo.DocSearch; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/controller/ManageController.java b/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/controller/ManageController.java index 176601b..0ddd795 100644 --- a/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/controller/ManageController.java +++ b/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/controller/ManageController.java @@ -6,7 +6,7 @@ import cn.toesbieya.jxc.common.model.vo.Result; import cn.toesbieya.jxc.message.constant.MsgConstant; import cn.toesbieya.jxc.message.model.vo.MsgSearch; import cn.toesbieya.jxc.message.service.ManageService; -import cn.toesbieya.jxc.web.common.utils.SessionUtil; +import cn.toesbieya.jxc.web.common.util.SessionUtil; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/controller/UserController.java b/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/controller/UserController.java index 6b00f60..e2fb932 100644 --- a/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/controller/UserController.java +++ b/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/controller/UserController.java @@ -4,7 +4,7 @@ import cn.toesbieya.jxc.common.model.entity.SysUser; import cn.toesbieya.jxc.common.model.vo.Result; import cn.toesbieya.jxc.message.model.vo.MsgPersonalSearch; import cn.toesbieya.jxc.message.service.UserService; -import cn.toesbieya.jxc.web.common.utils.SessionUtil; +import cn.toesbieya.jxc.web.common.util.SessionUtil; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/service/ManageService.java b/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/service/ManageService.java index 1e268c8..575586c 100644 --- a/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/service/ManageService.java +++ b/java/cloud/web/web-modules/message/src/main/java/cn/toesbieya/jxc/message/service/ManageService.java @@ -4,7 +4,7 @@ import cn.toesbieya.jxc.common.constant.SocketConstant; import cn.toesbieya.jxc.common.model.entity.Msg; import cn.toesbieya.jxc.common.model.vo.Result; import cn.toesbieya.jxc.common.model.vo.SocketEventVo; -import cn.toesbieya.jxc.common.utils.WebSocketUtil; +import cn.toesbieya.jxc.common.util.WebSocketUtil; import cn.toesbieya.jxc.message.constant.MsgConstant; import cn.toesbieya.jxc.message.mapper.MsgMapper; import cn.toesbieya.jxc.message.model.vo.MsgSearch; diff --git a/java/cloud/web/web-modules/record/src/main/java/cn/toesbieya/jxc/record/service/RecordService.java b/java/cloud/web/web-modules/record/src/main/java/cn/toesbieya/jxc/record/service/RecordService.java index 45520f9..a5987dd 100644 --- a/java/cloud/web/web-modules/record/src/main/java/cn/toesbieya/jxc/record/service/RecordService.java +++ b/java/cloud/web/web-modules/record/src/main/java/cn/toesbieya/jxc/record/service/RecordService.java @@ -1,7 +1,7 @@ package cn.toesbieya.jxc.record.service; -import cn.toesbieya.jxc.api.service.RecordApi; -import cn.toesbieya.jxc.api.vo.AttachmentOperation; +import cn.toesbieya.jxc.api.FileApi; +import cn.toesbieya.jxc.api.RecordApi; import cn.toesbieya.jxc.common.model.entity.RecAttachment; import cn.toesbieya.jxc.common.model.entity.RecLoginHistory; import cn.toesbieya.jxc.common.model.entity.RecUserAction; @@ -11,11 +11,11 @@ import cn.toesbieya.jxc.record.mapper.RecUserActionMapper; import cn.toesbieya.jxc.record.model.vo.LoginHistorySearch; import cn.toesbieya.jxc.record.model.vo.UserActionSearch; import cn.toesbieya.jxc.web.common.model.vo.PageResult; -import cn.toesbieya.jxc.web.common.utils.IpUtil; -import cn.toesbieya.jxc.web.common.utils.QiniuUtil; +import cn.toesbieya.jxc.web.common.util.IpUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; +import org.apache.dubbo.config.annotation.Reference; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,8 +36,8 @@ public class RecordService implements RecordApi { private RecUserActionMapper userActionMapper; @Resource private RecAttachmentMapper attachmentMapper; - @Resource - private QiniuUtil qiniuUtil; + @Reference + private FileApi fileApi; public PageResult searchLoginHistory(LoginHistorySearch vo) { Integer uid = vo.getUid(); @@ -87,6 +87,7 @@ public class RecordService implements RecordApi { return new PageResult<>(userActionMapper.selectList(wrapper)); } + @Override public List getAttachmentByPid(String pid) { if (StringUtils.isEmpty(pid)) { return Collections.emptyList(); @@ -99,23 +100,22 @@ public class RecordService implements RecordApi { ); } + @Override @Transactional(rollbackFor = Exception.class) - public void handleAttachment(AttachmentOperation vo) { - List uploadImageList = vo.getUploadImageList(); - List deleteImageList = vo.getDeleteImageList(); - - if (!CollectionUtils.isEmpty(uploadImageList)) { - attachmentMapper.insertBatch(uploadImageList); + public void handleAttachment(List upload, List delete) { + if (!CollectionUtils.isEmpty(upload)) { + attachmentMapper.insertBatch(upload); } - if (!CollectionUtils.isEmpty(deleteImageList)) { + if (!CollectionUtils.isEmpty(delete)) { attachmentMapper.delete( Wrappers.lambdaQuery(RecAttachment.class) - .in(RecAttachment::getUrl, deleteImageList) + .in(RecAttachment::getUrl, delete) ); - qiniuUtil.deleteBatch(deleteImageList.toArray(new String[0])); + fileApi.deleteBatch(delete); } } + @Override @Transactional(rollbackFor = Exception.class) public void delAttachmentByPid(String pid) { List list = attachmentMapper.selectList( @@ -128,9 +128,10 @@ public class RecordService implements RecordApi { attachmentMapper.delete(Wrappers.lambdaQuery(RecAttachment.class).eq(RecAttachment::getPid, pid)); List urls = list.stream().map(RecAttachment::getUrl).collect(Collectors.toList()); - qiniuUtil.deleteBatch(urls); + fileApi.deleteBatch(urls); } + @Override @Async("dbInsertExecutor") public void insertLoginHistory(RecLoginHistory history) { if (StringUtils.isEmpty(history.getAddress())) { @@ -140,6 +141,7 @@ public class RecordService implements RecordApi { loginHistoryMapper.insert(history); } + @Override @Async("dbInsertExecutor") public void insertUserAction(RecUserAction action) { action.setId(null); diff --git a/java/cloud/web/web-modules/record/src/main/resources/bootstrap.yml b/java/cloud/web/web-modules/record/src/main/resources/bootstrap.yml index 824b6ab..af76758 100644 --- a/java/cloud/web/web-modules/record/src/main/resources/bootstrap.yml +++ b/java/cloud/web/web-modules/record/src/main/resources/bootstrap.yml @@ -10,7 +10,6 @@ spring: shared-configs: - data-id: jxc-common-database.yml - data-id: jxc-common-redis.yml - - data-id: jxc-common-qiniu.yml discovery: server-addr: 127.0.0.1:8848 @@ -21,4 +20,6 @@ dubbo: scan: base-packages: cn.toesbieya.jxc.record.service registry: - address: nacos://127.0.0.1:8848 \ No newline at end of file + address: nacos://127.0.0.1:8848 + cloud: + subscribed-services: jxc-web-file \ No newline at end of file diff --git a/java/cloud/web/web-modules/statistic/src/main/java/cn/toesbieya/jxc/statistic/service/StatisticService.java b/java/cloud/web/web-modules/statistic/src/main/java/cn/toesbieya/jxc/statistic/service/StatisticService.java index 7532fe3..e842f6b 100644 --- a/java/cloud/web/web-modules/statistic/src/main/java/cn/toesbieya/jxc/statistic/service/StatisticService.java +++ b/java/cloud/web/web-modules/statistic/src/main/java/cn/toesbieya/jxc/statistic/service/StatisticService.java @@ -3,8 +3,8 @@ package cn.toesbieya.jxc.statistic.service; import cn.toesbieya.jxc.common.model.entity.StatFinishOrder; import cn.toesbieya.jxc.common.model.entity.StatProfitGoods; import cn.toesbieya.jxc.common.model.entity.StatProfitTotal; -import cn.toesbieya.jxc.common.utils.DateUtil; -import cn.toesbieya.jxc.common.utils.WebSocketUtil; +import cn.toesbieya.jxc.common.util.DateUtil; +import cn.toesbieya.jxc.common.util.WebSocketUtil; import cn.toesbieya.jxc.statistic.mapper.StatisticMapper; import cn.toesbieya.jxc.statistic.model.vo.FourBlockStat; import lombok.extern.slf4j.Slf4j; diff --git a/java/cloud/web/web-modules/stock/src/main/java/cn/toesbieya/jxc/stock/service/StockService.java b/java/cloud/web/web-modules/stock/src/main/java/cn/toesbieya/jxc/stock/service/StockService.java index 97e0a9b..ceed064 100644 --- a/java/cloud/web/web-modules/stock/src/main/java/cn/toesbieya/jxc/stock/service/StockService.java +++ b/java/cloud/web/web-modules/stock/src/main/java/cn/toesbieya/jxc/stock/service/StockService.java @@ -1,6 +1,6 @@ package cn.toesbieya.jxc.stock.service; -import cn.toesbieya.jxc.api.service.StockApi; +import cn.toesbieya.jxc.api.StockApi; import cn.toesbieya.jxc.common.exception.JsonResultException; import cn.toesbieya.jxc.common.model.entity.BizStock; import cn.toesbieya.jxc.common.model.vo.StockOutboundVo; @@ -9,7 +9,7 @@ import cn.toesbieya.jxc.common.model.vo.StockSearchResult; import cn.toesbieya.jxc.stock.mapper.StockMapper; import cn.toesbieya.jxc.stock.model.vo.StockExport; import cn.toesbieya.jxc.web.common.model.vo.PageResult; -import cn.toesbieya.jxc.web.common.utils.ExcelUtil; +import cn.toesbieya.jxc.web.common.util.ExcelUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; diff --git a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/RoleController.java b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/RoleController.java index 9a53b64..67c5702 100644 --- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/RoleController.java +++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/RoleController.java @@ -5,7 +5,7 @@ import cn.toesbieya.jxc.common.model.entity.SysUser; import cn.toesbieya.jxc.common.model.vo.Result; import cn.toesbieya.jxc.system.model.vo.RoleSearch; import cn.toesbieya.jxc.system.service.RoleService; -import cn.toesbieya.jxc.web.common.utils.SessionUtil; +import cn.toesbieya.jxc.web.common.util.SessionUtil; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/UserController.java b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/UserController.java index 6fb0ceb..d6134bd 100644 --- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/UserController.java +++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/controller/UserController.java @@ -5,7 +5,7 @@ import cn.toesbieya.jxc.common.model.entity.SysUser; import cn.toesbieya.jxc.common.model.vo.Result; import cn.toesbieya.jxc.system.model.vo.UserSearch; import cn.toesbieya.jxc.system.service.UserService; -import cn.toesbieya.jxc.web.common.utils.ThreadUtil; +import cn.toesbieya.jxc.web.common.util.ThreadUtil; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/CustomerService.java b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/CustomerService.java index 0d77241..4b78be7 100644 --- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/CustomerService.java +++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/CustomerService.java @@ -3,7 +3,7 @@ package cn.toesbieya.jxc.system.service; import cn.toesbieya.jxc.common.model.entity.SysCustomer; import cn.toesbieya.jxc.common.model.entity.SysRegion; import cn.toesbieya.jxc.common.model.vo.Result; -import cn.toesbieya.jxc.common.utils.Util; +import cn.toesbieya.jxc.common.util.Util; import cn.toesbieya.jxc.system.mapper.SysCustomerMapper; import cn.toesbieya.jxc.system.mapper.SysRegionMapper; import cn.toesbieya.jxc.system.model.vo.CustomerSearch; diff --git a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/DepartmentService.java b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/DepartmentService.java index d3369e4..694f558 100644 --- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/DepartmentService.java +++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/DepartmentService.java @@ -1,13 +1,13 @@ package cn.toesbieya.jxc.system.service; -import cn.toesbieya.jxc.api.service.system.DepartmentApi; +import cn.toesbieya.jxc.api.system.DepartmentApi; import cn.toesbieya.jxc.common.enumeration.DataScopeEnum; import cn.toesbieya.jxc.common.model.entity.SysDepartment; import cn.toesbieya.jxc.common.model.entity.SysRole; import cn.toesbieya.jxc.common.model.entity.SysUser; import cn.toesbieya.jxc.common.model.vo.DepartmentVo; import cn.toesbieya.jxc.common.model.vo.Result; -import cn.toesbieya.jxc.common.utils.Util; +import cn.toesbieya.jxc.common.util.Util; import cn.toesbieya.jxc.system.mapper.SysDepartmentMapper; import cn.toesbieya.jxc.web.common.annoation.UserAction; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/ResourceService.java b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/ResourceService.java index 65067b0..d4e5a0a 100644 --- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/ResourceService.java +++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/ResourceService.java @@ -1,6 +1,6 @@ package cn.toesbieya.jxc.system.service; -import cn.toesbieya.jxc.api.service.system.ResourceApi; +import cn.toesbieya.jxc.api.system.ResourceApi; import cn.toesbieya.jxc.common.model.entity.SysResource; import cn.toesbieya.jxc.common.model.entity.SysRole; import cn.toesbieya.jxc.common.model.vo.ResourceVo; diff --git a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/RoleService.java b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/RoleService.java index 1d71dec..e4e75fb 100644 --- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/RoleService.java +++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/RoleService.java @@ -1,6 +1,6 @@ package cn.toesbieya.jxc.system.service; -import cn.toesbieya.jxc.api.service.system.RoleApi; +import cn.toesbieya.jxc.api.system.RoleApi; import cn.toesbieya.jxc.common.enumeration.GeneralStatusEnum; import cn.toesbieya.jxc.common.model.entity.SysRole; import cn.toesbieya.jxc.common.model.vo.Result; diff --git a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/SupplierService.java b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/SupplierService.java index 8324efd..01ea622 100644 --- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/SupplierService.java +++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/SupplierService.java @@ -4,7 +4,7 @@ import cn.toesbieya.jxc.common.enumeration.GeneralStatusEnum; import cn.toesbieya.jxc.common.model.entity.SysRegion; import cn.toesbieya.jxc.common.model.entity.SysSupplier; import cn.toesbieya.jxc.common.model.vo.Result; -import cn.toesbieya.jxc.common.utils.Util; +import cn.toesbieya.jxc.common.util.Util; import cn.toesbieya.jxc.system.mapper.SysRegionMapper; import cn.toesbieya.jxc.system.mapper.SysSupplierMapper; import cn.toesbieya.jxc.system.model.vo.RegionValueResult; diff --git a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/UserService.java b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/UserService.java index 3cedd4a..5da0404 100644 --- a/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/UserService.java +++ b/java/cloud/web/web-modules/system/src/main/java/cn/toesbieya/jxc/system/service/UserService.java @@ -4,8 +4,8 @@ import cn.toesbieya.jxc.common.model.entity.SysRole; import cn.toesbieya.jxc.common.model.entity.SysUser; import cn.toesbieya.jxc.common.model.vo.Result; import cn.toesbieya.jxc.common.model.vo.UserVo; -import cn.toesbieya.jxc.common.utils.Util; -import cn.toesbieya.jxc.common.utils.WebSocketUtil; +import cn.toesbieya.jxc.common.util.Util; +import cn.toesbieya.jxc.common.util.WebSocketUtil; import cn.toesbieya.jxc.system.mapper.SysRoleMapper; import cn.toesbieya.jxc.system.mapper.SysUserMapper; import cn.toesbieya.jxc.system.model.vo.UserSearch; diff --git a/java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/config/RedisEventListenerConfig.java b/java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/config/RedisEventListenerConfig.java index 6220e11..67e6bb9 100644 --- a/java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/config/RedisEventListenerConfig.java +++ b/java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/config/RedisEventListenerConfig.java @@ -3,8 +3,8 @@ package cn.toesbieya.jxc.socket.config; import cn.toesbieya.jxc.common.constant.SessionConstant; import cn.toesbieya.jxc.common.constant.SocketConstant; import cn.toesbieya.jxc.common.model.vo.SocketEventVo; -import cn.toesbieya.jxc.common.utils.RedisUtil; -import cn.toesbieya.jxc.common.utils.SessionUtil; +import cn.toesbieya.jxc.common.util.RedisUtil; +import cn.toesbieya.jxc.common.util.SessionUtil; import cn.toesbieya.jxc.socket.server.WebSocketServer; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; diff --git a/java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/server/WebSocketServer.java b/java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/server/WebSocketServer.java index 11528f2..463a9bb 100644 --- a/java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/server/WebSocketServer.java +++ b/java/cloud/websocket/src/main/java/cn/toesbieya/jxc/socket/server/WebSocketServer.java @@ -3,8 +3,8 @@ package cn.toesbieya.jxc.socket.server; import cn.toesbieya.jxc.common.constant.SessionConstant; import cn.toesbieya.jxc.common.constant.SocketConstant; import cn.toesbieya.jxc.common.model.vo.SocketOfflineVo; -import cn.toesbieya.jxc.common.utils.RedisUtil; -import cn.toesbieya.jxc.common.utils.SessionUtil; +import cn.toesbieya.jxc.common.util.RedisUtil; +import cn.toesbieya.jxc.common.util.SessionUtil; import com.corundumstudio.socketio.AckRequest; import com.corundumstudio.socketio.SocketIOClient; import com.corundumstudio.socketio.SocketIOServer;