配置变更

src/main/resources/application-dev.yml

@@ -6,17 +6,17 @@ spring:
     allow-circular-references: true
     allow-bean-definition-overriding: true  # 允许bean定义覆盖，解决RabbitMQConfig中的objectMapper bean冲突
   datasource:
-    url: jdbc:mysql://47.107.249.41:13306/gxwebsoft_core?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://1Panel-mysql-XsWW:3306/gxwebsoft_core?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
     username: gxwebsoft_core
     password: ZXT5FkBREBJQPiAs
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
 
-  redis:
+    redis:
-    database: 0
+      database: 0
-    host: 8.134.55.105
+      host: 1Panel-redis-GmNr
-    port: 16379
+      port: 6379
-    password: redis_t74P8C
+      password: redis_t74P8C
 
 # 日志配置
 logging:

src/main/resources/application-local.yml

@@ -0,0 +1,36 @@
+# 开发环境配置
+
+# 数据源配置
+spring:
+  main:
+    allow-circular-references: true
+    allow-bean-definition-overriding: true  # 允许bean定义覆盖，解决RabbitMQConfig中的objectMapper bean冲突
+  datasource:
+    url: jdbc:mysql://47.107.249.41:13306/gxwebsoft_core?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    username: gxwebsoft_core
+    password: ZXT5FkBREBJQPiAs
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    type: com.alibaba.druid.pool.DruidDataSource
+
+  redis:
+    database: 0
+    host: localhost
+    port: 6379
+
+# 日志配置
+logging:
+  level:
+    com.gxwebsoft: DEBUG
+    com.baomidou.mybatisplus: DEBUG
+
+socketio:
+  host: localhost #IP地址
+
+# 框架配置
+config:
+  # 开发环境接口
+  server-url: http://127.0.0.1:9090/api
+  upload-path: /Users/gxwebsoft/Documents/uploads
+
+#swagger:
+#host: https://server.websoft.top/swagger-ui/index.html

src/main/resources/application.yml

@@ -8,6 +8,7 @@ socketio:
 spring:
   profiles:
     active: dev
+#    active: local
 
   application:
     name: server
@@ -56,11 +57,11 @@ spring:
     multipart:
       max-file-size: 500MB
       max-request-size: 500MB
-  redis:
+#  redis:
-    database: 0
+#    database: 0
-    host: 1Panel-redis-GmNr
+#    host: 1Panel-redis-GmNr
-    port: 6379
+#    port: 6379
-    password: redis_t74P8C
+#    password: redis_t74P8C
 
   # RabbitMQ 配置
 #  rabbitmq: