修改---合并【HuNan_20250330】分支上的后端代码

src/main/java/com/bootdo/system/controller/LoginController.java

@@ -129,7 +129,7 @@ public class LoginController extends BaseController {
         //获取当前登录账号信息
         UserDO currUser = ShiroUtils.getUser();
 
-        if(!ObjectUtils.isEmpty(logoutRedirectUrl) && logoutRedirectUrl.contains("http")){
+        if(!ObjectUtils.isEmpty(logoutRedirectUrl) && logoutRedirectUrl.contains("https")){
             //返回第三方退出登录接口
             //回调地址示例：https://testmicrosrv.scca.com.cn:9668/session/end?client_id=f104472f-02f4-6ab6-f6dc&access_token=HRMpcEUueorxSGQccNolRB2vkpaxnWHGvQonRtnoKEr3Z7KQthcUFz8jdaSD&logout_redirect_uri=http://124.70.58.209:19087/login
             String logoutRedirectBackUrl = permAuthPrefix + "/session/end" +

src/main/resources/application-prod.yml

@@ -21,9 +21,9 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://172.18.105.100:3306/cic-data?useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://172.16.2.4:8806/cic-data?useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: Admin@!#%2024
+    password: Admin@!#%2025
     initialSize: 1
     minIdle: 3
     maxActive: 20
@@ -47,10 +47,27 @@ spring:
     # 合并多个DruidDataSource的监控数据
     #useGlobalDataSourceStat: true
 
+#  redis:
+#    cluster:
+#      nodes: 172.18.105.10:7001,172.18.105.10:7002,172.18.105.10:7003,172.18.105.11:7004,172.18.105.11:7005,172.18.105.11:7006
+#    password: YXSA@2024
+#    # 连接超时时间（毫秒）
+#    timeout: 10000
+#    jedis:
+#      pool:
+#        # 连接池中的最大空闲连接
+#        max-idle: 8
+#        # 连接池中的最小空闲连接
+#        min-idle: 10
+#        # 连接池最大连接数（使用负值表示没有限制）
+#        max-active: 100
+#        # 连接池最大阻塞等待时间（使用负值表示没有限制）
+#        max-wait: -1
+#    database: 0
   redis:
-    cluster:
-      nodes: 172.18.105.10:7001,172.18.105.10:7002,172.18.105.10:7003,172.18.105.11:7004,172.18.105.11:7005,172.18.105.11:7006
-    password: YXSA@2024
+    host: 172.16.2.4
+    port: 7001
+    password: tysfrz123
     # 连接超时时间（毫秒）
     timeout: 10000
     jedis:
@@ -64,9 +81,12 @@ spring:
         # 连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1
     database: 0
+
 server:
   tomcat:
     basedir: /home/data/service/cic-data/res/tmp
+
+
 ## ca 证书配置
 #ca:
 #  # cert 文件路径
@@ -83,25 +103,29 @@ server:
 #  server-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA197S/rwqi+rHjg987bvsqTGYfdsxCFgfMhayyaO+64huzavefkLSEQc4fkYd2eVfnm4K9EwrispHx/3KfT22KCM+v6skJuozCslD/3jnRWSLtMl+7B95qWI8DvBUlIGKf0AXek7VLli/ibgwy2/UdGTyeM9Hdt+Ib95eKPyCxvkJDkaxFMlwS6wCX+BlUMjGBjkD5G7U4rrILHpi4NFzXQSohHrgqtiDF61RcxUMEzJMuV9CckmDbSuUamYnIQ/6JXO5zkiLtGsQZIZpLOin/+AcbEy4FQ24j9QOL0Lsd0ST8Y28ro10whXqcqoiAShwVBjP8Mr41FaVfl0uwvAgHQIDAQAB
 
 #允许http api调用的IP
-api-allow-ip: 127.0.0.1,172.18.105.10,172.18.105.11,218.89.240.185
+api-allow-ip: 127.0.0.1,172.16.2.2,172.16.2.3,172.16.2.4
+
+
 
 #登录页地址         门户页面上，系统按钮的链接地址
 #login_url: http://218.89.240.185:19087/gateway/record
-login_url: https://gysa.yxsa.com.cn:19087/gateway/record
+#login_url: https://gysa.yxsa.com.cn:19087/gateway/record
+login_url: http://218.76.24.205:19087/login
+
 
 #后台管理
 #back_manange_sso_url: http://218.89.240.185:19087/system/user
-back_manange_sso_url: https://gysa.yxsa.com.cn:19087/system/user
+back_manange_sso_url: http://218.76.24.205:19087/system/user
 
 # 退出登录，需要跳转的地址
 logout:
 # 门户页面上，系统按钮的链接地址
 #  redirect_url: http://218.89.240.185:19087/gateway/record
-  redirect_url: https://gysa.yxsa.com.cn:19087/gateway/record
+  redirect_url: http://218.76.24.205:19087/login
 #4A的Oauth权限认证
 oauth_permission_authentication:
 #  prefix: http://172.18.105.21:18001
-  prefix: https://gysa.yxsa.com.cn:19007
+  prefix: https://gysa.yxsa.com.cnnnnnnnnnn:19007
 #统一身份认证
 uniform_identity_authentication:
   appId: 1828973267313733632
@@ -111,7 +135,7 @@ uniform_identity_authentication:
 
 #短信网关
 message_gateway:
-  prefix: https://microsrv.scca.com.cn:10011
+  prefix: https://microsrv.scca.com.cnnnnnnnnnn:10011
   appId: SCCA1829408255079600130
   appKey: bca09e1e2f634ab281c75112e3ee3b3b
   appName: 风险报送系统

src/main/resources/application.yml

@@ -21,9 +21,9 @@ spring:
 #    开发环境
 #  active: dev
 #    测试环境
-   active: test
+#   active: test
 #    #生产环境
-#    active: prod
+    active: prod
   servlet:
     multipart:
       max-file-size: 30Mb