optimizer： 配置文件优化

1. 将配置文件中公共的配置提取到application.yml 中，将application-dev，test，prod 等配置文件中的移除
2. 完善登录过程中的日志
3. 完善log.error记录异常e的记录方式，不需要借助{}进行占位
4. 移除类中没有使用的import
5. 完善README.md 文件，在里面补充对不同服务功能描述以及端口描述

README.md

@@ -1,14 +1,27 @@
-authentication      授权服务
-commons             公共类
-gateway             网关
-platform            总控项目
+# 项目介绍
 
 
+## 微服务介绍
+
+| 序号 | 服务名                               | 端口号  | 备注        | 是否必须启动 |
+|:---|:----------------------------------|:-----|:----------|:-------|
+| 1  | authentication                    | 8081 | 认证服务      | 是      |
+| 2  | commons                           |      | 公共类       | 否      |
+| 3  | gateway                           | 8001 | 网关        | 是      |
+| 4  | platform                          | 8087 | 总控项目      | 是      |
+| 5  | consoleStatistics                 | 8086 |           | 是      |
+| 6  | tenant--costsorrule               | 8085 |           | 是      |
+| 7  | tenant-organization               | 8085 |           | 是      |
+| 8  | tenant-insurance-xxx              | xxx  | 对接不同的保险公司 | 否      |
+| 9  | rocketmq                          |      |           | 否      |
+| 10 | operation-Backend                 | xxx  | 前端：平台管理系统 | 否      |
+| 11 | tenant-Platform                   | xxx  | 前端：租户系统   | 否      |
 
-通过gateway网关转发其他服务项目   后期加入nacos 使用服务名支持负载均衡、服务健康状态管理
 
 
+## 其它
 
+通过gateway网关转发其他服务项目   后期加入nacos 使用服务名支持负载均衡、服务健康状态管理
 
 轨迹添加
 Service层 需要继承HistoryDataService  实现getHistoryData方法   更新与删除操作需要获取历史的数据

authentication/src/main/java/com/jzg/controller/AuthController.java

@@ -4,8 +4,8 @@ import cn.hutool.core.util.HexUtil;
 import cn.hutool.crypto.BCUtil;
 import cn.hutool.crypto.SmUtil;
 import cn.hutool.crypto.asymmetric.SM2;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.alipay.api.AlipayConfig;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.annotation.IgnoreTenant;
@@ -15,7 +15,6 @@ import com.jzg.commons.request.RequestSingleParam;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.PasswordUtils;
-import com.jzg.commons.util.sm.Sm2Util;
 import com.jzg.config.JzgTokenService;
 import com.jzg.config.JzgUserDetailsService;
 import com.jzg.config.JzgUsernamePasswordAuthenticationToken;
@@ -43,21 +42,14 @@ import jakarta.servlet.ServletException;
 import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
-import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.mp.api.WxMpService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.tomcat.util.http.fileupload.IOUtils;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
-import org.bouncycastle.util.encoders.Hex;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.*;
@@ -69,9 +61,7 @@ import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.security.*;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import java.util.Random;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 
@@ -138,6 +128,7 @@ public class AuthController extends BaseController {
     @PostMapping("/login")
     @IgnoreTenant
     public void login(@RequestBody LoginFormVo loginFormVo) throws ServletException, IOException {
+        log.info("登录接口。loginFormVo=[{}]", JSONUtil.toJsonStr(loginFormVo));
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
 

authentication/src/main/java/com/jzg/handler/JzgAuthenticationSuccessHandler.java

@@ -65,9 +65,7 @@ public class JzgAuthenticationSuccessHandler implements AuthenticationSuccessHan
         String token = tokenService.generateToken(username);
         // 生成 JWT Token
         tokenService.saveToken(username,token,JSONObject.toJSONString(redisToken));
-
         logger.info(username+"登录成功");
-
         // 设置响应内容类型为 JSON
         response.setContentType("application/json");
         JSONObject json = new JSONObject();
@@ -78,12 +76,9 @@ public class JzgAuthenticationSuccessHandler implements AuthenticationSuccessHan
         json.put("msg","login success");
         json.put("data",data);
         json.put("type","1");
-//        json.put("code",200);
-//        json.put("msg","login success");
 //        json.put("data",token);
         // 将 Token 返回给前端
         response.getWriter().write(json.toJSONString());
-
         // 确保状态码为 200 OK，不进行重定向
         response.setStatus(HttpServletResponse.SC_OK);
     }

commons/src/main/java/com/jzg/commons/core/base/BaseController.java

@@ -43,6 +43,7 @@ public class BaseController {
      */
     private void valiedToken(String token){
         if (Objects.isNull(token) || Objects.isNull(redissonClient.getBucket(token).get())) {
+            log.info("登录信息过期。 token=[{}]",token);
             throw new TokenExpireException("用户登录信息过期");
         }
     }

commons/src/main/java/com/jzg/commons/exception/GlobalExceptionHandler.java

@@ -1,9 +1,7 @@
 package com.jzg.commons.exception;
 
-import cn.hutool.core.util.StrUtil;
 import com.jzg.commons.core.page.HttpResult;
 import jakarta.servlet.http.HttpServletRequest;
-import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,7 +15,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.sql.SQLIntegrityConstraintViolationException;
 import java.util.List;
-import java.util.Set;
 
 @ControllerAdvice
 public class GlobalExceptionHandler {

consoleStatistics/src/main/resources/application-dev.yml

@@ -1,5 +1,3 @@
-server:
-  port: 8086
 spring:
   cloud:
     nacos:

consoleStatistics/src/main/resources/application-prod.yml

@@ -0,0 +1,36 @@
+spring:
+  cloud:
+    nacos:
+      server-addr: 192.168.5.250:8848
+      username: nacos
+      password: nacos
+      config:
+        file-extension: yaml
+        #namespace: 1096345e-2a2d-4307-8025-ee1b669e127b
+        namespace: cd5346ae-aaf1-42a4-802a-4d0938aa1903
+        group: DEFAULT_GROUP
+      discovery:
+        #namespace: 1096345e-2a2d-4307-8025-ee1b669e127b
+        namespace: cd5346ae-aaf1-42a4-802a-4d0938aa1903
+  config:
+    import:
+      - nacos:mysql
+      - nacos:redisson
+      - nacos:minio
+      - nacos:rocketmq
+      - nacos:mongodb
+config:
+  sso: 1
+
+#银联API参数配置
+unionPay:
+  api:
+    appId: 10037e6f8e41423b01912b657e5c116c
+    appKey: 1110043747cb40f4911096480ea93f3e
+    accessTokenUrl: https://test-api-open.chinaums.com/v2/token/access
+    twoFactorVerifyUrl: https://test-api-open.chinaums.com/v1/datacenter/smartverification/encrypted/mobile/2factor/verify
+    threeFactorVerifyUrl: https://test-api-open.chinaums.com/v1/datacenter/smartverification/encrypted/mobile/3factor/verify
+    bankCardVerifyUrl: https://test-api-open.chinaums.com/v1/datacenter/smartverification/encrypted/bankcard/verify
+    publicKey: 0414bb7e9c3914bb65b85079b1dc6e1ca2a0ee04dd9bb55b2f8d31704a6dec0cca695739e128f9c931330e1c0f493be4d56244236434c9d344c4716ba64a4470ba
+    privateKey: 24ebfde60aecb81214605050763926ec342c487859a8da57d5badcd3c1559336
+

consoleStatistics/src/main/resources/application.yml

@@ -1,3 +1,5 @@
+server:
+  port: 8086
 spring:
   application:
     name: jzg-console

gateway/src/main/java/com/jzg/filter/AuthFilter.java

@@ -35,7 +35,7 @@ public class AuthFilter implements GlobalFilter {
                 // 发生异常时记录日志（ERROR级别）
                 .doOnError(e -> {
                     long cost = Duration.between(Instant.now(), Instant.now()).toMillis();
-                    log.error("【Gateway请求异常】 请求地址：{} , 耗时: {}ms, 异常信息:{} ",path,cost, e);
+                    log.error("【Gateway请求异常】 请求地址：{} , 耗时: {}ms, 异常信息",path,cost, e);
                 });
     }
 

gateway/src/main/resources/application-dev.yml

@@ -1,4 +1,9 @@
 spring:
+  redis:
+    redisson:
+      address: redis://192.168.5.250:6379
+      password: 123456
+      database: 0
   minio:
     url: http://192.168.0.250:9000
     access-key: v7Zb8XhyLcYNcSHlxvyK

gateway/src/main/resources/application-prod.yml

@@ -1,4 +1,9 @@
 spring:
+  redis:
+    redisson:
+      address: redis://xxx:xxx
+      password: xxx
+      database: 0
   minio:
     url: http://172.24.144.227:9000
     access-key: v7Zb8XhyLcYNcSHlxvyK

gateway/src/main/resources/application-test.yml

@@ -1,4 +1,9 @@
 spring:
+  redis:
+    redisson:
+      address: redis://xxx:xxx
+      password: xxx
+      database: 0
   minio:
     url: http://test-api.baoxianzhanggui.com
     access-key: v7Zb8XhyLcYNcSHlxvyK

gateway/src/main/resources/application.yml

@@ -8,14 +8,14 @@ spring:
     allow-bean-definition-overriding: true
   application:
     name: jzg-gateway
-  redis:
-    redisson:
-#      address: redis://172.24.144.227:6379
+#  redis:
+#    redisson:
+##      address: redis://172.24.144.227:6379
+##      password: 123456
+##      database: 0
+#
+#      address: redis://192.168.5.250:6379
 #      password: 123456
 #      database: 0
 
-      address: redis://192.168.5.250:6379
-      password: 123456
-      database: 0
-
 isEncrypted: false

partner/src/main/resources/application-dev.yml

@@ -1,5 +1,3 @@
-server:
-  port: 8087
 spring:
   cloud:
     nacos:

partner/src/main/resources/application-prod.yml

@@ -1,5 +1,3 @@
-server:
-  port: 8087
 spring:
   cloud:
     nacos:

partner/src/main/resources/application-test.yml

@@ -1,5 +1,3 @@
-server:
-  port: 9083
 spring:
   cloud:
     nacos:

partner/src/main/resources/application.yml

@@ -1,3 +1,5 @@
+server:
+  port: 8087
 spring:
   application:
     name: jzg-partner

tenant/costsorrule/src/main/resources/application-dev.yml

@@ -1,5 +1,3 @@
-server:
-  port: 8085
 spring:
   cloud:
     nacos:

tenant/costsorrule/src/main/resources/application-prod.yml

@@ -1,5 +1,3 @@
-server:
-  port: 8085
 spring:
   cloud:
     nacos:

tenant/costsorrule/src/main/resources/application-test.yml

@@ -1,5 +1,3 @@
-server:
-  port: 9085
 spring:
   cloud:
     nacos:

tenant/costsorrule/src/main/resources/application.yml

@@ -1,3 +1,5 @@
+server:
+  port: 8085
 spring:
   application:
     name: jzg-costsorrule

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/factory/decorator/quote/QuoteDispatchDecorator.java

@@ -47,9 +47,9 @@ public class QuoteDispatchDecorator {
         this.platformClient = platformClient;
     }
 
-//    public void setTarget(QuoteRestrictDecorator target) {
-//        this.target = target;
-//    }
+    public void setTarget(QuoteRestrictDecorator target) {
+        this.target = target;
+    }
 
     public QuoteResultsVo quote(QuoteVo quoteVo) throws Exception {
         try {

tenant/organization/src/main/resources/application-dev.yml

@@ -1,5 +1,3 @@
-server:
-  port: 8084
 spring:
   cloud:
     nacos:

tenant/organization/src/main/resources/application-prod.yml

@@ -1,5 +1,3 @@
-server:
-  port: 8084
 spring:
   cloud:
     nacos:

tenant/organization/src/main/resources/application-test.yml

@@ -1,5 +1,3 @@
-server:
-  port: 9084
 spring:
   cloud:
     nacos:

tenant/organization/src/main/resources/application.yml

@@ -1,3 +1,5 @@
+server:
+  port: 8084
 spring:
   application:
     name: jzg-organization