Parcourir la source

调整各服务的配置, 其中 user-service 的配置放到 nacos 中, 启动时动态加载

reghao il y a 1 semaine
Parent
commit
59c86984b6

+ 1 - 1
account/account-service/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ spring:
       discovery:
         server-addr: 127.0.0.1:8848
         username: nacos
-        password: E4B2M7W8Dx
+        password: Test_123456
   data:
     redis:
       database: 0

+ 1 - 1
account/account-service/src/main/resources/application-test.yml

@@ -10,7 +10,7 @@ spring:
       discovery:
         server-addr: 192.168.0.209:8848
         username: nacos
-        password: E4B2M7W8Dx
+        password: Test_123456
   data:
     redis:
       database: 0

+ 2 - 8
account/account-service/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 dubbo:
   application:
-    name: account-service
+    name: ${spring.application.name}
     qos-enable: true
     qos-port: 16101
     qos-accept-foreign-ip: false
@@ -65,10 +65,4 @@ spring:
       template_exception_handler: rethrow
       template_update_delay: 0
       datetime_format: yyyy-MM-dd HH:mm
-      number_format: 0.##
-mybatis:
-  configuration:
-    map-underscore-to-camel-case: true
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  mapper-locations: classpath*:mapper/**/**.xml
-  type-aliases-package: cn.reghao.tnb.account.app.model.po
+      number_format: 0.##

+ 1 - 3
content/content-service/src/main/resources/application-dev.yml

@@ -1,6 +1,4 @@
 dubbo:
-  protocol:
-    host: 127.0.0.1
   registry:
     group: dubbo
     address: zookeeper://127.0.0.1:2181
@@ -12,7 +10,7 @@ spring:
       discovery:
         server-addr: 127.0.0.1:8848
         username: nacos
-        password: E4B2M7W8Dx
+        password: Test_123456
   data:
     redis:
       database: 0

+ 1 - 1
content/content-service/src/main/resources/application-test.yml

@@ -10,7 +10,7 @@ spring:
       discovery:
         server-addr: 192.168.0.209:8848
         username: nacos
-        password: E4B2M7W8Dx
+        password: Test_123456
   data:
     redis:
       database: 0

+ 1 - 3
file/file-service/src/main/resources/application-dev.yml

@@ -1,6 +1,4 @@
 dubbo:
-  protocol:
-    host: 127.0.0.1
   registry:
     group: dubbo
     address: zookeeper://127.0.0.1:2181
@@ -12,7 +10,7 @@ spring:
       discovery:
         server-addr: 127.0.0.1:8848
         username: nacos
-        password: E4B2M7W8Dx
+        password: Test_123456
   data:
     redis:
       database: 0

+ 1 - 1
file/file-service/src/main/resources/application-test.yml

@@ -10,7 +10,7 @@ spring:
       discovery:
         server-addr: 192.168.0.209:8848
         username: nacos
-        password: E4B2M7W8Dx
+        password: Test_123456
   data:
     redis:
       database: 0

+ 2 - 5
gateway/src/main/resources/application-dev.yml

@@ -10,12 +10,9 @@ spring:
       enabled: true
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848 # Nacos 服务器地址
-        # 开启鉴权后必须配置以下信息
+        server-addr: 127.0.0.1:8848
         username: nacos
-        password: E4B2M7W8Dx
-        # 如果使用了命名空间,请填写 Namespace ID (注意是 ID 不是名称)
-        # namespace: "your-namespace-id"
+        password: Test_123456
   data:
     redis:
       database: 0

+ 1 - 1
gateway/src/main/resources/application-test.yml

@@ -12,7 +12,7 @@ spring:
       discovery:
         server-addr: 192.168.0.209:8848
         username: nacos
-        password: E4B2M7W8Dx
+        password: Test_123456
   data:
     redis:
       database: 0

+ 1 - 1
message/message-service/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ spring:
       discovery:
         server-addr: 127.0.0.1:8848
         username: nacos
-        password: E4B2M7W8Dx
+        password: Test_123456
   data:
     redis:
       database: 0

+ 1 - 1
message/message-service/src/main/resources/application-test.yml

@@ -10,7 +10,7 @@ spring:
       discovery:
         server-addr: 192.168.0.209:8848
         username: nacos
-        password: E4B2M7W8Dx
+        password: Test_123456
   data:
     redis:
       database: 0

+ 7 - 8
search/search-service/src/main/resources/application-dev.yml

@@ -6,15 +6,14 @@ dubbo:
     qos-accept-foreign-ip: false
   scan:
     base-packages: cn.reghao.tnb.search.app.rpc
-  protocol:
-    name: dubbo
-#    host: 127.0.0.1
-    port: 6107
   registry:
-    group: dubbo
-    address: zookeeper://127.0.0.1:2181
+    address: nacos://127.0.0.1:8848
+    parameters:
+      username: nacos
+      password: Test_123456
+      namespace: 20db7501-df98-4f73-9912-ce8b7bfee84b
 server:
-  port: 6007
+  port: 6006
 spring:
   mvc:
     pathmatch:
@@ -53,7 +52,7 @@ spring:
       discovery:
         server-addr: 127.0.0.1:8848
         username: nacos
-        password: E4B2M7W8Dx
+        password: Test_123456
   data:
     mongodb:
       host: 127.0.0.1

+ 2 - 2
search/search-service/src/main/resources/application-test.yml

@@ -14,7 +14,7 @@ dubbo:
     group: dubbo
     address: zookeeper://192.168.0.209:2181
 server:
-  port: 6007
+  port: 6006
 spring:
   mvc:
     pathmatch:
@@ -53,7 +53,7 @@ spring:
       discovery:
         server-addr: 192.168.0.209:8848
         username: nacos
-        password: E4B2M7W8Dx
+        password: Test_123456
   data:
     mongodb:
       host: 192.168.0.209

+ 6 - 1
user/user-service/pom.xml

@@ -78,6 +78,11 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
@@ -136,7 +141,7 @@
                 <filtering>true</filtering>
                 <includes>
                     <include>application.yml</include>
-                    <include>application-${profile.active}.yml</include>
+<!--                    <include>application-${profile.active}.yml</include>-->
                     <include>mapper/**</include>
                     <include>*.xml</include>
                 </includes>

+ 11 - 47
user/user-service/src/main/resources/application.yml

@@ -1,52 +1,16 @@
-dubbo:
-  application:
-    name: user-service
-    qos-enable: true
-    qos-port: 16104
-    qos-accept-foreign-ip: false
-  scan:
-    base-packages: cn.reghao.tnb.user.app.rpc
-  protocol:
-    name: dubbo
-    port: 6104
-server:
-  port: 6004
-  tomcat:
-    max-http-form-post-size: 4MB
 spring:
-  threads:
-    virtual:
-      enabled: true
   application:
     name: user-service
   profiles:
     active: @profile.active@
-  mvc:
-    pathmatch:
-      matching-strategy: ant_path_matcher
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    type: com.zaxxer.hikari.HikariDataSource
-    hikari:
-      minimum-idle: 5
-      maximum-pool-size: 10
-      auto-commit: true
-      idle-timeout: 30000
-      pool-name: EvaluationHikariCP
-      max-lifetime: 1800000
-      connection-timeout: 30000
-      connection-test-query: SELECT 1
-mybatis:
-  configuration:
-    map-underscore-to-camel-case: true
-  mapper-locations: classpath*:mapper/**/**.xml
-  type-aliases-package: cn.reghao.tnb.user.app.model.po
-management:
-  endpoints:
-    web:
-#      base-path: /api/user/actuator
-      exposure:
-        include: "*"
-  metrics:
-    tags:
-      application: ${spring.application.name}
+  cloud:
+    nacos:
+      config:
+        server-addr: 127.0.0.1
+        group: DEFAULT_GROUP
+        file-extension: yaml
+        username: nacos
+        password: Test_123456
+  config:
+    import:
+      - nacos:${spring.application.name}-${spring.profiles.active}

+ 15 - 21
content/content-service/src/main/resources/bootstrap.yml → user/user-service/src/main/resources/application0.yml

@@ -1,23 +1,29 @@
 dubbo:
   application:
-    name: account-service
+    name: user-service
     qos-enable: true
-    qos-port: 16105
+    qos-port: 16104
     qos-accept-foreign-ip: false
   scan:
-    base-packages: cn.reghao.tnb.content.app.vod.rpc,cn.reghao.tnb.content.app.mall.rpc
+    base-packages: cn.reghao.tnb.user.app.rpc
   protocol:
     name: dubbo
-    port: 6105
+    port: 6104
 server:
-  port: 6005
+  port: 6004
   tomcat:
     max-http-form-post-size: 4MB
 spring:
+  threads:
+    virtual:
+      enabled: true
   application:
-    name: content-service
+    name: user-service
   profiles:
     active: @profile.active@
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.zaxxer.hikari.HikariDataSource
@@ -30,29 +36,17 @@ spring:
       max-lifetime: 1800000
       connection-timeout: 30000
       connection-test-query: SELECT 1
-  cloud:
-    zookeeper:
-      connect-string: 127.0.0.1:2181
-      config:
-        enabled: true
-        root: config
-        default-context: ${spring.application.name}
-        profile-separator: ':'
-        watcher:
-          enabled: true
 mybatis:
   configuration:
     map-underscore-to-camel-case: true
-  mapper-locations: classpath*:mapper/**.xml
-  type-aliases-package: cn.reghao.tnb.content.app.model.po
+  mapper-locations: classpath*:mapper/**/**.xml
+  type-aliases-package: cn.reghao.tnb.user.app.model.po
 management:
   endpoints:
     web:
-      base-path: /api/content/actuator
+#      base-path: /api/user/actuator
       exposure:
         include: "*"
-    health:
-      show-details: always
   metrics:
     tags:
       application: ${spring.application.name}