Ver Fonte

更新服务依赖配置

woody há 1 ano atrás
pai
commit
40316543d3

+ 38 - 3
pom.xml

@@ -16,17 +16,34 @@
     <version>1.0.0-SNAPSHOT</version>
 
     <properties>
+        <admin.version>1.0.0-SNAPSHOT</admin.version>
+        <maintain.version>1.0.0-SNAPSHOT</maintain.version>
         <uc-api.version>1.0.0-SNAPSHOT</uc-api.version>
         <uc-server.version>1.0.0-SNAPSHOT</uc-server.version>
-        <admin.version>1.0.0-SNAPSHOT</admin.version>
+        <vehicle-api.version>1.0.0-SNAPSHOT</vehicle-api.version>
+        <vehicle-server.version>1.0.0-SNAPSHOT</vehicle-server.version>
         <framework-sms.version>1.0.0-RELEASE</framework-sms.version>
         <framework-redis.version>1.0.0-RELEASE</framework-redis.version>
         <framework-wechat.version>1.0.0-RELEASE</framework-wechat.version>
+        <framework-upload.version>1.0.0-RELEASE</framework-upload.version>
         <framework-security.version>1.0.0-RELEASE</framework-security.version>
+        <framework-rocketmq.version>1.0.0-RELEASE</framework-rocketmq.version>
         <framework-database.version>1.0.0-RELEASE</framework-database.version>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.chelvc.cloud</groupId>
+            <artifactId>admin</artifactId>
+            <version>${admin.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.chelvc.cloud</groupId>
+            <artifactId>maintain</artifactId>
+            <version>${maintain.version}</version>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.chelvc.cloud</groupId>
             <artifactId>uc-api</artifactId>
@@ -41,8 +58,14 @@
         </dependency>
         <dependency>
             <groupId>com.chelvc.cloud</groupId>
-            <artifactId>admin</artifactId>
-            <version>${admin.version}</version>
+            <artifactId>vehicle-api</artifactId>
+            <version>${vehicle-api.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.chelvc.cloud</groupId>
+            <artifactId>vehicle-server</artifactId>
+            <version>${vehicle-server.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -63,12 +86,24 @@
             <version>${framework-wechat.version}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>com.chelvc.framework</groupId>
+            <artifactId>framework-upload</artifactId>
+            <version>${framework-upload.version}</version>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.chelvc.framework</groupId>
             <artifactId>framework-security</artifactId>
             <version>${framework-security.version}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>com.chelvc.framework</groupId>
+            <artifactId>framework-rocketmq</artifactId>
+            <version>${framework-rocketmq.version}</version>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.chelvc.framework</groupId>
             <artifactId>framework-database</artifactId>

+ 5 - 1
src/main/java/com/chelvc/cloud/chelvc/Server.java

@@ -1,7 +1,9 @@
 package com.chelvc.cloud.chelvc;
 
 import com.chelvc.cloud.admin.AdminServer;
+import com.chelvc.cloud.maintain.MaintainServer;
 import com.chelvc.cloud.uc.server.UCServer;
+import com.chelvc.cloud.vehicle.server.VehicleServer;
 import com.chelvc.framework.base.config.MultiserverMvcConfigurer;
 import com.chelvc.framework.base.context.BeanFullnameGenerator;
 import com.chelvc.framework.database.interceptor.DynamicDatasourceInterceptor;
@@ -27,7 +29,9 @@ import org.springframework.context.annotation.Import;
         nameGenerator = BeanFullnameGenerator.class,
         excludeFilters = {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {
                 UCServer.class,
-                AdminServer.class
+                AdminServer.class,
+                VehicleServer.class,
+                MaintainServer.class
         })})
 @Import({MultiserverMvcConfigurer.class, MultiserverNacosConfigurer.class, DynamicDatasourceInterceptor.class})
 public class Server {

+ 25 - 8
src/main/resources/application-dev.yml

@@ -2,36 +2,53 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: localhost:8848
+        server-addr: 47.108.128.78:6848
   datasource:
     dynamic:
       primary: com.chelvc.cloud.uc.server
       datasource:
         "[com.chelvc.cloud.uc.server]":
-          url: jdbc:mysql://localhost:3306/uc?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
-          username: root
-          password: 12345678
+          url: jdbc:mysql://47.108.128.78:6180/uc?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+          username: uc
+          password: Chelvc@uc!2023#
+          hikari:
+            driver-class-name: com.mysql.cj.jdbc.Driver
+            pool-name: chelvc
+            max-pool-size: 10
+            max-lifetime: 120000
+        "[com.chelvc.cloud.vehicle.server]":
+          url: jdbc:mysql://47.108.128.78:6180/vehicle?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+          username: vehicle
+          password: Chelvc@vehicle!2023#
           hikari:
             driver-class-name: com.mysql.cj.jdbc.Driver
             pool-name: chelvc
             max-pool-size: 10
             max-lifetime: 120000
   redis:
-    host: localhost
-    port: 6379
+    host: 47.108.128.78
+    port: 7031
+    password: Chelvc@2023
 
 dubbo:
   registry:
-    address: nacos://localhost:8848
+    address: nacos://47.108.128.78:6848
 
 nacos:
   config:
-    server-addr: localhost:8848
+    server-addr: 47.108.128.78:6848
+
+rocketmq:
+  name-server: http://47.108.128.78:9876
 
 platform:
   security:
     token:
       secret: oauth.token.secret@chelvc!@#2023
+  upload:
+    standard:
+      path: /home/chelvc/upload
+      domain: http://file.chelvc.com
   wechat:
     appid: wx593877b3c990b15c
     secret: 19ab92afb193b0f3c25e57ec32a3dd37

+ 24 - 8
src/main/resources/application-pre.yml

@@ -2,37 +2,53 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 172.17.0.3:8848
+        server-addr: 127.0.0.1:6848
   datasource:
     dynamic:
       primary: com.chelvc.cloud.uc.server
       datasource:
         "[com.chelvc.cloud.uc.server]":
-          url: jdbc:mysql://172.17.0.7:3306/uc?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
-          username: root
-          password: Chelvc@2023!@#123
+          url: jdbc:mysql://127.0.0.1:6180/uc?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+          username: uc
+          password: Chelvc@uc!2023#
+          hikari:
+            driver-class-name: com.mysql.cj.jdbc.Driver
+            pool-name: chelvc
+            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
+          username: vehicle
+          password: Chelvc@vehicle!2023#
           hikari:
             driver-class-name: com.mysql.cj.jdbc.Driver
             pool-name: chelvc
             max-pool-size: 10
             max-lifetime: 120000
   redis:
-    host: 172.17.0.2
-    port: 6379
+    host: 127.0.0.1
+    port: 7031
     password: Chelvc@2023
 
 dubbo:
   registry:
-    address: nacos://172.17.0.3:8848
+    address: nacos://127.0.0.1:6848
 
 nacos:
   config:
-    server-addr: 172.17.0.3:8848
+    server-addr: 127.0.0.1:6848
+
+rocketmq:
+  name-server: http://127.0.0.1:9876
 
 platform:
   security:
     token:
       secret: oauth.token.secret@chelvc!@#2023
+  upload:
+    standard:
+      path: /home/chelvc/upload
+      domain: http://file.chelvc.com
   wechat:
     appid: wx593877b3c990b15c
     secret: 19ab92afb193b0f3c25e57ec32a3dd37

+ 24 - 8
src/main/resources/application-prod.yml

@@ -2,37 +2,53 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 172.17.0.3:8848
+        server-addr: 127.0.0.1:6848
   datasource:
     dynamic:
       primary: com.chelvc.cloud.uc.server
       datasource:
         "[com.chelvc.cloud.uc.server]":
-          url: jdbc:mysql://172.17.0.7:3306/uc?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
-          username: root
-          password: Chelvc@2023!@#123
+          url: jdbc:mysql://127.0.0.1:6180/uc?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+          username: uc
+          password: Chelvc@uc!2023#
+          hikari:
+            driver-class-name: com.mysql.cj.jdbc.Driver
+            pool-name: chelvc
+            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
+          username: vehicle
+          password: Chelvc@vehicle!2023#
           hikari:
             driver-class-name: com.mysql.cj.jdbc.Driver
             pool-name: chelvc
             max-pool-size: 10
             max-lifetime: 120000
   redis:
-    host: 172.17.0.2
-    port: 6379
+    host: 127.0.0.1
+    port: 7031
     password: Chelvc@2023
 
 dubbo:
   registry:
-    address: nacos://172.17.0.3:8848
+    address: nacos://127.0.0.1:6848
 
 nacos:
   config:
-    server-addr: 172.17.0.3:8848
+    server-addr: 127.0.0.1:6848
+
+rocketmq:
+  name-server: http://127.0.0.1:9876
 
 platform:
   security:
     token:
       secret: oauth.token.secret@chelvc!@#2023
+  upload:
+    standard:
+      path: /home/chelvc/upload
+      domain: http://file.chelvc.com
   wechat:
     appid: wx593877b3c990b15c
     secret: 19ab92afb193b0f3c25e57ec32a3dd37

+ 24 - 8
src/main/resources/application-test.yml

@@ -2,37 +2,53 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 172.17.0.3:8848
+        server-addr: 127.0.0.1:6848
   datasource:
     dynamic:
       primary: com.chelvc.cloud.uc.server
       datasource:
         "[com.chelvc.cloud.uc.server]":
-          url: jdbc:mysql://172.17.0.7:3306/uc?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
-          username: root
-          password: Chelvc@2023!@#123
+          url: jdbc:mysql://127.0.0.1:6180/uc?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+          username: uc
+          password: Chelvc@uc!2023#
+          hikari:
+            driver-class-name: com.mysql.cj.jdbc.Driver
+            pool-name: chelvc
+            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
+          username: vehicle
+          password: Chelvc@vehicle!2023#
           hikari:
             driver-class-name: com.mysql.cj.jdbc.Driver
             pool-name: chelvc
             max-pool-size: 10
             max-lifetime: 120000
   redis:
-    host: 172.17.0.2
-    port: 6379
+    host: 127.0.0.1
+    port: 7031
     password: Chelvc@2023
 
 dubbo:
   registry:
-    address: nacos://172.17.0.3:8848
+    address: nacos://127.0.0.1:6848
 
 nacos:
   config:
-    server-addr: 172.17.0.3:8848
+    server-addr: 127.0.0.1:6848
+
+rocketmq:
+  name-server: http://127.0.0.1:9876
 
 platform:
   security:
     token:
       secret: oauth.token.secret@chelvc!@#2023
+  upload:
+    standard:
+      path: /home/chelvc/upload
+      domain: http://file.chelvc.com
   wechat:
     appid: wx593877b3c990b15c
     secret: 19ab92afb193b0f3c25e57ec32a3dd37

+ 9 - 4
src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 10008
+  port: 11000
 
 spring:
   main:
@@ -32,10 +32,15 @@ nacos:
   config:
     namespace: ${spring.profiles.active}
 
+rocketmq:
+  producer:
+    group: chelvc_group
+    send-message-timeout: 300000
+
 dubbo:
   protocol:
     name: dubbo
-    port: 20800
+    port: 21000
   application:
     name: ${spring.application.name}
     register-mode: instance
@@ -51,6 +56,6 @@ dubbo:
 platform:
   security:
     resource:
-      login: /uc/login
+      login: /uc/oauth/token
       logout: /uc/logout
-      permit: "/**/login/**"
+      permit: "/**/login/**,/**/index"