Merge remote-tracking branch 'origin/master'

src/main/java/com/chelvc/cloud/chelvc/Server.java

@@ -5,9 +5,9 @@ import com.chelvc.cloud.maintain.MaintainServer;
 import com.chelvc.cloud.user.server.UserServer;
 import com.chelvc.cloud.vehicle.server.VehicleServer;
 import com.chelvc.framework.base.config.BeanFullnameGenerator;
-import com.chelvc.framework.base.config.MultiserverMvcConfigurer;
+import com.chelvc.framework.base.config.MultipleServerConfigurer;
 import com.chelvc.framework.database.interceptor.DynamicDatasourceInterceptor;
-import com.chelvc.framework.nacos.config.MultiserverNacosConfigurer;
+import com.chelvc.framework.nacos.config.MultipleNacosConfigurer;
 import com.chelvc.framework.security.session.OAuthSessionFactory;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
@@ -37,7 +37,7 @@ import org.springframework.context.annotation.Import;
                 MaintainServer.class,
                 OAuthSessionFactory.class
         })})
-@Import({MultiserverMvcConfigurer.class, MultiserverNacosConfigurer.class, DynamicDatasourceInterceptor.class})
+@Import({MultipleServerConfigurer.class, MultipleNacosConfigurer.class, DynamicDatasourceInterceptor.class})
 public class Server {
     public static void main(String[] args) {
         SpringApplication.run(Server.class);

src/main/resources/application-dev.yml

@@ -5,9 +5,9 @@ spring:
         server-addr: 47.108.212.170:6848
   datasource:
     dynamic:
-      primary: com.chelvc.cloud.uc.server
+      primary: com.chelvc.cloud.user.server
       datasource:
-        "[com.chelvc.cloud.uc.server]":
+        "[com.chelvc.cloud.user.server]":
           url: jdbc:mysql://47.108.212.170:6180/user?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true&useAffectedRows=true
           username: user
           password: Chelvc@user!2023#
@@ -55,9 +55,9 @@ security:
         refresh-token-timeout: 7776000
 
 upload:
-  directory: /home/chelvc/static
+  bucket: /home/chelvc/static
   domain: https://test.chelvc.com/file
-  channel: DEFAULT
+  channel: LOCAL
 
 location:
   clients:

src/main/resources/application-pre.yml

@@ -5,10 +5,10 @@ spring:
         server-addr: 127.0.0.1:6848
   datasource:
     dynamic:
-      primary: com.chelvc.cloud.uc.server
+      primary: com.chelvc.cloud.user.server
       datasource:
-        "[com.chelvc.cloud.uc.server]":
-          url: jdbc:mysql://127.0.0.1:6180/user?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true&useAffectedRows=true
+        "[com.chelvc.cloud.user.server]":
+          url: jdbc:mysql://127.0.0.1:6080/user?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true&useAffectedRows=true
           username: user
           password: Chelvc@user!2023#
           hikari:
@@ -17,7 +17,7 @@ spring:
             max-pool-size: 10
             max-lifetime: 120000
         "[com.chelvc.cloud.vehicle.server]":
-          url: jdbc:mysql://127.0.0.1:6180/vehicle?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true&useAffectedRows=true
+          url: jdbc:mysql://127.0.0.1:6080/vehicle?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true&useAffectedRows=true
           username: vehicle
           password: Chelvc@vehicle!2023#
           hikari:
@@ -55,9 +55,9 @@ security:
         refresh-token-timeout: 7776000
 
 upload:
-  directory: /home/chelvc/static
+  bucket: /home/chelvc/static
   domain: https://test.chelvc.com/file
-  channel: DEFAULT
+  channel: LOCAL
 
 location:
   clients:

src/main/resources/application-prod.yml

@@ -5,10 +5,10 @@ spring:
         server-addr: 127.0.0.1:6848
   datasource:
     dynamic:
-      primary: com.chelvc.cloud.uc.server
+      primary: com.chelvc.cloud.user.server
       datasource:
-        "[com.chelvc.cloud.uc.server]":
-          url: jdbc:mysql://127.0.0.1:6180/user?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true&useAffectedRows=true
+        "[com.chelvc.cloud.user.server]":
+          url: jdbc:mysql://127.0.0.1:6080/user?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true&useAffectedRows=true
           username: user
           password: Chelvc@user!2023#
           hikari:
@@ -17,7 +17,7 @@ spring:
             max-pool-size: 10
             max-lifetime: 120000
         "[com.chelvc.cloud.vehicle.server]":
-          url: jdbc:mysql://127.0.0.1:6180/vehicle?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true&useAffectedRows=true
+          url: jdbc:mysql://127.0.0.1:6080/vehicle?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true&useAffectedRows=true
           username: vehicle
           password: Chelvc@vehicle!2023#
           hikari:
@@ -55,9 +55,9 @@ security:
         refresh-token-timeout: 7776000
 
 upload:
-  directory: /home/chelvc/static
+  bucket: /home/chelvc/static
   domain: https://test.chelvc.com/file
-  channel: DEFAULT
+  channel: LOCAL
 
 location:
   clients:

src/main/resources/application-test.yml

@@ -5,9 +5,9 @@ spring:
         server-addr: 127.0.0.1:6848
   datasource:
     dynamic:
-      primary: com.chelvc.cloud.uc.server
+      primary: com.chelvc.cloud.user.server
       datasource:
-        "[com.chelvc.cloud.uc.server]":
+        "[com.chelvc.cloud.user.server]":
           url: jdbc:mysql://127.0.0.1:6180/user?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true&useAffectedRows=true
           username: user
           password: Chelvc@user!2023#
@@ -55,9 +55,9 @@ security:
         refresh-token-timeout: 7776000
 
 upload:
-  directory: /home/chelvc/static
+  bucket: /home/chelvc/static
   domain: https://test.chelvc.com/file
-  channel: DEFAULT
+  channel: LOCAL
 
 location:
   clients: