Browse Source

feat: 修改框架布局

master
Yen 3 months ago
parent
commit
106347e0e7
  1. 8
      .gitignore
  2. 2
      cms-api/cms-admin-svc/src/main/java/com/qs/serve/Application.java
  3. 25
      cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/AdminPortalController.java
  4. 14
      cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/CommonController.java
  5. 23
      cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/WxSvcLoginApi.java
  6. 4
      cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/HisTask.java
  7. 6
      cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/PayTask.java
  8. 15
      cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/HistTestController.java
  9. 4
      cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskActivityController.java
  10. 2
      cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskPayController.java
  11. 2
      cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskPolicyController.java
  12. 6
      cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskSupplierController.java
  13. 4
      cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskUserController.java
  14. 2
      cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskWechatController.java
  15. 13
      cms-api/cms-policy-svc/pom.xml
  16. 61
      cms-api/cms-policy-svc/src/main/java/com/qs/serve/PolicyApplication.java
  17. 52
      cms-api/cms-policy-svc/src/main/resources/application-dev.yml
  18. 87
      cms-api/cms-policy-svc/src/main/resources/application.yml
  19. 4
      cms-api/cms-policy-svc/src/main/resources/banner.txt
  20. 83
      cms-api/cms-policy-svc/src/main/resources/log4j2.xml
  21. 54
      cms-common/pom.xml
  22. 2
      cms-common/src/main/java/com/qs/serve/common/annotation/BusinessDifference.java
  23. 2
      cms-common/src/main/java/com/qs/serve/common/annotation/LimitSubmit.java
  24. 2
      cms-common/src/main/java/com/qs/serve/common/annotation/RepeatSubmit.java
  25. 8
      cms-common/src/main/java/com/qs/serve/common/annotation/SysLog.java
  26. 2
      cms-common/src/main/java/com/qs/serve/common/enums/BizType.java
  27. 2
      cms-common/src/main/java/com/qs/serve/common/enums/BudgetLogOptFlag.java
  28. 2
      cms-common/src/main/java/com/qs/serve/common/enums/ExcelFilePath.java
  29. 2
      cms-common/src/main/java/com/qs/serve/common/enums/HttpCode.java
  30. 2
      cms-common/src/main/java/com/qs/serve/common/enums/InterType.java
  31. 2
      cms-common/src/main/java/com/qs/serve/common/enums/MonthValues.java
  32. 2
      cms-common/src/main/java/com/qs/serve/common/enums/PolicyType.java
  33. 2
      cms-common/src/main/java/com/qs/serve/common/enums/SystemModule.java
  34. 6
      cms-common/src/main/java/com/qs/serve/common/exception/Assert.java
  35. 2
      cms-common/src/main/java/com/qs/serve/common/exception/BaseException.java
  36. 2
      cms-common/src/main/java/com/qs/serve/common/exception/BusinessException.java
  37. 71
      cms-common/src/main/java/com/qs/serve/common/exception/UnifiedExceptionHandler.java
  38. 2
      cms-common/src/main/java/com/qs/serve/common/utils/CopierUtil.java
  39. 4
      cms-common/src/main/java/com/qs/serve/common/utils/PageUtil.java
  40. 9
      cms-common/src/main/java/com/qs/serve/common/utils/ServletUtils.java
  41. 2
      cms-common/src/main/java/com/qs/serve/common/utils/StringUtils.java
  42. 4
      cms-common/src/main/java/com/qs/serve/common/utils/TreeUtil.java
  43. 3
      cms-common/src/main/java/com/qs/serve/common/utils/WordUtil.java
  44. 4
      cms-common/src/main/java/com/qs/serve/framework/base/model/PageVo.java
  45. 4
      cms-common/src/main/java/com/qs/serve/framework/base/model/R.java
  46. 19
      cms-common/src/main/java/com/qs/serve/framework/base/model/ResultFlag.java
  47. 2
      cms-common/src/main/java/com/qs/serve/framework/base/model/TreeNode.java
  48. 158
      cms-framework/cms-framework-base/pom.xml
  49. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/CustomServletContextInitializer.java
  50. 4
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/DevEnvironmentConfig.java
  51. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/JwtConfig.java
  52. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/RedisConfig.java
  53. 6
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/SpringMvcConfig.java
  54. 4
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/ThreadPoolConfig.java
  55. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/AliYunOssProperties.java
  56. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/AuthUrlConst.java
  57. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/PermitProperties.java
  58. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/ProjectApisProperties.java
  59. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/ProjectProperties.java
  60. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/QiShengDsProperties.java
  61. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/RedisProperties.java
  62. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/SeeYonProperties.java
  63. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/UploadProperties.java
  64. 10
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/LimitSubmitInterceptor.java
  65. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/LocalDateTimeFormatSerializer.java
  66. 8
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/RepeatSubmitInterceptor.java
  67. 6
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/manager/AsyncManager.java
  68. 4
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/RedisService.java
  69. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/TtlRedisCacheManager.java
  70. 4
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/handler/SecurityAccessDeniedHandler.java
  71. 4
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/handler/SecurityAuthenticationFailureHandler.java
  72. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/model/LoginUser.java
  73. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/model/LoginUserDTO.java
  74. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/model/LoginUserType.java
  75. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/util/SecurityPermitUtil.java
  76. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/AmountDTO.java
  77. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/HttpResponsePrintUtil.java
  78. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/BiCommonCounter.java
  79. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/BiMonthCounter.java
  80. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartAxisColumn.java
  81. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartDataVo.java
  82. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartGroupItem.java
  83. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartSeriesItem.java
  84. 4
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/PrintChart.java
  85. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/ApplyTypeConst.java
  86. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/BudgetLogRollbackFlag.java
  87. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/DSName.java
  88. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/GySysConst.java
  89. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/OssConst.java
  90. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/RedisCacheKeys.java
  91. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/SysConfigKey.java
  92. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/CommonIdsParam.java
  93. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/DateSplitDTO.java
  94. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/DiffFieldVal.java
  95. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/HeaderOption.java
  96. 4
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/RowParam.java
  97. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/SimpleCountValue.java
  98. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/SimpleKeyValue.java
  99. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/TargetDTO.java
  100. 2
      cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/TargetObjectDTO.java

8
.gitignore

@ -0,0 +1,8 @@
.idea/
logs/
target/
*.iml
*.http
*.env.json
*.json
/src/test/

2
cms-api/cms-admin-svc/src/main/java/com/qs/serve/Application.java

@ -1,6 +1,6 @@
package com.qs.serve; package com.qs.serve;
import com.qs.serve.common.config.DevEnvironmentConfig; import com.qs.serve.framework.base.config.DevEnvironmentConfig;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;

25
cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/AdminPortalController.java

@ -2,18 +2,19 @@ package com.qs.serve.controller;
import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.SecureUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.qs.serve.common.config.properties.ProjectProperties; import com.qs.serve.framework.base.config.properties.ProjectProperties;
import com.qs.serve.common.framework.redis.RedisService; import com.qs.serve.framework.base.framework.redis.RedisService;
import com.qs.serve.common.framework.security.model.LoginUserType; import com.qs.serve.framework.base.framework.security.model.LoginUserType;
import com.qs.serve.common.model.annotation.LimitSubmit; import com.qs.serve.common.annotation.LimitSubmit;
import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.annotation.SysLog;
import com.qs.serve.common.model.consts.GySysConst; import com.qs.serve.framework.base.model.consts.GySysConst;
import com.qs.serve.common.model.consts.RedisCacheKeys; import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
import com.qs.serve.common.model.dto.R; import com.qs.serve.framework.base.model.R;
import com.qs.serve.common.model.dto.SimpleKeyValue; import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.enums.BizType;
import com.qs.serve.common.util.*; import com.qs.serve.framework.base.util.*;
import com.qs.serve.common.util.model.DateFormatString; import com.qs.serve.framework.base.util.model.DateFormatString;
import com.qs.serve.common.utils.StringUtils;
import com.qs.serve.controller.dto.SyLoginParam; import com.qs.serve.controller.dto.SyLoginParam;
import com.qs.serve.modules.seeyon.SyKeyLoginUtil; import com.qs.serve.modules.seeyon.SyKeyLoginUtil;
import com.qs.serve.modules.bms.service.BmsSupplierAddressService; import com.qs.serve.modules.bms.service.BmsSupplierAddressService;

14
cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/CommonController.java

@ -1,12 +1,12 @@
package com.qs.serve.controller; package com.qs.serve.controller;
import com.qs.serve.common.config.properties.UploadProperties; import com.qs.serve.framework.base.config.properties.UploadProperties;
import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.annotation.SysLog;
import com.qs.serve.common.model.dto.R; import com.qs.serve.framework.base.model.R;
import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.enums.BizType;
import com.qs.serve.common.util.IdUtil; import com.qs.serve.framework.base.util.IdUtil;
import com.qs.serve.common.util.JwtUtils; import com.qs.serve.framework.base.util.JwtUtils;
import com.qs.serve.common.util.UploadUtil; import com.qs.serve.framework.base.util.UploadUtil;
import com.qs.serve.modules.oss.service.OssService; import com.qs.serve.modules.oss.service.OssService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

23
cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/WxSvcLoginApi.java

@ -1,15 +1,18 @@
package com.qs.serve.controller; package com.qs.serve.controller;
import com.qs.serve.common.framework.redis.RedisService; import com.qs.serve.common.exception.Assert;
import com.qs.serve.common.framework.security.model.LoginUser; import com.qs.serve.framework.base.framework.redis.RedisService;
import com.qs.serve.common.framework.security.model.LoginUserType; import com.qs.serve.framework.base.framework.security.model.LoginUser;
import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.framework.base.framework.security.model.LoginUserType;
import com.qs.serve.common.model.consts.RedisCacheKeys; import com.qs.serve.common.annotation.SysLog;
import com.qs.serve.common.model.dto.R; import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
import com.qs.serve.common.model.enums.BizType; import com.qs.serve.framework.base.model.R;
import com.qs.serve.common.model.enums.HttpCode; import com.qs.serve.common.enums.BizType;
import com.qs.serve.common.model.enums.InterType; import com.qs.serve.common.enums.HttpCode;
import com.qs.serve.common.util.*; import com.qs.serve.common.enums.InterType;
import com.qs.serve.framework.base.util.*;
import com.qs.serve.common.utils.ServletUtils;
import com.qs.serve.common.utils.StringUtils;
import com.qs.serve.modules.sys.common.AuthContextUtils; import com.qs.serve.modules.sys.common.AuthContextUtils;
import com.qs.serve.modules.sys.mapper.SysTenantMapper; import com.qs.serve.modules.sys.mapper.SysTenantMapper;
import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.sys.service.SysUserService;

4
cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/HisTask.java

@ -1,7 +1,7 @@
package com.qs.serve.task; package com.qs.serve.task;
import com.qs.serve.common.framework.redis.RedisService; import com.qs.serve.framework.base.framework.redis.RedisService;
import com.qs.serve.common.model.consts.RedisCacheKeys; import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
import com.qs.serve.modules.sys.common.AuthContextUtils; import com.qs.serve.modules.sys.common.AuthContextUtils;
import com.qs.serve.modules.his.service.HisUserSupplierTempService; import com.qs.serve.modules.his.service.HisUserSupplierTempService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

6
cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/PayTask.java

@ -1,10 +1,10 @@
package com.qs.serve.task; package com.qs.serve.task;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.qs.serve.common.config.properties.ProjectApisProperties; import com.qs.serve.framework.base.config.properties.ProjectApisProperties;
import com.qs.serve.common.model.AmountDTO; import com.qs.serve.framework.base.model.AmountDTO;
import com.qs.serve.modules.sys.common.AuthContextUtils; import com.qs.serve.modules.sys.common.AuthContextUtils;
import com.qs.serve.common.util.HttpUtil; import com.qs.serve.framework.base.util.HttpUtil;
import com.qs.serve.modules.pay.mapper.PayPaymentItemMapper; import com.qs.serve.modules.pay.mapper.PayPaymentItemMapper;
import com.qs.serve.modules.pay.mapper.PayPaymentMapper; import com.qs.serve.modules.pay.mapper.PayPaymentMapper;
import com.qs.serve.modules.tbs.entity.TbsCostApply; import com.qs.serve.modules.tbs.entity.TbsCostApply;

15
cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/HistTestController.java

@ -1,25 +1,18 @@
package com.qs.serve.task.controller; package com.qs.serve.task.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.qs.serve.framework.base.config.DevEnvironmentConfig;
import com.qs.serve.common.config.DevEnvironmentConfig; import com.qs.serve.framework.base.framework.redis.RedisService;
import com.qs.serve.common.framework.redis.RedisService; import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
import com.qs.serve.common.model.consts.RedisCacheKeys; import com.qs.serve.framework.base.model.R;
import com.qs.serve.common.model.dto.PageVo;
import com.qs.serve.common.model.dto.R;
import com.qs.serve.common.util.PageUtil;
import com.qs.serve.modules.his.service.HisUserChannelPointService; import com.qs.serve.modules.his.service.HisUserChannelPointService;
import com.qs.serve.modules.oms.entity.OmsOrder;
import com.qs.serve.task.HisTask; import com.qs.serve.task.HisTask;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/** /**
* @author YenHex * @author YenHex
* @since 2023/4/17 * @since 2023/4/17

4
cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskActivityController.java

@ -1,8 +1,8 @@
package com.qs.serve.task.controller; package com.qs.serve.task.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.qs.serve.common.model.dto.R; import com.qs.serve.framework.base.model.R;
import com.qs.serve.common.util.CollectionUtil; import com.qs.serve.framework.base.util.CollectionUtil;
import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService; import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService;
import com.qs.serve.modules.tbs.common.TbsActivityState; import com.qs.serve.modules.tbs.common.TbsActivityState;
import com.qs.serve.modules.tbs.common.TbsSeeYonConst; import com.qs.serve.modules.tbs.common.TbsSeeYonConst;

2
cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskPayController.java

@ -1,6 +1,6 @@
package com.qs.serve.task.controller; package com.qs.serve.task.controller;
import com.qs.serve.common.model.dto.R; import com.qs.serve.framework.base.model.R;
import com.qs.serve.modules.pay.service.impl.PayApplicationService; import com.qs.serve.modules.pay.service.impl.PayApplicationService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

2
cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskPolicyController.java

@ -1,6 +1,6 @@
package com.qs.serve.task.controller; package com.qs.serve.task.controller;
import com.qs.serve.common.model.dto.R; import com.qs.serve.framework.base.model.R;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

6
cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskSupplierController.java

@ -1,8 +1,8 @@
package com.qs.serve.task.controller; package com.qs.serve.task.controller;
import com.qs.serve.common.framework.redis.RedisService; import com.qs.serve.framework.base.framework.redis.RedisService;
import com.qs.serve.common.model.consts.RedisCacheKeys; import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
import com.qs.serve.common.model.dto.R; import com.qs.serve.framework.base.model.R;
import com.qs.serve.modules.his.service.HisUserSupplierTempService; import com.qs.serve.modules.his.service.HisUserSupplierTempService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

4
cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskUserController.java

@ -1,8 +1,8 @@
package com.qs.serve.task.controller; package com.qs.serve.task.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.qs.serve.common.model.dto.R; import com.qs.serve.framework.base.model.R;
import com.qs.serve.common.util.JsonUtil; import com.qs.serve.framework.base.util.JsonUtil;
import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
import com.qs.serve.modules.his.service.HisUserSupplierService; import com.qs.serve.modules.his.service.HisUserSupplierService;
import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService; import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService;

2
cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskWechatController.java

@ -1,6 +1,6 @@
package com.qs.serve.task.controller; package com.qs.serve.task.controller;
import com.qs.serve.common.model.dto.R; import com.qs.serve.framework.base.model.R;
import com.qs.serve.modules.wx.service.WxUserService; import com.qs.serve.modules.wx.service.WxUserService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

13
cms-api/cms-policy-svc/pom.xml

@ -16,4 +16,17 @@
<maven.compiler.target>8</maven.compiler.target> <maven.compiler.target>8</maven.compiler.target>
</properties> </properties>
<dependencies>
<dependency>
<groupId>com.qs</groupId>
<artifactId>cms-framework-mybatis-plus</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.qs</groupId>
<artifactId>cms-policy-bus</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project> </project>

61
cms-api/cms-policy-svc/src/main/java/com/qs/serve/PolicyApplication.java

@ -0,0 +1,61 @@
package com.qs.serve;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.stereotype.Indexed;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import javax.annotation.PostConstruct;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import java.util.TimeZone;
/**
* @author YenHex
* @since 2025/4/17
*/
@Indexed
@EnableAsync
@EnableScheduling
@EnableTransactionManagement
@EnableCaching
@EnableFeignClients
@SpringBootApplication
public class PolicyApplication extends SpringBootServletInitializer {
public static void main(String[] args){
long start = System.currentTimeMillis();
SpringApplication.run(PolicyApplication.class,args);
long end = System.currentTimeMillis();
double diff = (end-start)/1000.0;
System.out.println("启动时间:"+diff
+"\n ____ _ _ __ _ _ \n" +
" / ___| | |_ __ _ _ __ | |_ _ _ _ __ ___ _ _ ___ ___ ___ ___ ___ / _| _ _ | || |\n" +
" \\___ \\ | __|/ _` || '__|| __| | | | || '_ \\ / __|| | | | / __|/ __|/ _ \\/ __|/ __|| |_ | | | || || |\n" +
" ___) || |_| (_| || | | |_ | |_| || |_) | \\__ \\| |_| || (__| (__| __/\\__ \\\\__ \\| _|| |_| || ||_|\n" +
" |____/ \\__|\\__,_||_| \\__| \\__,_|| .__/ |___/ \\__,_| \\___|\\___|\\___||___/|___/|_| \\__,_||_|(_)\n" +
" |_| \n");
}
@Override
public void onStartup(ServletContext servletContext) throws ServletException {
super.onStartup(servletContext);
}
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
return builder.sources(PolicyApplication.class);
}
@PostConstruct
void started() {
TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
}
}

52
cms-api/cms-policy-svc/src/main/resources/application-dev.yml

@ -0,0 +1,52 @@
feign:
client:
config:
default:
connectTimeout: 5000 # 连接超时时间
readTimeout: 5000 # 读取超时时间
httpclient:
enabled: true
# 服务列表
service-list:
policy-svc: http://localhost:8081
#服务配置
server:
port: 7500
servlet:
context-path: /
#SpringBoot相关
spring:
datasource:
dynamic:
datasource:
master:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.0.9:3306/jsl_mall_qs_dev?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
username: kpjsl
password: 123456
#SpringBoot相关
hikari:
#连接池名
pool-name: DateHikariCP
#最小空闲连接数
minimum-idle: 10
# 空闲连接存活最大时间,默认600000(10分钟)
idle-timeout: 180000
# 连接池最大连接数,默认是10
maximum-pool-size: 30
# 此属性控制从池返回的连接的默认自动提交行为,默认值:true
auto-commit: true
# 此属性控制池中连接的最长生命周期,值0表示无限生命周期,默认1800000即30分钟
max-lifetime: 1800000
# 数据库连接超时时间,默认30秒,即30000
connection-timeout: 30000
connection-test-query: SELECT 1
validation-timeout: 1
login-timeout: 5
redis:
database: 1
host: 127.0.0.1
port: 6379
password:

87
cms-api/cms-policy-svc/src/main/resources/application.yml

@ -0,0 +1,87 @@
spring:
servlet:
multipart:
max-file-size: 100MB
max-request-size: 160MB
profiles:
active: dev
main:
#easypoi启用覆盖
allow-bean-definition-overriding: true
jmx:
enabled: false
devtools:
restart:
enabled: false
#项目配置
project:
ignore-url:
tenants: #忽略租户拦截
- /callback
- /favicon.ico
- /error
- /portal/syKeyLogin
- /bir/roiRate/test
- /static/*
- /api/wx/login/getCpSignature
- /web/*
permits: #忽略登录
- /thirty/** #第三方接口
- /portal/flushToken #第三方接口
- /common/upload #支持API上传调整
- /common/validToken #验证token
- /sys/attach/listByIds/**
- /api/**
- /static/**
- /web/**
- /portal/**
- /favicon.ico
- /error
- /callback
- /bir/roiRate/test
#mybatis plus
mybatis-plus:
mapper-locations: classpath:mapper/*/*.xml
type-aliases-package: com.qs.serve.modules.*.entity.*
configuration:
map-underscore-to-camel-case: true
#log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
global-config:
banner: false
db-config:
logic-delete-value: 1
logic-not-delete-value: 0
select-strategy: not_empty
logic-delete-field: delFlag
# 日志配置
logging:
level:
ROOT: debug
com.qs.serve: debug
com.qs.serve.modules.his: debug
com.qs.serve.modules.sys: debug
com.qs.serve.modules.tag: info
org.xnio.nio: info
org.springframework: info
com.baomidou: info
org.mybatis: info
org.hibernate.validator: info
druid.sql.ResultSet: info
druid.sql.Connection: info
com.zaxxer.hikari.pool: info
com.zaxxer.hikari.HikariConfig: info
com.qs.serve.modules.sys.mapper.SysOperationLogMapper: info
java.io: warn
io.netty: info
io.undertow: info
io.lettuce.core: info
config: classpath:log4j2.xml
# PageHelper分页插件
pagehelper:
reasonable: false
#helper-dialect: sqlserver
autoRuntimeDialect: true
supportMethodsArguments: true
params: count=countSql

4
cms-api/cms-policy-svc/src/main/resources/banner.txt

@ -0,0 +1,4 @@
${AnsiBackground.BLACK}
-- ----------------------------
-- 嘉士利CRM系统 by.柒胜
-- ----------------------------

83
cms-api/cms-policy-svc/src/main/resources/log4j2.xml

@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--Configuration后面的status,这个用于设置log4j2自身内部的信息输出,可以不设置,当设置成trace时,你会看到log4j2内部各种详细输出-->
<!--monitorInterval:Log4j能够自动检测修改配置 文件和重新配置本身,设置间隔秒数-->
<configuration monitorInterval="5">
<!--日志级别以及优先级排序: OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL -->
<!--变量配置-->
<Properties>
<property name="LOG_PATTERN" value="%d %highlight{%-5level}{ERROR=Bright RED, WARN=Bright Yellow, INFO=Bright Green, DEBUG=Bright Cyan, TRACE=Bright White} %style{[%t]}{bright,magenta} %style{%c{1.}.%M(%L)}{cyan}: %msg%n" />
<property name="FILE_PATH" value="home/logs" />
</Properties>
<appenders>
<!-- console -->
<console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="${LOG_PATTERN}"/>
<ThresholdFilter level="all" onMatch="ACCEPT" onMismatch="DENY"/>
</console>
<File name="FileLog" fileName="${FILE_PATH}/test.log" append="false" filePattern="${FILE_PATH}/test-%d{yyyy-MM-dd}_%i.log.gz">
<PatternLayout pattern="${LOG_PATTERN}"/>
<Policies>
<TimeBasedTriggeringPolicy interval="1"/>
<SizeBasedTriggeringPolicy size="10MB"/>
</Policies>
<DefaultRolloverStrategy max="15"/>
</File>
<!-- debug -->
<RollingFile name="RollingFileDebug" fileName="${FILE_PATH}/debug.log" filePattern="${FILE_PATH}/debug-%d{yyyy-MM-dd}_%i.log.gz">
<ThresholdFilter level="all" onMatch="ACCEPT" onMismatch="DENY"/>
<Policies>
<TimeBasedTriggeringPolicy interval="1"/>
<SizeBasedTriggeringPolicy size="10MB"/>
</Policies>
<DefaultRolloverStrategy max="15"/>
</RollingFile>
<!-- info -->
<RollingFile name="RollingFileInfo" fileName="${FILE_PATH}/info.log" filePattern="${FILE_PATH}/info-%d{yyyy-MM-dd}_%i.log.gz">
<ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
<PatternLayout pattern="${LOG_PATTERN}"/>
<Policies>
<TimeBasedTriggeringPolicy interval="1"/>
<SizeBasedTriggeringPolicy size="10MB"/>
</Policies>
<DefaultRolloverStrategy max="15"/>
</RollingFile>
<!-- warn -->
<RollingFile name="RollingFileWarn" fileName="${FILE_PATH}/warn.log" filePattern="${FILE_PATH}/warn-%d{yyyy-MM-dd}_%i.log.gz">
<ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
<PatternLayout pattern="${LOG_PATTERN}"/>
<Policies>
<TimeBasedTriggeringPolicy interval="1"/>
<SizeBasedTriggeringPolicy size="10MB"/>
</Policies>
<DefaultRolloverStrategy max="15"/>
</RollingFile>
<!-- error -->
<RollingFile name="RollingFileError" fileName="${FILE_PATH}/error.log" filePattern="${FILE_PATH}/error-%d{yyyy-MM-dd}_%i.log.gz">
<ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
<PatternLayout pattern="${LOG_PATTERN}"/>
<Policies>
<TimeBasedTriggeringPolicy interval="1"/>
<SizeBasedTriggeringPolicy size="10MB"/>
</Policies>
<DefaultRolloverStrategy max="15"/>
</RollingFile>
</appenders>
<loggers>
<root level="debug">
<appender-ref ref="Console"/>
<appender-ref ref="FileLog"/>
<appender-ref ref="RollingFileDebug"/>
<appender-ref ref="RollingFileInfo"/>
<appender-ref ref="RollingFileWarn"/>
<appender-ref ref="RollingFileError"/>
</root>
</loggers>
</configuration>

54
cms-common/pom.xml

@ -23,6 +23,60 @@
<artifactId>spring-cloud-starter-openfeign</artifactId> <artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.4.4</version>
<exclusions>
<exclusion>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>
</exclusion>
<exclusion>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter</artifactId>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-logging</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-web</artifactId>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-tomcat</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>

2
cms-framework/src/main/java/com/qs/serve/common/model/annotation/BusinessDifference.java → cms-common/src/main/java/com/qs/serve/common/annotation/BusinessDifference.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.annotation; package com.qs.serve.common.annotation;
import java.lang.annotation.*; import java.lang.annotation.*;

2
cms-framework/src/main/java/com/qs/serve/common/model/annotation/LimitSubmit.java → cms-common/src/main/java/com/qs/serve/common/annotation/LimitSubmit.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.annotation; package com.qs.serve.common.annotation;
import java.lang.annotation.*; import java.lang.annotation.*;

2
cms-framework/src/main/java/com/qs/serve/common/model/annotation/RepeatSubmit.java → cms-common/src/main/java/com/qs/serve/common/annotation/RepeatSubmit.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.annotation; package com.qs.serve.common.annotation;
/** /**
* 防止表单重复提交 * 防止表单重复提交

8
cms-framework/src/main/java/com/qs/serve/common/model/annotation/SysLog.java → cms-common/src/main/java/com/qs/serve/common/annotation/SysLog.java

@ -1,8 +1,8 @@
package com.qs.serve.common.model.annotation; package com.qs.serve.common.annotation;
import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.enums.BizType;
import com.qs.serve.common.model.enums.InterType; import com.qs.serve.common.enums.InterType;
import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.enums.SystemModule;
import java.lang.annotation.*; import java.lang.annotation.*;

2
cms-framework/src/main/java/com/qs/serve/common/model/enums/BizType.java → cms-common/src/main/java/com/qs/serve/common/enums/BizType.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.enums; package com.qs.serve.common.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

2
cms-framework/src/main/java/com/qs/serve/common/model/enums/BudgetLogOptFlag.java → cms-common/src/main/java/com/qs/serve/common/enums/BudgetLogOptFlag.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.enums; package com.qs.serve.common.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

2
cms-framework/src/main/java/com/qs/serve/common/model/enums/ExcelFilePath.java → cms-common/src/main/java/com/qs/serve/common/enums/ExcelFilePath.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.enums; package com.qs.serve.common.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
cms-framework/src/main/java/com/qs/serve/common/model/enums/HttpCode.java → cms-common/src/main/java/com/qs/serve/common/enums/HttpCode.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.enums; package com.qs.serve.common.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

2
cms-framework/src/main/java/com/qs/serve/common/model/enums/InterType.java → cms-common/src/main/java/com/qs/serve/common/enums/InterType.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.enums; package com.qs.serve.common.enums;
/** /**
* @author YenHex * @author YenHex

2
cms-framework/src/main/java/com/qs/serve/common/model/enums/MonthValues.java → cms-common/src/main/java/com/qs/serve/common/enums/MonthValues.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.enums; package com.qs.serve.common.enums;
/** /**
* @author YenHex * @author YenHex

2
cms-framework/src/main/java/com/qs/serve/common/model/enums/PolicyType.java → cms-common/src/main/java/com/qs/serve/common/enums/PolicyType.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.enums; package com.qs.serve.common.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

2
cms-framework/src/main/java/com/qs/serve/common/model/enums/SystemModule.java → cms-common/src/main/java/com/qs/serve/common/enums/SystemModule.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.enums; package com.qs.serve.common.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

6
cms-framework/src/main/java/com/qs/serve/common/util/Assert.java → cms-common/src/main/java/com/qs/serve/common/exception/Assert.java

@ -1,8 +1,8 @@
package com.qs.serve.common.util; package com.qs.serve.common.exception;
import com.qs.serve.common.framework.exception.BusinessException; import com.qs.serve.common.exception.BusinessException;
import com.qs.serve.common.model.enums.HttpCode; import com.qs.serve.common.enums.HttpCode;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
/** /**

2
cms-framework/src/main/java/com/qs/serve/common/framework/exception/BaseException.java → cms-common/src/main/java/com/qs/serve/common/exception/BaseException.java

@ -1,4 +1,4 @@
package com.qs.serve.common.framework.exception; package com.qs.serve.common.exception;
/** /**
* @author JcYen * @author JcYen

2
cms-framework/src/main/java/com/qs/serve/common/framework/exception/BusinessException.java → cms-common/src/main/java/com/qs/serve/common/exception/BusinessException.java

@ -1,4 +1,4 @@
package com.qs.serve.common.framework.exception; package com.qs.serve.common.exception;
import java.io.Serializable; import java.io.Serializable;

71
cms-framework/src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java → cms-common/src/main/java/com/qs/serve/common/exception/UnifiedExceptionHandler.java

@ -1,15 +1,14 @@
package com.qs.serve.common.framework.exception; package com.qs.serve.common.exception;
import com.qs.serve.common.config.DevEnvironmentConfig; import com.qs.serve.framework.base.model.R;
import com.qs.serve.common.model.dto.R;
import com.qs.serve.common.model.enums.HttpCode;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.dao.DuplicateKeyException; import org.springframework.dao.DuplicateKeyException;
import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.http.converter.HttpMessageNotReadableException;
import org.springframework.http.converter.HttpMessageNotWritableException; import org.springframework.http.converter.HttpMessageNotWritableException;
import org.springframework.security.access.AccessDeniedException; //import com.qs.serve.common.enums.HttpCode;
import org.springframework.security.authentication.BadCredentialsException; //import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.core.userdetails.UsernameNotFoundException; //import org.springframework.security.authentication.BadCredentialsException;
//import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.validation.BindException; import org.springframework.validation.BindException;
import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.HttpRequestMethodNotSupportedException;
@ -54,33 +53,33 @@ public class UnifiedExceptionHandler {
return R.error("数据不存在或被移除"); return R.error("数据不存在或被移除");
} }
@ExceptionHandler({ // @ExceptionHandler({
AccessDeniedException.class // AccessDeniedException.class
}) // })
@ResponseBody // @ResponseBody
public R handleAccessException(AccessDeniedException e,HttpServletRequest request) { // public R handleAccessException(AccessDeniedException e,HttpServletRequest request) {
HttpCode hc = HttpCode.FORBIDDEN_403; // HttpCode hc = HttpCode.FORBIDDEN_403;
log.error("访问拦截【{}】,请求地址:{}",e.getMessage(),request.getRequestURI()); // log.error("访问拦截【{}】,请求地址:{}",e.getMessage(),request.getRequestURI());
return new R(hc.getCode(),hc.getMsg()); // return new R(hc.getCode(),hc.getMsg());
} // }
//
@ExceptionHandler({ // @ExceptionHandler({
UsernameNotFoundException.class, // UsernameNotFoundException.class,
}) // })
@ResponseBody // @ResponseBody
public R handlePrintMsgException(UsernameNotFoundException e) { // public R handlePrintMsgException(UsernameNotFoundException e) {
return R.error(); // return R.error();
} // }
//
@ExceptionHandler({ // @ExceptionHandler({
BadCredentialsException.class, // BadCredentialsException.class,
}) // })
@ResponseBody // @ResponseBody
public R handlePrintMsgException(Exception e) { // public R handlePrintMsgException(Exception e) {
log.warn(e.getMessage()); // log.warn(e.getMessage());
HttpCode hc = HttpCode.LOGIN_ERR_1; // HttpCode hc = HttpCode.LOGIN_ERR_1;
return new R(hc.getCode(),hc.getMsg()); // return new R(hc.getCode(),hc.getMsg());
} // }
@ExceptionHandler({ @ExceptionHandler({
BindException.class, BindException.class,
@ -89,9 +88,6 @@ public class UnifiedExceptionHandler {
@ResponseBody @ResponseBody
public R handleDevPrintMsgException(Exception e,HttpServletRequest request) { public R handleDevPrintMsgException(Exception e,HttpServletRequest request) {
log.error("参数校验异常:{}",e.getMessage()); log.error("参数校验异常:{}",e.getMessage());
if(DevEnvironmentConfig.isDev()){
return R.error(e.getMessage());
}
return R.error(); return R.error();
} }
@ -146,7 +142,6 @@ public class UnifiedExceptionHandler {
public R handleException(Exception e,HttpServletRequest request) { public R handleException(Exception e,HttpServletRequest request) {
log.error("Servlet异常\n请求地址:{},异常类型:{}\n异常信息:{}\n异常体:",request.getRequestURI(),e.getClass().getSimpleName(),e.getMessage(),e); log.error("Servlet异常\n请求地址:{},异常类型:{}\n异常信息:{}\n异常体:",request.getRequestURI(),e.getClass().getSimpleName(),e.getMessage(),e);
e.printStackTrace(); e.printStackTrace();
if(DevEnvironmentConfig.isDev()){return R.error(e.getMessage());}
return R.error(); return R.error();
} }

2
cms-framework/src/main/java/com/qs/serve/common/util/CopierUtil.java → cms-common/src/main/java/com/qs/serve/common/utils/CopierUtil.java

@ -1,4 +1,4 @@
package com.qs.serve.common.util; package com.qs.serve.common.utils;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import org.springframework.cglib.beans.BeanCopier; import org.springframework.cglib.beans.BeanCopier;

4
cms-framework/src/main/java/com/qs/serve/common/util/PageUtil.java → cms-common/src/main/java/com/qs/serve/common/utils/PageUtil.java

@ -1,9 +1,9 @@
package com.qs.serve.common.util; package com.qs.serve.common.utils;
import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.qs.serve.common.framework.exception.BusinessException; import com.qs.serve.common.exception.BusinessException;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import java.util.ArrayList; import java.util.ArrayList;

9
cms-framework/src/main/java/com/qs/serve/common/util/ServletUtils.java → cms-common/src/main/java/com/qs/serve/common/utils/ServletUtils.java

@ -1,6 +1,5 @@
package com.qs.serve.common.util; package com.qs.serve.common.utils;
import com.qs.serve.common.model.consts.GySysConst;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestAttributes;
@ -23,6 +22,10 @@ import java.nio.charset.StandardCharsets;
**/ **/
@UtilityClass @UtilityClass
public class ServletUtils { public class ServletUtils {
/** 后台身份验证 */
public static final String AUTHORIZATION_PROP = "Authorization";
/** /**
* 获取String参数 * 获取String参数
*/ */
@ -32,7 +35,7 @@ public class ServletUtils {
public static String getAuthToken(){ public static String getAuthToken(){
HttpServletRequest request = getRequest(); HttpServletRequest request = getRequest();
return request.getHeader(GySysConst.AUTHORIZATION_PROP); return request.getHeader(AUTHORIZATION_PROP);
} }
/** /**

2
cms-framework/src/main/java/com/qs/serve/common/util/StringUtils.java → cms-common/src/main/java/com/qs/serve/common/utils/StringUtils.java

@ -1,4 +1,4 @@
package com.qs.serve.common.util; package com.qs.serve.common.utils;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;

4
cms-framework/src/main/java/com/qs/serve/common/util/TreeUtil.java → cms-common/src/main/java/com/qs/serve/common/utils/TreeUtil.java

@ -1,6 +1,6 @@
package com.qs.serve.common.util; package com.qs.serve.common.utils;
import com.qs.serve.common.model.dto.TreeNode; import com.qs.serve.framework.base.model.TreeNode;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import java.util.ArrayList; import java.util.ArrayList;

3
cms-framework/src/main/java/com/qs/serve/common/util/WordUtil.java → cms-common/src/main/java/com/qs/serve/common/utils/WordUtil.java

@ -1,5 +1,6 @@
package com.qs.serve.common.util; package com.qs.serve.common.utils;
import com.qs.serve.common.utils.StringUtils;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
/** /**

4
cms-framework/src/main/java/com/qs/serve/common/model/dto/PageVo.java → cms-common/src/main/java/com/qs/serve/framework/base/model/PageVo.java

@ -1,6 +1,6 @@
package com.qs.serve.common.model.dto; package com.qs.serve.framework.base.model;
import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.utils.PageUtil;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

4
cms-framework/src/main/java/com/qs/serve/common/model/dto/R.java → cms-common/src/main/java/com/qs/serve/framework/base/model/R.java

@ -1,8 +1,8 @@
package com.qs.serve.common.model.dto; package com.qs.serve.framework.base.model;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.utils.PageUtil;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

19
cms-common/src/main/java/com/qs/serve/framework/base/model/ResultFlag.java

@ -0,0 +1,19 @@
package com.qs.serve.framework.base.model;
/**
* @author YenHex
* @since 2023/2/15
*/
public interface ResultFlag {
int OK = 1;
int NOT = 0;
static boolean isTrue(Integer flag) {
if (flag!=null && flag.equals(OK)){
return true;
}
return false;
}
}

2
cms-framework/src/main/java/com/qs/serve/common/model/dto/TreeNode.java → cms-common/src/main/java/com/qs/serve/framework/base/model/TreeNode.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.dto; package com.qs.serve.framework.base.model;
import lombok.Data; import lombok.Data;

158
cms-framework/cms-framework-base/pom.xml

@ -0,0 +1,158 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>cms-framework</artifactId>
<groupId>com.qs</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cms-framework-base</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>com.qs</groupId>
<artifactId>cms-common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.10.0</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>3.3.2</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>${jwt.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.15</version>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>8.4.1.jre8</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-mp</artifactId>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-cp</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.tencentcloudapi</groupId>
<artifactId>tencentcloud-sdk-java</artifactId>
<version>3.1.598</version>
</dependency>
<dependency>
<groupId>com.github.shalousun</groupId>
<artifactId>smart-doc</artifactId>
<version>2.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<version>3.16.1</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.10</version>
</dependency>
</dependencies>
</project>

2
cms-framework/src/main/java/com/qs/serve/common/config/CustomServletContextInitializer.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/CustomServletContextInitializer.java

@ -1,4 +1,4 @@
package com.qs.serve.common.config; package com.qs.serve.framework.base.config;
import org.springframework.boot.web.servlet.ServletContextInitializer; import org.springframework.boot.web.servlet.ServletContextInitializer;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;

4
cms-framework/src/main/java/com/qs/serve/common/config/DevEnvironmentConfig.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/DevEnvironmentConfig.java

@ -1,6 +1,6 @@
package com.qs.serve.common.config; package com.qs.serve.framework.base.config;
import com.qs.serve.common.util.Assert; import com.qs.serve.common.exception.Assert;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

2
cms-framework/src/main/java/com/qs/serve/common/config/JwtConfig.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/JwtConfig.java

@ -1,4 +1,4 @@
package com.qs.serve.common.config; package com.qs.serve.framework.base.config;
import lombok.Getter; import lombok.Getter;

2
cms-framework/src/main/java/com/qs/serve/common/config/RedisConfig.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/RedisConfig.java

@ -1,4 +1,4 @@
package com.qs.serve.common.config; package com.qs.serve.framework.base.config;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

6
cms-framework/src/main/java/com/qs/serve/common/config/SpringMvcConfig.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/SpringMvcConfig.java

@ -1,7 +1,7 @@
package com.qs.serve.common.config; package com.qs.serve.framework.base.config;
import com.qs.serve.common.config.properties.ProjectProperties; import com.qs.serve.framework.base.config.properties.ProjectProperties;
import com.qs.serve.common.framework.interceptor.LimitSubmitInterceptor; import com.qs.serve.framework.base.framework.interceptor.LimitSubmitInterceptor;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;

4
cms-framework/src/main/java/com/qs/serve/common/config/ThreadPoolConfig.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/ThreadPoolConfig.java

@ -1,6 +1,6 @@
package com.qs.serve.common.config; package com.qs.serve.framework.base.config;
import com.qs.serve.common.util.ThreadsUtils; import com.qs.serve.framework.base.util.ThreadsUtils;
import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.apache.commons.lang3.concurrent.BasicThreadFactory;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;

2
cms-framework/src/main/java/com/qs/serve/common/config/properties/AliYunOssProperties.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/AliYunOssProperties.java

@ -1,4 +1,4 @@
package com.qs.serve.common.config.properties; package com.qs.serve.framework.base.config.properties;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

2
cms-framework/src/main/java/com/qs/serve/common/config/properties/AuthUrlConst.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/AuthUrlConst.java

@ -1,4 +1,4 @@
package com.qs.serve.common.config.properties; package com.qs.serve.framework.base.config.properties;
/** /**
* @author YenHex * @author YenHex

2
cms-framework/src/main/java/com/qs/serve/common/config/properties/PermitProperties.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/PermitProperties.java

@ -1,4 +1,4 @@
package com.qs.serve.common.config.properties; package com.qs.serve.framework.base.config.properties;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

2
cms-framework/src/main/java/com/qs/serve/common/config/properties/ProjectApisProperties.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/ProjectApisProperties.java

@ -1,4 +1,4 @@
package com.qs.serve.common.config.properties; package com.qs.serve.framework.base.config.properties;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

2
cms-framework/src/main/java/com/qs/serve/common/config/properties/ProjectProperties.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/ProjectProperties.java

@ -1,4 +1,4 @@
package com.qs.serve.common.config.properties; package com.qs.serve.framework.base.config.properties;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

2
cms-framework/src/main/java/com/qs/serve/common/config/properties/QiShengDsProperties.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/QiShengDsProperties.java

@ -1,4 +1,4 @@
package com.qs.serve.common.config.properties; package com.qs.serve.framework.base.config.properties;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

2
cms-framework/src/main/java/com/qs/serve/common/config/properties/RedisProperties.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/RedisProperties.java

@ -1,4 +1,4 @@
package com.qs.serve.common.config.properties; package com.qs.serve.framework.base.config.properties;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

2
cms-framework/src/main/java/com/qs/serve/common/config/properties/SeeYonProperties.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/SeeYonProperties.java

@ -1,4 +1,4 @@
package com.qs.serve.common.config.properties; package com.qs.serve.framework.base.config.properties;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

2
cms-framework/src/main/java/com/qs/serve/common/config/properties/UploadProperties.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/UploadProperties.java

@ -1,4 +1,4 @@
package com.qs.serve.common.config.properties; package com.qs.serve.framework.base.config.properties;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

10
cms-framework/src/main/java/com/qs/serve/common/framework/interceptor/LimitSubmitInterceptor.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/LimitSubmitInterceptor.java

@ -1,9 +1,9 @@
package com.qs.serve.common.framework.interceptor; package com.qs.serve.framework.base.framework.interceptor;
import com.qs.serve.common.framework.redis.RedisService; import com.qs.serve.framework.base.framework.redis.RedisService;
import com.qs.serve.common.model.HttpResponsePrintUtil; import com.qs.serve.framework.base.model.HttpResponsePrintUtil;
import com.qs.serve.common.model.annotation.LimitSubmit; import com.qs.serve.common.annotation.LimitSubmit;
import com.qs.serve.common.util.StringUtils; import com.qs.serve.common.utils.StringUtils;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.web.method.HandlerMethod; import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerInterceptor;

2
cms-framework/src/main/java/com/qs/serve/common/framework/interceptor/LocalDateTimeFormatSerializer.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/LocalDateTimeFormatSerializer.java

@ -1,4 +1,4 @@
package com.qs.serve.common.framework.interceptor; package com.qs.serve.framework.base.framework.interceptor;
import com.alibaba.fastjson.serializer.JSONSerializer; import com.alibaba.fastjson.serializer.JSONSerializer;
import com.alibaba.fastjson.serializer.ObjectSerializer; import com.alibaba.fastjson.serializer.ObjectSerializer;

8
cms-framework/src/main/java/com/qs/serve/common/framework/interceptor/RepeatSubmitInterceptor.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/RepeatSubmitInterceptor.java

@ -1,8 +1,8 @@
package com.qs.serve.common.framework.interceptor; package com.qs.serve.framework.base.framework.interceptor;
import com.qs.serve.common.model.HttpResponsePrintUtil; import com.qs.serve.framework.base.model.HttpResponsePrintUtil;
import com.qs.serve.common.model.annotation.RepeatSubmit; import com.qs.serve.common.annotation.RepeatSubmit;
import com.qs.serve.common.util.JsonUtil; import com.qs.serve.framework.base.util.JsonUtil;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.web.method.HandlerMethod; import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerInterceptor;

6
cms-framework/src/main/java/com/qs/serve/common/framework/manager/AsyncManager.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/manager/AsyncManager.java

@ -1,7 +1,7 @@
package com.qs.serve.common.framework.manager; package com.qs.serve.framework.base.framework.manager;
import com.qs.serve.common.util.SpringUtils; import com.qs.serve.framework.base.util.SpringUtils;
import com.qs.serve.common.util.ThreadsUtils; import com.qs.serve.framework.base.util.ThreadsUtils;
import java.util.TimerTask; import java.util.TimerTask;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;

4
cms-framework/src/main/java/com/qs/serve/common/framework/redis/RedisService.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/RedisService.java

@ -1,6 +1,6 @@
package com.qs.serve.common.framework.redis; package com.qs.serve.framework.base.framework.redis;
import com.qs.serve.common.util.Assert; import com.qs.serve.common.exception.Assert;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;

2
cms-framework/src/main/java/com/qs/serve/common/framework/redis/TtlRedisCacheManager.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/TtlRedisCacheManager.java

@ -1,4 +1,4 @@
package com.qs.serve.common.framework.redis; package com.qs.serve.framework.base.framework.redis;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.cache.RedisCache; import org.springframework.data.redis.cache.RedisCache;

4
cms-framework/src/main/java/com/qs/serve/common/framework/security/handler/SecurityAccessDeniedHandler.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/handler/SecurityAccessDeniedHandler.java

@ -1,6 +1,6 @@
package com.qs.serve.common.framework.security.handler; package com.qs.serve.framework.base.framework.security.handler;
import com.qs.serve.common.model.HttpResponsePrintUtil; import com.qs.serve.framework.base.model.HttpResponsePrintUtil;
import org.springframework.security.access.AccessDeniedException; import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.web.access.AccessDeniedHandler; import org.springframework.security.web.access.AccessDeniedHandler;

4
cms-framework/src/main/java/com/qs/serve/common/framework/security/handler/SecurityAuthenticationFailureHandler.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/handler/SecurityAuthenticationFailureHandler.java

@ -1,6 +1,6 @@
package com.qs.serve.common.framework.security.handler; package com.qs.serve.framework.base.framework.security.handler;
import com.qs.serve.common.model.HttpResponsePrintUtil; import com.qs.serve.framework.base.model.HttpResponsePrintUtil;
import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.authentication.AuthenticationFailureHandler; import org.springframework.security.web.authentication.AuthenticationFailureHandler;

2
cms-framework/src/main/java/com/qs/serve/common/framework/security/model/LoginUser.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/model/LoginUser.java

@ -1,4 +1,4 @@
package com.qs.serve.common.framework.security.model; package com.qs.serve.framework.base.framework.security.model;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

2
cms-framework/src/main/java/com/qs/serve/common/framework/security/model/LoginUserDTO.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/model/LoginUserDTO.java

@ -1,4 +1,4 @@
package com.qs.serve.common.framework.security.model; package com.qs.serve.framework.base.framework.security.model;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

2
cms-framework/src/main/java/com/qs/serve/common/framework/security/model/LoginUserType.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/model/LoginUserType.java

@ -1,4 +1,4 @@
package com.qs.serve.common.framework.security.model; package com.qs.serve.framework.base.framework.security.model;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

2
cms-framework/src/main/java/com/qs/serve/common/framework/security/util/SecurityPermitUtil.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/util/SecurityPermitUtil.java

@ -1,4 +1,4 @@
package com.qs.serve.common.framework.security.util; package com.qs.serve.framework.base.framework.security.util;
/** /**
* @Author JcYen * @Author JcYen

2
cms-framework/src/main/java/com/qs/serve/common/model/AmountDTO.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/AmountDTO.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model; package com.qs.serve.framework.base.model;
import lombok.Data; import lombok.Data;

2
cms-framework/src/main/java/com/qs/serve/common/model/HttpResponsePrintUtil.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/HttpResponsePrintUtil.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model; package com.qs.serve.framework.base.model;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;

2
cms-framework/src/main/java/com/qs/serve/common/model/chart/BiCommonCounter.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/BiCommonCounter.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.chart; package com.qs.serve.framework.base.model.chart;
import lombok.Data; import lombok.Data;

2
cms-framework/src/main/java/com/qs/serve/common/model/chart/BiMonthCounter.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/BiMonthCounter.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.chart; package com.qs.serve.framework.base.model.chart;
import lombok.Data; import lombok.Data;

2
cms-framework/src/main/java/com/qs/serve/common/model/chart/ChartAxisColumn.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartAxisColumn.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.chart; package com.qs.serve.framework.base.model.chart;
import lombok.Data; import lombok.Data;

2
cms-framework/src/main/java/com/qs/serve/common/model/chart/ChartDataVo.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartDataVo.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.chart; package com.qs.serve.framework.base.model.chart;
import lombok.Data; import lombok.Data;

2
cms-framework/src/main/java/com/qs/serve/common/model/chart/ChartGroupItem.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartGroupItem.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.chart; package com.qs.serve.framework.base.model.chart;
import lombok.Data; import lombok.Data;

2
cms-framework/src/main/java/com/qs/serve/common/model/chart/ChartSeriesItem.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartSeriesItem.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.chart; package com.qs.serve.framework.base.model.chart;
import lombok.Data; import lombok.Data;

4
cms-framework/src/main/java/com/qs/serve/common/model/chart/PrintChart.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/PrintChart.java

@ -1,6 +1,6 @@
package com.qs.serve.common.model.chart; package com.qs.serve.framework.base.model.chart;
import com.qs.serve.common.util.JsonUtil; import com.qs.serve.framework.base.util.JsonUtil;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;

2
cms-framework/src/main/java/com/qs/serve/common/model/consts/ApplyTypeConst.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/ApplyTypeConst.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.consts; package com.qs.serve.framework.base.model.consts;
/** /**
* @author YenHex * @author YenHex

2
cms-framework/src/main/java/com/qs/serve/common/model/consts/BudgetLogRollbackFlag.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/BudgetLogRollbackFlag.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.consts; package com.qs.serve.framework.base.model.consts;
/** /**
* @author YenHex * @author YenHex

2
cms-framework/src/main/java/com/qs/serve/common/model/consts/DSName.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/DSName.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.consts; package com.qs.serve.framework.base.model.consts;
/** /**
* @author YenHex * @author YenHex

2
cms-framework/src/main/java/com/qs/serve/common/model/consts/GySysConst.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/GySysConst.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.consts; package com.qs.serve.framework.base.model.consts;
/** /**
* 系统字段 * 系统字段

2
cms-framework/src/main/java/com/qs/serve/common/model/consts/OssConst.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/OssConst.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.consts; package com.qs.serve.framework.base.model.consts;
/** /**
* @author YenHex * @author YenHex

2
cms-framework/src/main/java/com/qs/serve/common/model/consts/RedisCacheKeys.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/RedisCacheKeys.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.consts; package com.qs.serve.framework.base.model.consts;
/** /**
* @author YenHex * @author YenHex

2
cms-framework/src/main/java/com/qs/serve/common/model/consts/SysConfigKey.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/SysConfigKey.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.consts; package com.qs.serve.framework.base.model.consts;
/** /**
* 系统配置 * 系统配置

2
cms-framework/src/main/java/com/qs/serve/common/model/dto/CommonIdsParam.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/CommonIdsParam.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.dto; package com.qs.serve.framework.base.model.dto;
import lombok.Data; import lombok.Data;

2
cms-framework/src/main/java/com/qs/serve/common/model/dto/DateSplitDTO.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/DateSplitDTO.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.dto; package com.qs.serve.framework.base.model.dto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

2
cms-framework/src/main/java/com/qs/serve/common/model/dto/DiffFieldVal.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/DiffFieldVal.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.dto; package com.qs.serve.framework.base.model.dto;
import lombok.Data; import lombok.Data;

2
cms-framework/src/main/java/com/qs/serve/common/model/dto/HeaderOption.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/HeaderOption.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.dto; package com.qs.serve.framework.base.model.dto;
import lombok.Data; import lombok.Data;

4
cms-framework/src/main/java/com/qs/serve/common/model/dto/RowParam.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/RowParam.java

@ -1,6 +1,6 @@
package com.qs.serve.common.model.dto; package com.qs.serve.framework.base.model.dto;
import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.utils.PageUtil;
import lombok.Data; import lombok.Data;
/** /**

2
cms-framework/src/main/java/com/qs/serve/common/model/dto/SimpleCountValue.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/SimpleCountValue.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.dto; package com.qs.serve.framework.base.model.dto;
import lombok.Data; import lombok.Data;

2
cms-framework/src/main/java/com/qs/serve/common/model/dto/SimpleKeyValue.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/SimpleKeyValue.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.dto; package com.qs.serve.framework.base.model.dto;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
cms-framework/src/main/java/com/qs/serve/common/model/dto/TargetDTO.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/TargetDTO.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.dto; package com.qs.serve.framework.base.model.dto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

2
cms-framework/src/main/java/com/qs/serve/common/model/dto/TargetObjectDTO.java → cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/TargetObjectDTO.java

@ -1,4 +1,4 @@
package com.qs.serve.common.model.dto; package com.qs.serve.framework.base.model.dto;
import lombok.Data; import lombok.Data;

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save