xixi178 7 ماه پیش
والد
کامیت
7d0584d457
100فایلهای تغییر یافته به همراه374 افزوده شده و 943 حذف شده
  1. 58 0
      .drone.yml
  2. 308 79
      .idea/workspace.xml
  3. 0 1
      COMMIT_EDITMSG
  4. 0 1
      HEAD
  5. 8 0
      client-api/Dockerfile
  6. 0 245
      client-api/target/classes/application.yml
  7. 0 17
      client-api/target/classes/banner.txt
  8. BIN
      client-api/target/classes/com/wteam/ClientApiApplication.class
  9. BIN
      client-api/target/classes/com/wteam/controller/oss/OssController.class
  10. BIN
      client-api/target/classes/com/wteam/controller/sms/GetSmsController.class
  11. BIN
      client-api/target/classes/com/wteam/controller/wxlogin/QRCodeController.class
  12. BIN
      client-api/target/classes/com/wteam/controller/wxlogin/WxMaUserController.class
  13. BIN
      client-api/target/classes/com/wteam/security/ClientAuthenticationFilter.class
  14. BIN
      client-api/target/classes/com/wteam/security/ClientSecurityConfig.class
  15. 0 1
      client-api/target/classes/static/PVVE7X4F8U.txt
  16. 0 10
      config
  17. 0 1
      description
  18. 0 133
      develop.sh
  19. 0 144
      formal.sh
  20. 0 288
      framework/target/classes/META-INF/spring-configuration-metadata.json
  21. 0 6
      framework/target/classes/application.yml
  22. 0 17
      framework/target/classes/banner.txt
  23. BIN
      framework/target/classes/cn/lili/modules/file/util/FileUtil.class
  24. BIN
      framework/target/classes/com/wteam/framework/common/aop/Config/ThreadPoolTaskConfig.class
  25. BIN
      framework/target/classes/com/wteam/framework/common/aop/annotation/DemoSite.class
  26. BIN
      framework/target/classes/com/wteam/framework/common/aop/annotation/PreventDuplicateSubmissions.class
  27. BIN
      framework/target/classes/com/wteam/framework/common/aop/annotation/RetryOperation.class
  28. BIN
      framework/target/classes/com/wteam/framework/common/cache/Cache.class
  29. BIN
      framework/target/classes/com/wteam/framework/common/cache/CachePrefix.class
  30. BIN
      framework/target/classes/com/wteam/framework/common/cache/config/redis/FastJsonRedisSerializer.class
  31. BIN
      framework/target/classes/com/wteam/framework/common/cache/config/redis/RedisConfig$1.class
  32. BIN
      framework/target/classes/com/wteam/framework/common/cache/config/redis/RedisConfig.class
  33. BIN
      framework/target/classes/com/wteam/framework/common/cache/config/redis/RedisKeyConstants.class
  34. BIN
      framework/target/classes/com/wteam/framework/common/cache/impl/RedisCache.class
  35. BIN
      framework/target/classes/com/wteam/framework/common/cache/limit/annotation/LimitPoint.class
  36. BIN
      framework/target/classes/com/wteam/framework/common/cache/limit/enums/LimitTypeEnums.class
  37. BIN
      framework/target/classes/com/wteam/framework/common/cache/limit/interceptor/LimitInterceptor.class
  38. BIN
      framework/target/classes/com/wteam/framework/common/cache/script/LuaScript.class
  39. BIN
      framework/target/classes/com/wteam/framework/common/context/ThreadContextHolder.class
  40. BIN
      framework/target/classes/com/wteam/framework/common/elasticsearch/BaseElasticsearchService$1.class
  41. BIN
      framework/target/classes/com/wteam/framework/common/elasticsearch/BaseElasticsearchService.class
  42. BIN
      framework/target/classes/com/wteam/framework/common/elasticsearch/EsSuffix.class
  43. BIN
      framework/target/classes/com/wteam/framework/common/elasticsearch/config/ElasticsearchConfig.class
  44. BIN
      framework/target/classes/com/wteam/framework/common/elasticsearch/config/ElasticsearchProperties$Account.class
  45. BIN
      framework/target/classes/com/wteam/framework/common/elasticsearch/config/ElasticsearchProperties$ElasticsearchPropertiesBuilder.class
  46. BIN
      framework/target/classes/com/wteam/framework/common/elasticsearch/config/ElasticsearchProperties$Index.class
  47. BIN
      framework/target/classes/com/wteam/framework/common/elasticsearch/config/ElasticsearchProperties.class
  48. BIN
      framework/target/classes/com/wteam/framework/common/enums/ClientTypeEnum.class
  49. BIN
      framework/target/classes/com/wteam/framework/common/enums/PermissionEnum.class
  50. BIN
      framework/target/classes/com/wteam/framework/common/enums/ResultCode.class
  51. BIN
      framework/target/classes/com/wteam/framework/common/enums/ResultUtil.class
  52. BIN
      framework/target/classes/com/wteam/framework/common/enums/SecurityEnum.class
  53. BIN
      framework/target/classes/com/wteam/framework/common/exception/GlobalControllerExceptionHandler.class
  54. BIN
      framework/target/classes/com/wteam/framework/common/exception/RetryException.class
  55. BIN
      framework/target/classes/com/wteam/framework/common/exception/ServiceException.class
  56. BIN
      framework/target/classes/com/wteam/framework/common/mybatis/BaseEntity.class
  57. BIN
      framework/target/classes/com/wteam/framework/common/mybatis/BaseIdEntity.class
  58. BIN
      framework/target/classes/com/wteam/framework/common/mybatis/MyMetaObjectHandler.class
  59. BIN
      framework/target/classes/com/wteam/framework/common/mybatis/MybatisPlusConfig.class
  60. BIN
      framework/target/classes/com/wteam/framework/common/mybatis/util/PageUtil.class
  61. BIN
      framework/target/classes/com/wteam/framework/common/properties/ApiProperties.class
  62. BIN
      framework/target/classes/com/wteam/framework/common/properties/DomainProperties.class
  63. BIN
      framework/target/classes/com/wteam/framework/common/properties/IgnoredUrlsProperties.class
  64. BIN
      framework/target/classes/com/wteam/framework/common/properties/JWTTokenProperties.class
  65. BIN
      framework/target/classes/com/wteam/framework/common/properties/SmsTemplateProperties.class
  66. BIN
      framework/target/classes/com/wteam/framework/common/properties/SystemSettingProperties.class
  67. BIN
      framework/target/classes/com/wteam/framework/common/properties/VerificationCodeProperties.class
  68. BIN
      framework/target/classes/com/wteam/framework/common/security/AuthUser.class
  69. BIN
      framework/target/classes/com/wteam/framework/common/security/SecurityBean.class
  70. BIN
      framework/target/classes/com/wteam/framework/common/security/context/UserContext.class
  71. BIN
      framework/target/classes/com/wteam/framework/common/security/enums/PermissionEnum.class
  72. BIN
      framework/target/classes/com/wteam/framework/common/security/enums/SecurityEnum.class
  73. BIN
      framework/target/classes/com/wteam/framework/common/security/enums/UserEnums.class
  74. BIN
      framework/target/classes/com/wteam/framework/common/security/handler/CustomAccessDeniedHandler.class
  75. BIN
      framework/target/classes/com/wteam/framework/common/security/sensitive/Sensitive.class
  76. BIN
      framework/target/classes/com/wteam/framework/common/security/sensitive/SensitiveJsonSerializer.class
  77. BIN
      framework/target/classes/com/wteam/framework/common/security/sensitive/enums/SensitiveStrategy.class
  78. BIN
      framework/target/classes/com/wteam/framework/common/security/token/SecretKeyUtil.class
  79. BIN
      framework/target/classes/com/wteam/framework/common/security/token/Token.class
  80. BIN
      framework/target/classes/com/wteam/framework/common/security/token/TokenUtils.class
  81. BIN
      framework/target/classes/com/wteam/framework/common/security/token/base/AbstractTokenGenerate.class
  82. BIN
      framework/target/classes/com/wteam/framework/common/security/token/manager/ManagerTokenGenerate.class
  83. BIN
      framework/target/classes/com/wteam/framework/common/swagger/Swagger2Config.class
  84. BIN
      framework/target/classes/com/wteam/framework/common/utils/Arith.class
  85. BIN
      framework/target/classes/com/wteam/framework/common/utils/Base64DecodeMultipartFile.class
  86. BIN
      framework/target/classes/com/wteam/framework/common/utils/Base64Utils.class
  87. BIN
      framework/target/classes/com/wteam/framework/common/utils/BeanUtil.class
  88. BIN
      framework/target/classes/com/wteam/framework/common/utils/CommonUtil.class
  89. BIN
      framework/target/classes/com/wteam/framework/common/utils/CookieUtil.class
  90. BIN
      framework/target/classes/com/wteam/framework/common/utils/CurrencyUtil.class
  91. BIN
      framework/target/classes/com/wteam/framework/common/utils/DateRuoYiUtils.class
  92. BIN
      framework/target/classes/com/wteam/framework/common/utils/DateUtil.class
  93. BIN
      framework/target/classes/com/wteam/framework/common/utils/HttpClientUtils.class
  94. BIN
      framework/target/classes/com/wteam/framework/common/utils/HttpUtils.class
  95. BIN
      framework/target/classes/com/wteam/framework/common/utils/IpHelper.class
  96. BIN
      framework/target/classes/com/wteam/framework/common/utils/IpUtils.class
  97. BIN
      framework/target/classes/com/wteam/framework/common/utils/JasyptUtil.class
  98. BIN
      framework/target/classes/com/wteam/framework/common/utils/ObjectUtil.class
  99. BIN
      framework/target/classes/com/wteam/framework/common/utils/QRCode.class
  100. BIN
      framework/target/classes/com/wteam/framework/common/utils/RegularUtil.class

+ 58 - 0
.drone.yml

@@ -0,0 +1,58 @@
+kind: pipeline # 定义对象类型,还有secret和signature两种类型
+type: docker # 定义流水线类型,还有kubernetes、exec、ssh等类型
+name: drone-study # 定义流水线名称
+
+steps: # 定义流水线执行步骤,这些步骤将顺序执行
+  - name: package # 1. 流水线名称(maven打包)
+    pull: if-not-exists
+    image: maven:ibmjava-alpine # 定义创建容器的Docker镜像
+    volumes: # 将容器内目录挂载到宿主机,仓库需要开启Trusted设置
+      - name: maven-cache
+        path: /root/.m2 # 将maven下载依赖的目录挂载出来,防止重复下载
+        # 挂载宿主机的目录
+      - name: maven-build
+        path: /app/build/drone-study # 将应用打包好的Jar和执行脚本挂载出来
+    commands: # 定义在Docker容器中执行的shell命令,这里是复制到maven镜像容器里面的,区分开项目就行了
+      - mvn clean package -Dmaven.test.skip=true
+      - cp target/drone.jar /app/build/drone-study/drone.jar
+      - cp Dockerfile /app/build/drone-study/Dockerfile
+      - cp run.sh /app/build/drone-study/run.sh
+
+  - name: build-start # 2. 流水线名称(ssh默认人工操作打包好的jar包)
+    image: appleboy/drone-ssh # ssh工具镜像
+    settings:
+      host: 123.60.43.219 # 远程连接地址,可以是IP可以是域名
+      username: root # 远程连接账号
+      password: Ab18315108835 #明文密码
+#      password:
+#        from_secret: ssh_password # 从Secret中读取SSH密码
+      key:
+        from_secret: ssh_key # 从Secret中读取SSH密钥
+      port: 22 # 远程连接端口
+      command_timeout: 10m # 远程执行命令超时时间
+      script_stop: false # 设置为false,遇到第一次错误会继续运行后面的命令
+      script:
+        - cd /www/wwwroot/data/maven/build/drone-study # 进入宿主机构建目录,可根据自己选择目录
+        - chmod +x run.sh # 更改为可执行脚本
+        - ./run.sh # 运行脚本打包应用镜像并运行
+  - name: notify # 3. 通知(这里使用了钉钉通知,可以使用微信通知、邮件通知等)
+    pull: if-not-exists
+    image: guoxudongdocker/drone-dingtalk:latest
+    settings:
+      token:
+        from_secret: dingtalk_token
+      type: markdown
+      message_color: true
+      message_pic: true
+      sha_link: true
+    when:
+      status: [failure, success]
+
+volumes: # 定义流水线挂载目录,用于共享数据
+  - name: maven-build
+    host:
+      path: /www/wwwroot/data/maven/build/drone-study # 从宿主机中挂载的目录
+  - name: maven-cache
+    host:
+      path: /www/wwwroot/data/maven/cache
+

+ 308 - 79
.idea/workspace.xml

@@ -4,84 +4,302 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="8eaaf244-eba9-47b2-a128-7c46802a5971" name="Changes" comment="finally">
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/a06efed9-eef7-4bc7-9f23-4e9d60c2cb7e.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/a06efed9-eef7-4bc7-9f23-4e9d60c2cb7e.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+    <list default="true" id="8eaaf244-eba9-47b2-a128-7c46802a5971" name="Changes" comment="提交测试版">
+      <change afterPath="$PROJECT_DIR$/.drone.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client-api/src/main/java/com/wteam/controller/card/CardAdminController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/client-api/src/main/java/com/wteam/controller/card/CardController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/client-api/src/main/java/com/wteam/controller/coupon/CouponController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/client-api/src/main/java/com/wteam/controller/court/CourtController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/client-api/src/main/java/com/wteam/controller/hardware/HardwareController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/client-api/src/main/java/com/wteam/controller/hardware/PollingController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/client-api/src/main/java/com/wteam/controller/order/OrderController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/client-api/src/main/java/com/wteam/controller/order/QrCodeController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/client-api/src/main/java/com/wteam/controller/user/UserController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/Address.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/AdminUser.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/Card.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/Coupon.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/CouponUser.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/LongJsonDeserializer.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/LongJsonSerializer.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/Notice.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/OrderInfo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/OrderUser.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/PaymentInfo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/Role.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/RoleMenu.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/Store.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/Vdstate.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/Venue.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/dto/OrderCardReq.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/dto/OrderReq.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/dto/RefundResult.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/dto/StoreForm.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/dto/StorePhotoDto.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/dto/StoredCardDto.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/reqp/TimeCalculation.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/reqp/hardwareReq.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/vo/CardVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/vo/OrderInfoVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/vo/OrderTicketVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/vo/OrderVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/vo/PaymentRequest.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/vo/StoreDetailsVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/vo/StoreVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/vo/TimeCodeVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/vo/TimerOrderInfoVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/entity/vo/VenueVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/mapper/CardMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/mapper/CouponMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/mapper/CouponUserMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/mapper/OrderInfoMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/mapper/PaymentInfoMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/mapper/StoreMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/mapper/VenueMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/service/CardService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/service/CouponService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/service/OrderInfoService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/service/PaymentInfoService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/service/StoreService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/service/VenueService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/service/impl/CardServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/service/impl/CouponServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/service/impl/OrderInfoServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/service/impl/PaymentInfoServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/service/impl/StoreServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/book/service/impl/VenueServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/card/entity/CbCardAdmin.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/card/mapper/CardAdminMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/card/service/CardAdminService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/card/service/impl/CardAdminServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/hardware/ApiCallerUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/hardware/ApiCallerUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/hardware/ApiQrCodeUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/hardware/ApiQrCodeUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/hardware/QrCodeRegistrationUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/hardware/QrCodeRegistrationUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/hardware/RegistrationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/hardware/RegistrationTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/user/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/framework/src/main/java/com/wteam/framework/modules/user/service/impl/UserServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/generator/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/generator/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/client-api/target/classes/application.yml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/client-api/target/classes/banner.txt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/client-api/target/classes/com/wteam/ClientApiApplication.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/client-api/target/classes/com/wteam/controller/oss/OssController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/client-api/target/classes/com/wteam/controller/sms/GetSmsController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/client-api/target/classes/com/wteam/controller/wxlogin/QRCodeController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/client-api/target/classes/com/wteam/controller/wxlogin/WxMaUserController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/client-api/target/classes/com/wteam/security/ClientAuthenticationFilter.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/client-api/target/classes/com/wteam/security/ClientSecurityConfig.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/client-api/target/classes/static/PVVE7X4F8U.txt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/application.yml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/banner.txt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/cn/lili/modules/file/util/FileUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/aop/Config/ThreadPoolTaskConfig.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/aop/annotation/DemoSite.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/aop/annotation/PreventDuplicateSubmissions.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/aop/annotation/RetryOperation.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/cache/Cache.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/cache/CachePrefix.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/cache/config/redis/FastJsonRedisSerializer.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/cache/config/redis/RedisConfig$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/cache/config/redis/RedisConfig.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/cache/config/redis/RedisKeyConstants.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/cache/impl/RedisCache.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/cache/limit/annotation/LimitPoint.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/cache/limit/enums/LimitTypeEnums.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/cache/limit/interceptor/LimitInterceptor.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/cache/script/LuaScript.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/context/ThreadContextHolder.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/elasticsearch/BaseElasticsearchService$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/elasticsearch/BaseElasticsearchService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/elasticsearch/EsSuffix.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/elasticsearch/config/ElasticsearchConfig.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/elasticsearch/config/ElasticsearchProperties$Account.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/elasticsearch/config/ElasticsearchProperties$ElasticsearchPropertiesBuilder.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/elasticsearch/config/ElasticsearchProperties$Index.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/elasticsearch/config/ElasticsearchProperties.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/enums/ClientTypeEnum.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/enums/PermissionEnum.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/enums/ResultCode.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/enums/ResultUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/enums/SecurityEnum.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/exception/GlobalControllerExceptionHandler.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/exception/RetryException.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/exception/ServiceException.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/mybatis/BaseEntity.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/mybatis/BaseIdEntity.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/mybatis/MyMetaObjectHandler.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/mybatis/MybatisPlusConfig.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/mybatis/util/PageUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/properties/ApiProperties.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/properties/DomainProperties.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/properties/IgnoredUrlsProperties.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/properties/JWTTokenProperties.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/properties/SmsTemplateProperties.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/properties/SystemSettingProperties.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/properties/VerificationCodeProperties.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/security/AuthUser.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/security/SecurityBean.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/security/context/UserContext.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/security/enums/PermissionEnum.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/security/enums/SecurityEnum.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/security/enums/UserEnums.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/security/handler/CustomAccessDeniedHandler.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/security/sensitive/Sensitive.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/security/sensitive/SensitiveJsonSerializer.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/security/sensitive/enums/SensitiveStrategy.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/security/token/SecretKeyUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/security/token/Token.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/security/token/TokenUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/security/token/base/AbstractTokenGenerate.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/security/token/manager/ManagerTokenGenerate.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/swagger/Swagger2Config.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/Arith.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/Base64DecodeMultipartFile.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/Base64Utils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/BeanUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/CommonUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/CookieUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/CurrencyUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/DateRuoYiUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/DateUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/HttpClientUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/HttpUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/IpHelper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/IpUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/JasyptUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/ObjectUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/QRCode.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/RegularUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/ResponseUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/SnowFlake.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/SnowflakeInitiator.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/SpelUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/SpringContextUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/StringUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/ThreadPoolUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/UrlBuilder.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/utils/UuidUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/vo/PageVO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/vo/ResultMessage.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/vo/SearchVO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/vo/SerializableStream.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/vo/ViewComment.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/websocket/CustomSpringConfigurator.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/websocket/MessageOperation.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/websocket/MessageResultType.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/websocket/MessageVO$MessageVOBuilder.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/websocket/MessageVO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/websocket/OperationType.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/common/websocket/WebSocketConfigurator.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/config/AuthConfig$AuthConfigBuilder.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/config/AuthConfig.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/config/ConnectAuth.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/config/ConnectAuthEnum$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/config/ConnectAuthEnum$2.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/config/ConnectAuthEnum$3.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/config/ConnectAuthEnum$4.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/config/ConnectAuthEnum$5.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/config/ConnectAuthEnum.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/entity/Connect.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/entity/dto/AuthCallback$AuthCallbackBuilder.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/entity/dto/AuthCallback.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/entity/dto/AuthResponse$AuthResponseBuilder.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/entity/dto/AuthResponse.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/entity/dto/AuthToken$AuthTokenBuilder.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/entity/dto/AuthToken.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/entity/dto/ConnectAuthUser$ConnectAuthUserBuilder.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/entity/dto/ConnectAuthUser.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/entity/dto/WechatMPLoginParams.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/entity/enums/AuthResponseStatus.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/entity/enums/AuthUserGender.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/entity/enums/ConnectConfigEnum.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/entity/enums/ConnectEnum.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/entity/vo/ConnectConfigForm.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/exception/AuthException.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/mapper/ConnectMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/request/AuthRequest.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/request/BaseAuthAlipayRequest.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/request/BaseAuthQQRequest.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/request/BaseAuthRequest.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/request/BaseAuthWeChatPCRequest.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/request/BaseAuthWeChatRequest.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/request/BaseAuthWeiboRequest.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/service/ConnectService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/serviceimpl/ConnectServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/util/AuthChecker.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/util/ConnectUtil$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/util/ConnectUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/connect/util/GlobalAuthUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/file/entity/dos/File.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/file/entity/dto/FileDto.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/file/entity/dto/FileOwnerDTO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/file/entity/enums/OssEnum.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/file/mapper/FileMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/file/plugin/FilePlugin.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/file/plugin/FilePluginFactory.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/file/plugin/impl/AliFilePlugin.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/file/service/FileService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/file/serviceimpl/FileServiceImpl$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/file/serviceimpl/FileServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/entity/dos/Member.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/entity/dto/ConnectQueryDTO$ConnectQueryDTOBuilder.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/entity/dto/ConnectQueryDTO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/entity/dto/ManagerMemberEditDTO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/entity/dto/MemberAddDTO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/entity/dto/MemberAddressDTO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/entity/dto/MemberEditDTO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/entity/enums/PointTypeEnum.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/entity/enums/QRCodeLoginSessionStatusEnum.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/entity/enums/SendTypeEnum.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/entity/vo/MemberSearchVO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/entity/vo/MemberVO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/entity/vo/QRCodeLoginSessionVo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/entity/vo/QRLoginResultVo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/mapper/MemberMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/service/MemberService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/service/impl/MemberServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/member/token/MemberTokenGenerate.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/oss/OssSetting.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/oss/service/OssService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/oss/service/impl/OssServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/entity/dos/AdminUser.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/entity/dos/Department.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/entity/dos/DepartmentRole.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/entity/dos/Menu.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/entity/dos/Role.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/entity/dos/RoleMenu.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/entity/dos/UserRole.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/entity/dto/AdminUserDTO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/entity/dto/MenuSearchParams.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/entity/enums/userEnum.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/entity/vo/AdminUserVO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/entity/vo/DepartmentVO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/entity/vo/MenuVO$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/entity/vo/MenuVO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/entity/vo/RoleVO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/entity/vo/SystemLogVO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/entity/vo/UserMenuVO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/mapper/AdminUserMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/mapper/DepartmentMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/mapper/DepartmentRoleMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/mapper/MenuMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/mapper/RoleDepartmentMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/mapper/RoleMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/mapper/RoleMenuMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/mapper/RolePermissionMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/mapper/UserRoleMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/repository/SystemLogRepository.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/service/AdminUserService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/service/DepartmentRoleService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/service/DepartmentService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/service/MenuService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/service/RoleMenuService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/service/RoleService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/service/SystemLogService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/service/UserRoleService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/service/impl/AdminUserServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/service/impl/DepartmentRoleServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/service/impl/DepartmentServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/service/impl/MenuServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/service/impl/RoleMenuServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/service/impl/RoleServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/service/impl/SystemLogServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/permission/service/impl/UserRoleServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/sms/AliSmsUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/sms/SmsUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/sms/entity/dos/SmsSign.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/sms/entity/dos/SmsTemplate.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/sms/entity/dto/MemberSmsLoginDto.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/sms/mapper/SmsSignMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/sms/mapper/SmsTemplateMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/sms/service/SmsSignService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/sms/service/SmsTemplateService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/sms/serviceimpl/SmsSignServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/sms/serviceimpl/SmsTemplateServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/sms/serviceimpl/SmsUtilAliImplService$1.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/sms/serviceimpl/SmsUtilAliImplService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/aspect/annotation/SystemLogPoint.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/aspect/interceptor/SystemLogAspect$SaveSystemLogThread.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/aspect/interceptor/SystemLogAspect.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/entity/dos/Region.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/entity/dos/Setting.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/entity/dto/JetlinksSetting.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/entity/dto/OssSetting.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/entity/dto/SmsSetting.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/entity/dto/SystemInfoSetting.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/entity/dto/TencentSetting.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/entity/dto/VmsSetting.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/entity/dto/connect/QQConnectSetting.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/entity/dto/connect/QQConnectSettingItem.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/entity/dto/connect/WechatConnectSetting.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/entity/dto/connect/WechatConnectSettingItem.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/entity/enums/SettingEnum.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/entity/vo/RegionVO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/mapper/RegionMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/mapper/SettingMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/mapper/VerificationSourceMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/server/Cpu.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/server/Jvm.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/server/Mem.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/server/Server.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/server/Sys.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/server/SysFile.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/service/RegionService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/service/SettingService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/service/impl/RegionServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/system/service/impl/SettingServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/user/config/wechat/WxMaConfiguration.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/user/entity/User.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/user/entity/dto/WechatMPLoginParams.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/user/mapper/UserMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/user/service/UserService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/user/service/impl/UserServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/user/token/UserTokenGenerate.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/verification/ImageUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/verification/SliderImageUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/verification/VerificationSDK.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/verification/aop/VerificationInterceptor.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/verification/aop/annotation/Verification.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/verification/entity/dos/VerificationSource.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/verification/entity/dto/VerificationDTO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/verification/entity/enums/VerificationEnums.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/verification/entity/enums/VerificationSourceEnum.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/verification/service/VerificationService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/verification/service/VerificationSourceService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/verification/service/impl/VerificationServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/verification/service/impl/VerificationSourceServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/wxcode/WxAccessToken.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/com/wteam/framework/modules/wxcode/WxCode.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/script/limit.lua" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/target/classes/script/quantity.lua" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -370,6 +588,8 @@
       <workItem from="1701417552397" duration="1655000" />
       <workItem from="1701427380779" duration="1603000" />
       <workItem from="1701432893921" duration="33000" />
+      <workItem from="1704369039265" duration="159000" />
+      <workItem from="1712576927968" duration="2077000" />
     </task>
     <task id="LOCAL-00001" summary="init2">
       <created>1696846465336</created>
@@ -394,7 +614,15 @@
       <option name="project" value="LOCAL" />
       <updated>1697715996611</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="提交测试版">
+      <option name="closed" value="true" />
+      <created>1704369150710</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1704369150710</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -415,7 +643,8 @@
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
     <MESSAGE value="init2" />
     <MESSAGE value="finally" />
-    <option name="LAST_COMMIT_MESSAGE" value="finally" />
+    <MESSAGE value="提交测试版" />
+    <option name="LAST_COMMIT_MESSAGE" value="提交测试版" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

+ 0 - 1
COMMIT_EDITMSG

@@ -1 +0,0 @@
-test1

+ 0 - 1
HEAD

@@ -1 +0,0 @@
-ref: refs/heads/master

+ 8 - 0
client-api/Dockerfile

@@ -0,0 +1,8 @@
+# Docker image for springboot file run
+# VERSION 1.0
+# Author: Xiang
+# 基础镜像使用java
+FROM openjdk:8-jdk-alpine
+ADD drone.jar app.jar
+EXPOSE 6003
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","app.jar"]

+ 0 - 245
client-api/target/classes/application.yml

@@ -1,245 +0,0 @@
-server:
-  port: 8889
-
-  servlet:
-    context-path: /
-spring:
-  application:
-    name: client-api
-
-  # 文件大小上传配置
-  servlet:
-    multipart:
-      max-file-size: 200MB
-      max-request-size: 200MB
-  cache:
-    type: redis
-  #jackson json解析
-  jackson:
-    time-zone: GMT+8
-    serialization:
-      #关闭jackson 对json做解析
-      fail-on-empty-beans: false
-
-  # Redis
-  redis:
-    #    host: 114.132.229.139
-    host: 127.0.0.1
-    port: 6379
-    #    password: 123456
-    lettuce:
-      pool:
-        # 连接池最大连接数(使用负值表示没有限制) 默认 8
-        max-active: 200
-        # 连接池最大阻塞等待时间(使用负值表示没有限制) 默认 -1
-        max-wait: 20
-        # 连接池中的最大空闲连接 默认 8
-        max-idle: 10
-        # 连接池中的最小空闲连接 默认 8
-        min-idle: 8
-  datasource:
-    driverClassName: com.mysql.cj.jdbc.Driver
-    username: cb
-    password: sEzfxcjZFEzfJrEA
-    url: jdbc:mysql://139.9.38.185:3306/cb?useUnicode=true&characterEncoding=utf-8&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
-
-# 忽略TOKEN 鉴权 的url
-ignored:
-  urls:
-    - /editor-app/**
-    - /actuator**
-    - /actuator/**
-    - /MP_verify_qSyvBPhDsPdxvOhC.txt
-    - /weixin/**
-    - /source/**
-    - /buyer/payment/cashier/**
-    - /buyer/payment/cashierRefund/**
-    - /buyer/other/pageData/**
-    - /buyer/other/article/**
-    - /buyer/goods/**
-    - /buyer/store/**
-    - /buyer/passport/connect/**
-    - /buyer/members/**
-    - /buyer/passport/member/**
-    - /buyer/passport/member/refresh/**
-    - /buyer/promotion/pintuan/**
-    - /buyer/promotion/seckill/**
-    - /buyer/promotion/pointsGoods/**
-    - /buyer/promotion/coupon
-    - /buyer/member/evaluation/**/goodsEvaluation
-    - /buyer/member/evaluation/**/evaluationNumber
-    - /buyer/other/appVersion/**
-    - /buyer/broadcast/studio/**
-    - /druid/**
-    - /swagger-ui/index.html
-    - /swagger-ui.html
-    - /v3/api-docs
-    - /v3/api-docs.yaml
-    - /doc.html
-    - /swagger-resources/**
-    - /swagger/**
-    - /webjars/**
-    - /configuration/ui
-    - /boot-admin
-    - /**/*.js
-    - /**/*.css
-    - /**/*.png
-    - /**/*.ico
-    - /wx/user/login
-    - /PVVE7X4F8U.txt
-    - /app/admin/login
-    - /phone/login/**
-    - /common/sms/**
-    - /app/admin/sms/login/**
-    - /app/member/phone/**
-    - /common/sys/**
-    - /device/**
-    - /common/ocr/**
-
-springdoc:
-  api-docs:
-    # 是否敞开接口文档
-    enabled: true
-  swagger-ui:
-    # 耐久化认证数据,假如设置为 true,它会保存授权数据而且不会在浏览器关闭/刷新时丢掉
-    persistAuthorization: true
-swagger:
-  title: wteam API接口文档
-  description: wteam Api Documentation
-  version: 1.0.0
-  termsOfServiceUrl: https://pickmall.cn
-  contact:
-    name: wteam
-    url: https://pickmall.cn
-    email: 1958615756@qq.com
-# Mybatis-plus
-mybatis-plus:
-  mapper-locations: classpath*:mapper/*.xml
-  configuration:
-    #缓存开启
-    cache-enabled: true
-    #日志
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-# 日志
-#logging:
-#  config: classpath:logback-spring.xml
-#  # 输出级别
-#  level:
-#    root: info
-#  #    org.springframework: debug
-#  file:
-#    # 指定路径
-#    path: lili-logs
-#  logback:
-#    rollingpolicy:
-#      # 最大保存天数
-#      max-history: 7
-#      # 每个文件最大大小
-#      max-file-size: 5MB
-#加密参数
-
-lili:
-  system:
-    isDemoSite: true
-  statistics:
-    # 在线人数统计 X 小时。这里设置48,即统计过去48小时每小时在线人数
-    onlineMember: 48
-    # 当前在线人数刷新时间间隔,单位秒,设置为600,则每10分钟刷新一次
-    currentOnlineUpdate: 600
-  #qq lbs 申请
-  lbs:
-    key: 4BYBZ-7MT6S-PUAOA-6BNWL-FJUD7-UUFXT
-    sk: zhNKVrJK6UPOhqIjn8AQvG37b9sz6
-  #域名
-  domain:
-    pc: https://pc-b2b2c.pickmall.cn
-    wap: https://m-b2b2c.pickmall.cn
-    store: https://store-b2b2c.pickmall.cn
-    admin: https://admin-b2b2c.pickmall.cn
-  #api地址
-  api:
-    buyer: https://buyer-api.pickmall.cn
-    common: https://common-api.pickmall.cn
-    manager: https://admin-api.pickmall.cn
-    store: https://store-api.pickmall.cn
-
-  # jwt 细节设定
-  jwt-setting:
-    # token过期时间(分钟)
-    tokenExpireTime: 60
-
-  # 使用Spring @Cacheable注解失效时间
-  cache:
-    # 过期时间 单位秒 永久不过期设为-1
-    timeout: 1500
-  #多线程配置
-  thread:
-    corePoolSize: 5
-    maxPoolSize: 50
-    queueCapacity: 50
-  data:
-    elasticsearch:
-      cluster-name: elasticsearch
-      cluster-nodes: 127.0.0.1:9200
-      index:
-        number-of-replicas: 0
-        number-of-shards: 3
-      index-prefix: lili
-      schema: http
-    #      account:
-    #        username: elastic
-    #        password: LiLiShopES
-    logstash:
-      server: 192.168.0.116:4560
-    rocketmq:
-      promotion-topic: lili_promotion_topic
-      promotion-group: lili_promotion_group
-      msg-ext-topic: lili_msg_topic
-      msg-ext-group: lili_msg_group
-      goods-topic: lili_goods_topic
-      goods-group: lili_goods_group
-      order-topic: lili_order_topic
-      order-group: lili_order_group
-      member-topic: lili_member_topic
-      member-group: lili_member_group
-      store-topic: lili_store_topic
-      store-group: lili_store_group
-      other-topic: lili_other_topic
-      other-group: lili_other_group
-      notice-topic: lili_notice_topic
-      notice-group: lili_notice_group
-      notice-send-topic: lili_send_notice_topic
-      notice-send-group: lili_send_notice_group
-      after-sale-topic: lili_after_sale_topic
-      after-sale-group: lili_after_sale_group
-wteam:
-  # jwt 细节设定
-  jwt-setting:
-    # token过期时间(分钟)
-    tokenExpireTime: 3600
-
-  # 使用Spring @Cacheable注解失效时间
-  cache:
-    # 过期时间 单位秒 永久不过期设为-1
-    timeout: 1500
-#
-#rocketmq:
-#  name-server: 127.0.0.1:9876
-#  producer:
-#    group: lili_group
-#    send-message-timeout: 30000
-#
-#xxl:
-#  job:
-#    admin:
-#      addresses: http://127.0.0.1:9001/xxl-job-admin
-#    executor:
-#      appname: xxl-job-executor-lilishop
-#      address:
-#      ip:
-#      port: 8891
-#      logpath: ./xxl-job/executor
-#      logretentiondays: 7
-
-

+ 0 - 17
client-api/target/classes/banner.txt

@@ -1,17 +0,0 @@
-${AnsiColor.CYAN}          ___       __   _________  _______   ________  _____ ______
-${AnsiColor.CYAN}         |\  \     |\  \|\___   ___\\  ___ \ |\   __  \|\   _ \  _   \
-${AnsiColor.CYAN}         \ \  \    \ \  \|___ \  \_\ \   __/|\ \  \|\  \ \  \\\__\ \  \
-${AnsiColor.CYAN}          \ \  \  __\ \  \   \ \  \ \ \  \_|/_\ \   __  \ \  \\|__| \  \
-${AnsiColor.CYAN}           \ \  \|\__\_\  \   \ \  \ \ \  \_|\ \ \  \ \  \ \  \    \ \  \
-${AnsiColor.CYAN}            \ \____________\   \ \__\ \ \_______\ \__\ \__\ \__\    \ \__\
-${AnsiColor.CYAN}             \|____________|    \|__|  \|_______|\|__|\|__|\|__|     \|__|
-${AnsiColor.CYAN}
-${AnsiColor.CYAN}
-${AnsiColor.CYAN}               ________  ____  __  __    ___  ___  ___ ___
-${AnsiColor.CYAN}              / ___/ _ \/ __ \/ / / /___|_  |/ _ \|_  <  /
-${AnsiColor.CYAN}             / (_ / // / /_/ / /_/ /___/ __// // / __// /
-${AnsiColor.CYAN}             \___/____/\____/\____/   /____/\___/____/_/
-
-
-
-

BIN
client-api/target/classes/com/wteam/ClientApiApplication.class


BIN
client-api/target/classes/com/wteam/controller/oss/OssController.class


BIN
client-api/target/classes/com/wteam/controller/sms/GetSmsController.class


BIN
client-api/target/classes/com/wteam/controller/wxlogin/QRCodeController.class


BIN
client-api/target/classes/com/wteam/controller/wxlogin/WxMaUserController.class


BIN
client-api/target/classes/com/wteam/security/ClientAuthenticationFilter.class


BIN
client-api/target/classes/com/wteam/security/ClientSecurityConfig.class


+ 0 - 1
client-api/target/classes/static/PVVE7X4F8U.txt

@@ -1 +0,0 @@
-770b12ca87bc1dc2a0e91433cb0ee97e

+ 0 - 10
config

@@ -1,10 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = false
-	bare = false
-	logallrefupdates = true
-	symlinks = false
-	ignorecase = true
-[remote "origin"]
-	url = http://124.222.247.184:3000/abbuibuibui/courtBooking-backend.git
-	fetch = +refs/heads/*:refs/remotes/origin/*

+ 0 - 1
description

@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.

+ 0 - 133
develop.sh

@@ -1,133 +0,0 @@
-#安装maven
-if ! command -v mvn >/dev/null 2>&1; then
-    echo "Installing Maven"
-    # 下载Maven
-    wget https://archive.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz
-    # 解压Maven
-    tar -xzf apache-maven-3.8.1-bin.tar.gz -C /opt
-    # 设置Maven环境变量
-    echo 'export PATH=/opt/apache-maven-3.8.1/bin:$PATH' >> ~/.bashrc
-    # 更改Maven镜像
-    mkdir -p ~/.m2
-    echo -e "<settings>\n  <mirrors>\n    <mirror>\n      <id>aliyun-maven</id>\n      <mirrorOf>*</mirrorOf>\n      <name>Aliyun Maven</name>\n      <url>https://maven.aliyun.com/repository/public</url>\n    </mirror>\n  </mirrors>\n</settings>" > ~/.m2/settings.xml
-    source ~/.bashrc
-else
-    echo "Maven is already installed"
-fi
-
-#安装git
-sudo yum install -y git
-  #安装依赖
-sudo yum install -y yum-utils device-mapper-persistent-data lvm2
-  #设置源
-sudo yum-config-manager --add-repo http://mirrors.aliyun.com/docker-ce/linux/centos/docker-ce.repo
-sudo yum makecache fast
-
-# 检查Docker是否已安装
-if ! command -v docker &> /dev/null
-then
-    # 如果Docker未安装,执行安装步骤
-    sudo yum install -y docker-ce
-    sudo systemctl start docker
-fi
-
-# 检查Docker Compose是否已安装
-if ! command -v docker-compose &> /dev/null
-then
-    # 如果Docker Compose未安装,执行安装步骤
-    sudo curl -L "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-x86_64" -o /usr/local/bin/docker-compose
-    sudo chmod +x /usr/local/bin/docker-compose
-fi
-
-# 显示版本号
-docker-compose -v
-
-
-
-#拉取代码打包
-APP_NAME="promotesai"
-mkdir -p /data/app/${APP_NAME}
-mkdir -p /data/app/${APP_NAME}/config
-cd /data/app/${APP_NAME}
-
-# 设置私有仓库信息
-repo_url="http://admin_lsl:Lsl18718383742@124.222.247.184:3000/wteamYD/promotesai-background.git"
-repo_branch="develop"
-# 克隆私有仓库代码
-
-# 删除目标路径(如果存在)
-if [ -d "promotesai-background" ]; then
-    #  更新代码
-    echo "更新代码"
-    cd promotesai-background
-    git pull origin ${repo_branch}
-
-else
-    echo "拉取代码"
-    git clone ${repo_url}
-    cd promotesai-background
-    git checkout -b ${repo_branch}
-    git pull origin ${repo_branch}
-    echo "Code successfully pulled from the private repository."
-fi
-
-
-
-# Maven打包
-echo 开始打包
-mvn clean package
-
-#echo 拷贝文件
-#cp -r ./config /data/app/${APP_NAME}
-
-# 定义应用组名:项目名
-group_name="promotesai"
-# 定义应用名称:客户端
-app_client_name="client-api"
-# 定义应用名称:管理端
-app_manager_name="manager-api"
-# 定义应用版本:最新版
-app_version='latest'
-# 定义应用环境
-profile_active='prod'
-echo '----stop container----'
-docker stop ${app_client_name}
-docker stop ${app_manager_name}
-echo '----rm container----'
-docker rm ${app_client_name}
-docker rm ${app_manager_name}
-echo '----rm image----'
-docker rmi ${group_name}/${app_client_name}:${app_version}
-docker rmi ${group_name}/${app_manager_name}:${app_version}
-
-# 构建客户端容器运行
-cd ${app_client_name}
-docker build -t ${group_name}/${app_client_name}:${app_version} --build-arg JAR_FILE=./target/client-api-0.0.1-SNAPSHOT.jar .
-echo '----build image----'
-docker run -p 8889:8889 --name ${app_client_name} \
-  -e TZ="Asia/Shanghai" \
-  -v /etc/localtime:/etc/localtime \
-  -d ${group_name}/${app_client_name}:${app_version}
-echo '----start container----'
-
-# 构建管理端容器运行
-cd ../${app_manager_name}
-docker build -t ${group_name}/${app_manager_name}:${app_version} --build-arg JAR_FILE=./target/manager-api-0.0.1-SNAPSHOT.jar .
-echo '----build image----'
-docker run -p 8887:8887 --name ${app_manager_name} \
-  -e TZ="Asia/Shanghai" \
-  -v /etc/localtime:/etc/localtime \
-  -d ${group_name}/${app_manager_name}:${app_version}
-echo '----start container----'
-
-
-
-
-
-
-
-
-
-
-
-

+ 0 - 144
formal.sh

@@ -1,144 +0,0 @@
-#安装maven
-if ! command -v mvn >/dev/null 2>&1; then
-    echo "Installing Maven"
-    # 下载Maven
-    wget https://archive.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz
-    # 解压Maven
-    tar -xzf apache-maven-3.8.1-bin.tar.gz -C /opt
-    # 设置Maven环境变量
-    echo 'export PATH=/opt/apache-maven-3.8.1/bin:$PATH' >> ~/.bashrc
-    # 更改Maven镜像
-    mkdir -p ~/.m2
-    echo -e "<settings>\n  <mirrors>\n    <mirror>\n      <id>aliyun-maven</id>\n      <mirrorOf>*</mirrorOf>\n      <name>Aliyun Maven</name>\n      <url>https://maven.aliyun.com/repository/public</url>\n    </mirror>\n  </mirrors>\n</settings>" > ~/.m2/settings.xml
-    source ~/.bashrc
-else
-    echo "Maven is already installed"
-fi
-
-#安装git
-sudo yum install -y git
-  #安装依赖
-sudo yum install -y yum-utils device-mapper-persistent-data lvm2
-  #设置源
-sudo yum-config-manager --add-repo http://mirrors.aliyun.com/docker-ce/linux/centos/docker-ce.repo
-sudo yum makecache fast
-
-# 检查Docker是否已安装
-if ! command -v docker &> /dev/null
-then
-    # 如果Docker未安装,执行安装步骤
-    sudo yum install -y docker-ce
-    sudo systemctl start docker
-fi
-
-# 检查Docker Compose是否已安装
-if ! command -v docker-compose &> /dev/null
-then
-    # 如果Docker Compose未安装,执行安装步骤
-    sudo curl -L "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-x86_64" -o /usr/local/bin/docker-compose
-    sudo chmod +x /usr/local/bin/docker-compose
-fi
-
-# 显示版本号
-docker-compose -v
-
-
-
-#拉取代码打包
-APP_NAME="promotesai"
-mkdir /data/app/${APP_NAME}/${APP_NAME}
-mkdir /data/app/${APP_NAME}/config
-cd /data/app/${APP_NAME}
-
-git init
-# 从私有仓库拉取代码
-git clone http://124.222.247.184:3000/admin_lsl/patent.git
-git pull
-
-cd ${APP_NAME}
-# Maven打包
-echo 开始打包
-mvn clean package
-
-
-# 定义应用组名
-group_name="$1"
-# 定义应用名称
-app_name="$1"
-# 定义应用版本
-app_version='latest'
-# 定义应用环境
-profile_active='prod'
-echo '----copy jar----'
-docker stop ${app_name}
-echo '----stop container----'
-docker rm ${app_name}
-echo '----rm container----'
-docker rmi ${group_name}/${app_name}:${app_version}
-echo '----rm image----'
-cd ${app_name}
-echo "当前目录是:$PWD"
-docker build -t ${group_name}/${app_name}:${app_version} --build-arg JAR_FILE=./target/client-api-0.0.1-SNAPSHOT.jar .
-echo '----build image----'
-docker run -p $2:8881 --name ${app_name} \
-  -e TZ="Asia/Shanghai" \
-  -v /etc/localtime:/etc/localtime \
-  -v /data/app/patent/config:/config \
-  -d ${group_name}/${app_name}:${app_version}
-echo '----start container----'
-
-echo "拉取nginx镜像"
-docker pull nginx:latest
-echo "运行nginx容器"
-docker run --name nginx -p 80:80 -d nginx
-if [ ! -f /opt/docker/nginx/conf/nginx.conf ]; then
-    echo "创建文件目录"
-    mkdir -p /opt/docker/nginx/conf.d
-    mkdir -p /opt/docker/nginx/html
-    mkdir -p /opt/docker/nginx/logs
-    mkdir -p /opt/docker/nginx/conf/nginx.conf
-    echo "拷贝nginx容器对应的文件默认配置"
-    docker cp nginx:/etc/nginx/nginx.conf /opt/docker/nginx/conf/nginx.conf
-    docker cp nginx:/etc/nginx/conf.d /opt/docker/nginx/conf.d
-    docker cp nginx:/usr/share/nginx/html /opt/docker/nginx
-fi
-echo "停止并移除容器"
-docker stop nginx
-docker rm nginx
-
-
-# 设置变量
-NGINX_CONF_DIR="/etc/nginx/conf.d"
-NGINX_CONF_FILE="example.conf"
-SERVER_NAME="example.com"
-UPSTREAM_NAME="app_server"
-UPSTREAM_SERVER="127.0.0.1:8000"
-
-# 创建配置文件
-echo "upstream ${UPSTREAM_NAME} {" > ${NGINX_CONF_DIR}/${NGINX_CONF_FILE}
-echo "    server ${UPSTREAM_SERVER};" >> ${NGINX_CONF_DIR}/${NGINX_CONF_FILE}
-echo "}" >> ${NGINX_CONF_DIR}/${NGINX_CONF_FILE}
-echo "server {" >> ${NGINX_CONF_DIR}/${NGINX_CONF_FILE}
-echo "    listen 80;" >> ${NGINX_CONF_DIR}/${NGINX_CONF_FILE}
-echo "    server_name ${SERVER_NAME};" >> ${NGINX_CONF_DIR}/${NGINX_CONF_FILE}
-echo "    location / {" >> ${NGINX_CONF_DIR}/${NGINX_CONF_FILE}
-echo "        proxy_pass http://${UPSTREAM_NAME};" >> ${NGINX_CONF_DIR}/${NGINX_CONF_FILE}
-echo "        proxy_set_header Host \$host;" >> ${NGINX_CONF_DIR}/${NGINX_CONF_FILE}
-echo "        proxy_set_header X-Real-IP \$remote_addr;" >> ${NGINX_CONF_DIR}/${NGINX_CONF_FILE}
-echo "    }" >> ${NGINX_CONF_DIR}/${NGINX_CONF_FILE}
-echo "}" >> ${NGINX_CONF_DIR}/${NGINX_CONF_FILE}
-
-
-echo "重新启动nginx镜像重新新容器"
-docker run  -p 80:80 --name nginx --restart=always
--v /opt/docker/nginx/conf/nginx.conf:/etc/nginx/nginx.conf \
--v /opt/docker/nginx/conf.d:/etc/nginx/conf.d \
--v /opt/docker/nginx/html:/usr/share/nginx/html \
--v /opt/docker/nginx/logs:/var/log/nginx \
--d  nginx
-
-
-
-
-
-

+ 0 - 288
framework/target/classes/META-INF/spring-configuration-metadata.json

@@ -1,288 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "ignored",
-      "type": "com.wteam.framework.common.properties.IgnoredUrlsProperties",
-      "sourceType": "com.wteam.framework.common.properties.IgnoredUrlsProperties"
-    },
-    {
-      "name": "khai.jwt-setting",
-      "type": "com.wteam.framework.common.properties.JWTTokenProperties",
-      "sourceType": "com.wteam.framework.common.properties.JWTTokenProperties"
-    },
-    {
-      "name": "lili.data.elasticsearch",
-      "type": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties",
-      "sourceType": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties"
-    },
-    {
-      "name": "lili.data.elasticsearch.account",
-      "type": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties$Account",
-      "sourceType": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties"
-    },
-    {
-      "name": "lili.data.elasticsearch.index",
-      "type": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties$Index",
-      "sourceType": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties"
-    },
-    {
-      "name": "lili.sms",
-      "type": "com.wteam.framework.common.properties.SmsTemplateProperties",
-      "sourceType": "com.wteam.framework.common.properties.SmsTemplateProperties"
-    },
-    {
-      "name": "lili.system",
-      "type": "com.wteam.framework.common.properties.SystemSettingProperties",
-      "sourceType": "com.wteam.framework.common.properties.SystemSettingProperties"
-    },
-    {
-      "name": "lili.verification-code",
-      "type": "com.wteam.framework.common.properties.VerificationCodeProperties",
-      "sourceType": "com.wteam.framework.common.properties.VerificationCodeProperties"
-    },
-    {
-      "name": "wteam.api",
-      "type": "com.wteam.framework.common.properties.ApiProperties",
-      "sourceType": "com.wteam.framework.common.properties.ApiProperties"
-    },
-    {
-      "name": "wteam.domain",
-      "type": "com.wteam.framework.common.properties.DomainProperties",
-      "sourceType": "com.wteam.framework.common.properties.DomainProperties"
-    }
-  ],
-  "properties": [
-    {
-      "name": "ignored.urls",
-      "type": "java.util.List<java.lang.String>",
-      "sourceType": "com.wteam.framework.common.properties.IgnoredUrlsProperties"
-    },
-    {
-      "name": "khai.jwt-setting.token-expire-time",
-      "type": "java.lang.Long",
-      "description": "token默认过期时间",
-      "sourceType": "com.wteam.framework.common.properties.JWTTokenProperties",
-      "defaultValue": 3600
-    },
-    {
-      "name": "lili.data.elasticsearch.account.password",
-      "type": "java.lang.String",
-      "description": "认证密码",
-      "sourceType": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties$Account"
-    },
-    {
-      "name": "lili.data.elasticsearch.account.username",
-      "type": "java.lang.String",
-      "description": "认证用户",
-      "sourceType": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties$Account"
-    },
-    {
-      "name": "lili.data.elasticsearch.cluster-name",
-      "type": "java.lang.String",
-      "description": "集群名称",
-      "sourceType": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties",
-      "defaultValue": "elasticsearch"
-    },
-    {
-      "name": "lili.data.elasticsearch.cluster-nodes",
-      "type": "java.util.List<java.lang.String>",
-      "description": "集群节点",
-      "sourceType": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties"
-    },
-    {
-      "name": "lili.data.elasticsearch.connect-timeout",
-      "type": "java.lang.Integer",
-      "description": "连接超时时间(毫秒)",
-      "sourceType": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties",
-      "defaultValue": 1000
-    },
-    {
-      "name": "lili.data.elasticsearch.connection-request-timeout",
-      "type": "java.lang.Integer",
-      "description": "连接请求超时时间",
-      "sourceType": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties",
-      "defaultValue": 500
-    },
-    {
-      "name": "lili.data.elasticsearch.index-prefix",
-      "type": "java.lang.String",
-      "description": "索引前缀",
-      "sourceType": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties"
-    },
-    {
-      "name": "lili.data.elasticsearch.index.number-of-replicas",
-      "type": "java.lang.Integer",
-      "description": "副本数量",
-      "sourceType": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties$Index",
-      "defaultValue": 2
-    },
-    {
-      "name": "lili.data.elasticsearch.index.number-of-shards",
-      "type": "java.lang.Integer",
-      "description": "分片数量",
-      "sourceType": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties$Index",
-      "defaultValue": 3
-    },
-    {
-      "name": "lili.data.elasticsearch.max-connect-per-route",
-      "type": "java.lang.Integer",
-      "description": "每个路由的最大连接数量",
-      "sourceType": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties",
-      "defaultValue": 10
-    },
-    {
-      "name": "lili.data.elasticsearch.max-connect-total",
-      "type": "java.lang.Integer",
-      "description": "最大连接总数量",
-      "sourceType": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties",
-      "defaultValue": 30
-    },
-    {
-      "name": "lili.data.elasticsearch.schema",
-      "type": "java.lang.String",
-      "description": "请求协议",
-      "sourceType": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties",
-      "defaultValue": "https"
-    },
-    {
-      "name": "lili.data.elasticsearch.socket-timeout",
-      "type": "java.lang.Integer",
-      "description": "socket 超时时间",
-      "sourceType": "com.wteam.framework.common.elasticsearch.config.ElasticsearchProperties",
-      "defaultValue": 30000
-    },
-    {
-      "name": "lili.sms.f-i-n-d-u-s-e-r",
-      "type": "java.lang.String",
-      "description": "找回密码",
-      "sourceType": "com.wteam.framework.common.properties.SmsTemplateProperties",
-      "defaultValue": "SMS_185821482"
-    },
-    {
-      "name": "lili.sms.l-o-g-i-n",
-      "type": "java.lang.String",
-      "description": "登录",
-      "sourceType": "com.wteam.framework.common.properties.SmsTemplateProperties",
-      "defaultValue": "SMS_185821482"
-    },
-    {
-      "name": "lili.sms.r-e-g-i-s-t-e-r",
-      "type": "java.lang.String",
-      "description": "注册",
-      "sourceType": "com.wteam.framework.common.properties.SmsTemplateProperties",
-      "defaultValue": "SMS_185821482"
-    },
-    {
-      "name": "lili.sms.u-p-d-a-t-e-p-a-s-s-w-o-r-d",
-      "type": "java.lang.String",
-      "description": "设置密码",
-      "sourceType": "com.wteam.framework.common.properties.SmsTemplateProperties",
-      "defaultValue": "SMS_185821482"
-    },
-    {
-      "name": "lili.sms.w-a-l-l-e-t-p-a-s-s-w-o-r-d",
-      "type": "java.lang.String",
-      "description": "设置支付密码",
-      "sourceType": "com.wteam.framework.common.properties.SmsTemplateProperties",
-      "defaultValue": "SMS_185821482"
-    },
-    {
-      "name": "lili.system.is-demo-site",
-      "type": "java.lang.Boolean",
-      "description": "是否是演示站点",
-      "sourceType": "com.wteam.framework.common.properties.SystemSettingProperties",
-      "defaultValue": false
-    },
-    {
-      "name": "lili.system.is-test-model",
-      "type": "java.lang.Boolean",
-      "description": "测试模式 验证码短信为6个1",
-      "sourceType": "com.wteam.framework.common.properties.SystemSettingProperties",
-      "defaultValue": false
-    },
-    {
-      "name": "lili.system.sensitive-level",
-      "type": "java.lang.Integer",
-      "description": "脱敏级别: 0:不做脱敏处理 1:管理端用户手机号等信息脱敏 2:商家端信息脱敏(为2时,表示管理端,商家端同时脱敏) <p> PS:",
-      "sourceType": "com.wteam.framework.common.properties.SystemSettingProperties",
-      "defaultValue": 0
-    },
-    {
-      "name": "lili.verification-code.effective-time",
-      "type": "java.lang.Long",
-      "description": "过期时间 包含滑块验证码有效时间, 以及验证通过之后,缓存中存储的验证结果有效时间",
-      "sourceType": "com.wteam.framework.common.properties.VerificationCodeProperties",
-      "defaultValue": 600
-    },
-    {
-      "name": "lili.verification-code.fault-tolerant",
-      "type": "java.lang.Integer",
-      "description": "容错像素",
-      "sourceType": "com.wteam.framework.common.properties.VerificationCodeProperties",
-      "defaultValue": 3
-    },
-    {
-      "name": "lili.verification-code.interfere-num",
-      "type": "java.lang.Integer",
-      "description": "干扰数量 最大数量",
-      "sourceType": "com.wteam.framework.common.properties.VerificationCodeProperties",
-      "defaultValue": 0
-    },
-    {
-      "name": "lili.verification-code.watermark",
-      "type": "java.lang.String",
-      "description": "水印",
-      "sourceType": "com.wteam.framework.common.properties.VerificationCodeProperties",
-      "defaultValue": ""
-    },
-    {
-      "name": "wteam.api.buyer",
-      "type": "java.lang.String",
-      "description": "买家api",
-      "sourceType": "com.wteam.framework.common.properties.ApiProperties"
-    },
-    {
-      "name": "wteam.api.common",
-      "type": "java.lang.String",
-      "description": "管理端域名",
-      "sourceType": "com.wteam.framework.common.properties.ApiProperties"
-    },
-    {
-      "name": "wteam.api.manager",
-      "type": "java.lang.String",
-      "description": "管理端域名",
-      "sourceType": "com.wteam.framework.common.properties.ApiProperties"
-    },
-    {
-      "name": "wteam.api.store",
-      "type": "java.lang.String",
-      "description": "管理端域名",
-      "sourceType": "com.wteam.framework.common.properties.ApiProperties"
-    },
-    {
-      "name": "wteam.domain.admin",
-      "type": "java.lang.String",
-      "description": "管理端域名",
-      "sourceType": "com.wteam.framework.common.properties.DomainProperties"
-    },
-    {
-      "name": "wteam.domain.pc",
-      "type": "java.lang.String",
-      "description": "买家PC端域名",
-      "sourceType": "com.wteam.framework.common.properties.DomainProperties"
-    },
-    {
-      "name": "wteam.domain.store",
-      "type": "java.lang.String",
-      "description": "Store域名",
-      "sourceType": "com.wteam.framework.common.properties.DomainProperties"
-    },
-    {
-      "name": "wteam.domain.wap",
-      "type": "java.lang.String",
-      "description": "买家WAP端域名",
-      "sourceType": "com.wteam.framework.common.properties.DomainProperties"
-    }
-  ],
-  "hints": []
-}

+ 0 - 6
framework/target/classes/application.yml

@@ -1,6 +0,0 @@
-aliyun:
-  oss:
-    endpoint: oss-cn-guangzhou.aliyuncs.com
-    keyid: LTAI5t9pT27kxbL63ddw3xZG
-    keysecret: XyKOjiFK9cpGNJev0HKpQOJ6dSs3sI
-    bucketname: game-community

+ 0 - 17
framework/target/classes/banner.txt

@@ -1,17 +0,0 @@
-${AnsiColor.CYAN}          ___       __   _________  _______   ________  _____ ______
-${AnsiColor.CYAN}         |\  \     |\  \|\___   ___\\  ___ \ |\   __  \|\   _ \  _   \
-${AnsiColor.CYAN}         \ \  \    \ \  \|___ \  \_\ \   __/|\ \  \|\  \ \  \\\__\ \  \
-${AnsiColor.CYAN}          \ \  \  __\ \  \   \ \  \ \ \  \_|/_\ \   __  \ \  \\|__| \  \
-${AnsiColor.CYAN}           \ \  \|\__\_\  \   \ \  \ \ \  \_|\ \ \  \ \  \ \  \    \ \  \
-${AnsiColor.CYAN}            \ \____________\   \ \__\ \ \_______\ \__\ \__\ \__\    \ \__\
-${AnsiColor.CYAN}             \|____________|    \|__|  \|_______|\|__|\|__|\|__|     \|__|
-${AnsiColor.CYAN}
-${AnsiColor.CYAN}
-${AnsiColor.CYAN}                ________  ____  __  __   _______
-${AnsiColor.CYAN}               / ___/ _ \/ __ \/ / / /__<  / / /
-${AnsiColor.CYAN}              / (_ / // / /_/ / /_/ /___/ /_  _/
-${AnsiColor.CYAN}              \___/____/\____/\____/   /_/ /_/
-
-
-
-

BIN
framework/target/classes/cn/lili/modules/file/util/FileUtil.class


BIN
framework/target/classes/com/wteam/framework/common/aop/Config/ThreadPoolTaskConfig.class


BIN
framework/target/classes/com/wteam/framework/common/aop/annotation/DemoSite.class


BIN
framework/target/classes/com/wteam/framework/common/aop/annotation/PreventDuplicateSubmissions.class


BIN
framework/target/classes/com/wteam/framework/common/aop/annotation/RetryOperation.class


BIN
framework/target/classes/com/wteam/framework/common/cache/Cache.class


BIN
framework/target/classes/com/wteam/framework/common/cache/CachePrefix.class


BIN
framework/target/classes/com/wteam/framework/common/cache/config/redis/FastJsonRedisSerializer.class


BIN
framework/target/classes/com/wteam/framework/common/cache/config/redis/RedisConfig$1.class


BIN
framework/target/classes/com/wteam/framework/common/cache/config/redis/RedisConfig.class


BIN
framework/target/classes/com/wteam/framework/common/cache/config/redis/RedisKeyConstants.class


BIN
framework/target/classes/com/wteam/framework/common/cache/impl/RedisCache.class


BIN
framework/target/classes/com/wteam/framework/common/cache/limit/annotation/LimitPoint.class


BIN
framework/target/classes/com/wteam/framework/common/cache/limit/enums/LimitTypeEnums.class


BIN
framework/target/classes/com/wteam/framework/common/cache/limit/interceptor/LimitInterceptor.class


BIN
framework/target/classes/com/wteam/framework/common/cache/script/LuaScript.class


BIN
framework/target/classes/com/wteam/framework/common/context/ThreadContextHolder.class


BIN
framework/target/classes/com/wteam/framework/common/elasticsearch/BaseElasticsearchService$1.class


BIN
framework/target/classes/com/wteam/framework/common/elasticsearch/BaseElasticsearchService.class


BIN
framework/target/classes/com/wteam/framework/common/elasticsearch/EsSuffix.class


BIN
framework/target/classes/com/wteam/framework/common/elasticsearch/config/ElasticsearchConfig.class


BIN
framework/target/classes/com/wteam/framework/common/elasticsearch/config/ElasticsearchProperties$Account.class


BIN
framework/target/classes/com/wteam/framework/common/elasticsearch/config/ElasticsearchProperties$ElasticsearchPropertiesBuilder.class


BIN
framework/target/classes/com/wteam/framework/common/elasticsearch/config/ElasticsearchProperties$Index.class


BIN
framework/target/classes/com/wteam/framework/common/elasticsearch/config/ElasticsearchProperties.class


BIN
framework/target/classes/com/wteam/framework/common/enums/ClientTypeEnum.class


BIN
framework/target/classes/com/wteam/framework/common/enums/PermissionEnum.class


BIN
framework/target/classes/com/wteam/framework/common/enums/ResultCode.class


BIN
framework/target/classes/com/wteam/framework/common/enums/ResultUtil.class


BIN
framework/target/classes/com/wteam/framework/common/enums/SecurityEnum.class


BIN
framework/target/classes/com/wteam/framework/common/exception/GlobalControllerExceptionHandler.class


BIN
framework/target/classes/com/wteam/framework/common/exception/RetryException.class


BIN
framework/target/classes/com/wteam/framework/common/exception/ServiceException.class


BIN
framework/target/classes/com/wteam/framework/common/mybatis/BaseEntity.class


BIN
framework/target/classes/com/wteam/framework/common/mybatis/BaseIdEntity.class


BIN
framework/target/classes/com/wteam/framework/common/mybatis/MyMetaObjectHandler.class


BIN
framework/target/classes/com/wteam/framework/common/mybatis/MybatisPlusConfig.class


BIN
framework/target/classes/com/wteam/framework/common/mybatis/util/PageUtil.class


BIN
framework/target/classes/com/wteam/framework/common/properties/ApiProperties.class


BIN
framework/target/classes/com/wteam/framework/common/properties/DomainProperties.class


BIN
framework/target/classes/com/wteam/framework/common/properties/IgnoredUrlsProperties.class


BIN
framework/target/classes/com/wteam/framework/common/properties/JWTTokenProperties.class


BIN
framework/target/classes/com/wteam/framework/common/properties/SmsTemplateProperties.class


BIN
framework/target/classes/com/wteam/framework/common/properties/SystemSettingProperties.class


BIN
framework/target/classes/com/wteam/framework/common/properties/VerificationCodeProperties.class


BIN
framework/target/classes/com/wteam/framework/common/security/AuthUser.class


BIN
framework/target/classes/com/wteam/framework/common/security/SecurityBean.class


BIN
framework/target/classes/com/wteam/framework/common/security/context/UserContext.class


BIN
framework/target/classes/com/wteam/framework/common/security/enums/PermissionEnum.class


BIN
framework/target/classes/com/wteam/framework/common/security/enums/SecurityEnum.class


BIN
framework/target/classes/com/wteam/framework/common/security/enums/UserEnums.class


BIN
framework/target/classes/com/wteam/framework/common/security/handler/CustomAccessDeniedHandler.class


BIN
framework/target/classes/com/wteam/framework/common/security/sensitive/Sensitive.class


BIN
framework/target/classes/com/wteam/framework/common/security/sensitive/SensitiveJsonSerializer.class


BIN
framework/target/classes/com/wteam/framework/common/security/sensitive/enums/SensitiveStrategy.class


BIN
framework/target/classes/com/wteam/framework/common/security/token/SecretKeyUtil.class


BIN
framework/target/classes/com/wteam/framework/common/security/token/Token.class


BIN
framework/target/classes/com/wteam/framework/common/security/token/TokenUtils.class


BIN
framework/target/classes/com/wteam/framework/common/security/token/base/AbstractTokenGenerate.class


BIN
framework/target/classes/com/wteam/framework/common/security/token/manager/ManagerTokenGenerate.class


BIN
framework/target/classes/com/wteam/framework/common/swagger/Swagger2Config.class


BIN
framework/target/classes/com/wteam/framework/common/utils/Arith.class


BIN
framework/target/classes/com/wteam/framework/common/utils/Base64DecodeMultipartFile.class


BIN
framework/target/classes/com/wteam/framework/common/utils/Base64Utils.class


BIN
framework/target/classes/com/wteam/framework/common/utils/BeanUtil.class


BIN
framework/target/classes/com/wteam/framework/common/utils/CommonUtil.class


BIN
framework/target/classes/com/wteam/framework/common/utils/CookieUtil.class


BIN
framework/target/classes/com/wteam/framework/common/utils/CurrencyUtil.class


BIN
framework/target/classes/com/wteam/framework/common/utils/DateRuoYiUtils.class


BIN
framework/target/classes/com/wteam/framework/common/utils/DateUtil.class


BIN
framework/target/classes/com/wteam/framework/common/utils/HttpClientUtils.class


BIN
framework/target/classes/com/wteam/framework/common/utils/HttpUtils.class


BIN
framework/target/classes/com/wteam/framework/common/utils/IpHelper.class


BIN
framework/target/classes/com/wteam/framework/common/utils/IpUtils.class


BIN
framework/target/classes/com/wteam/framework/common/utils/JasyptUtil.class


BIN
framework/target/classes/com/wteam/framework/common/utils/ObjectUtil.class


BIN
framework/target/classes/com/wteam/framework/common/utils/QRCode.class


BIN
framework/target/classes/com/wteam/framework/common/utils/RegularUtil.class


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است