合并代码

mosty-jcgl/mosty-jcgl.iml

@@ -17,10 +17,10 @@
             <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
             <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
             <entry key="jrebelEnabled" value="true" />
-            <entry key="lastExternalPluginCheckTime" value="1747276765359" />
+            <entry key="lastExternalPluginCheckTime" value="1757036647255" />
           </map>
         </option>
-        <option name="version" value="13" />
+        <option name="version" value="15" />
       </configuration>
     </facet>
   </component>

mosty-jcgl/src/main/resources/application.yml

@@ -10,15 +10,12 @@ spring:
   jackson:
     serialization:
       write-dates-as-timestamps: false
-    #    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
+    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://192.168.200.131:3306/mosty_jcgl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
-#    username: root
-#    password: mosty888
-    url: jdbc:mysql://172.20.19.130:33306/mosty_jcgl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.1.129:33306/mosty_jcgl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: mostyDB1
     password: mostyDBMysql1
     hikari:
@@ -29,23 +26,10 @@ spring:
       connection-timeout: 60000 # ????????????250????????????30?
       connection-test-query: SELECT 1 # ???????????????
   # Redis数据库索引（默认为0）
-#  redis:
-#    database: 8
-#    # Redis服务器地址
-#    host: 192.168.200.131
-#    # Redis服务器连接端口
-#    port: 6379
-#    # Redis服务器连接密码（默认为空）
-#    password: mosty888
-#    # 连接超时时间（毫秒）
-#    timeout: 2000
-#    jedis:
-#      pool:
-#        max-active: 50
   redis:
     database: 1
     # Redis服务器地址
-    host: 172.20.19.130
+    host: 192.168.1.129
     # Redis服务器连接端口
     port: 63799
     # Redis服务器连接密码（默认为空）
@@ -72,13 +56,14 @@ magic-api:
   web: /magic/web
   #配置文件存储位置。当以classpath开头时，为只读模式
   resource:
-    #    location: /data/magic-api
+#    location: /data/magic-api
     type: database
     table-name: magic_api  # 数据库中的表名
     prefix: /magic-api  # 前缀
     datasource:
   response-code:
     success: 10000
+
 exclude:
   pathPatterns:
     swagger:

mosty-jcgl/src/main/resources/bootstrap.yml

@@ -2,21 +2,19 @@ server:
   port: 8009
   servlet:
     context-path: /mosty-jcgl/
+
 spring:
   application:
     name: mosty-jcgl
   cloud:
     nacos:
       discovery:
-#        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
-#        server-addr: 192.168.200.131:8848
         register-enabled: true
         namespace: f23c13d4-0935-42e0-850e-a2216125f2ae
-        server-addr: 172.20.19.130:18848
+        server-addr: 192.168.1.129:18848
         username: nacosDev1
         password: nacosDev1
 
-
 # 开启健康监控
 management:
   endpoints:
@@ -40,4 +38,3 @@ management:
 # 日志
 #logging:
 #  file: /application/applogs/admin.log
-