更新配置

README.md

@@ -28,8 +28,6 @@
 
 ## 模块
 tnb 项目模块:
-- eureka:6060
-> 不依赖第三方
 - gateway:6000
 > 依赖 redis, rabbitmq
 - account:6001

admin/src/main/resources/application-dev-full.yml

@@ -5,8 +5,6 @@ dubbo:
     register-consumer: false
   registry:
     address: N/A
-server:
-  port: 6010
 spring:
   mvc:
     pathmatch:

admin/src/main/resources/application.yml

@@ -1,3 +1,5 @@
+server:
+  port: 6010
 spring:
   application:
     name: admin-service

auth/auth-service/src/main/resources/application-dev-full.yml

@@ -12,18 +12,6 @@ dubbo:
   registry:
     group: dubbo
     address: zookeeper://127.0.0.1:2181
-server:
-  port: 6001
-  tomcat:
-    max-http-form-post-size: 4MB
-  servlet:
-    session:
-      cookie:
-        secure: true
-        http-only: true
-        # org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getSessionTimeoutInMinutes 获取超时时间
-        # 两个请求间隔的最大时间, 超过此时间则会话过期
-      timeout: 10m
 spring:
   mvc:
     pathmatch:

auth/auth-service/src/main/resources/application-ha-full.yml

@@ -12,18 +12,6 @@ dubbo:
   registry:
     group: dubbo
     address: zookeeper://192.168.0.211:2181?backup=192.168.0.212:2181,192.168.0.213:2181
-server:
-  port: 6001
-  tomcat:
-    max-http-form-post-size: 4MB
-  servlet:
-    session:
-      cookie:
-        secure: true
-        http-only: true
-        # org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getSessionTimeoutInMinutes 获取超时时间
-        # 两个请求间隔的最大时间, 超过此时间则会话过期
-      timeout: 10m
 spring:
   threads:
     virtual:

auth/auth-service/src/main/resources/application-test-full.yml

@@ -12,18 +12,6 @@ dubbo:
   registry:
     group: dubbo
     address: zookeeper://192.168.0.209:2181
-server:
-  port: 6001
-  tomcat:
-    max-http-form-post-size: 4MB
-  servlet:
-    session:
-      cookie:
-        secure: true
-        http-only: true
-        # org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getSessionTimeoutInMinutes 获取超时时间
-        # 两个请求间隔的最大时间, 超过此时间则会话过期
-      timeout: 10m
 spring:
   mvc:
     pathmatch:

auth/auth-service/src/main/resources/application.yml

@@ -1,3 +1,15 @@
+server:
+  port: 6001
+  tomcat:
+    max-http-form-post-size: 4MB
+  servlet:
+    session:
+      cookie:
+        secure: true
+        http-only: true
+        # org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getSessionTimeoutInMinutes 获取超时时间
+        # 两个请求间隔的最大时间, 超过此时间则会话过期
+      timeout: 10m
 spring:
   application:
     name: auth-service

auth/auth-service/src/main/resources/application0.yml

@@ -1,68 +0,0 @@
-dubbo:
-  application:
-    name: ${spring.application.name}
-    qos-enable: true
-    qos-port: 16101
-    qos-accept-foreign-ip: false
-  scan:
-    base-packages: cn.reghao.tnb.auth.app.rpc
-  protocol:
-    name: dubbo
-    port: 6101
-server:
-  port: 6001
-  tomcat:
-    max-http-form-post-size: 4MB
-  servlet:
-    session:
-      cookie:
-        secure: true
-        http-only: true
-        # org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory.getSessionTimeoutInMinutes 获取超时时间
-        # 两个请求间隔的最大时间, 超过此时间则会话过期
-      timeout: 10m
-spring:
-  threads:
-    virtual:
-      enabled: true
-  application:
-    name: auth-service
-  profiles:
-    active: @profile.active@
-  mvc:
-    pathmatch:
-      matching-strategy: ant_path_matcher
-  servlet:
-    multipart:
-      max-request-size: 5MB
-      max-file-size: 5MB
-  session:
-    store-type: redis
-    redis:
-      namespace: tnb:auth:session
-  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
-  freemarker:
-    template-loader-path:
-      - classpath:/templates
-    cache: false
-    check-template-location: true
-    request-context-attribute: request
-    charset: utf-8
-    suffix: .ftl
-    settings:
-      classic_compatible: true #处理空值
-      template_exception_handler: rethrow
-      template_update_delay: 0
-      datetime_format: yyyy-MM-dd HH:mm
-      number_format: 0.##

content/content-service/src/main/resources/application-cluster.yml

@@ -1,20 +0,0 @@
-dubbo:
-  registry:
-    group: dubbo
-    protocol: zookeeper
-    address: 192.168.0.211:2181,192.168.0.212:2181,192.168.0.213:2181
-spring:
-  cloud:
-    discovery:
-      enabled: true
-  data:
-    redis:
-      database: 0
-      host: 192.168.0.211
-      port: 6379
-      password: Test_123456
-  rabbitmq:
-    addresses: 192.168.0.211:5672,192.168.0.212:5672,192.168.0.213:5672
-    virtual-host: /
-    username: test
-    password: Test_123456

content/content-service/src/main/resources/application-dev-full.yml

@@ -12,10 +12,6 @@ dubbo:
   registry:
     group: dubbo
     address: zookeeper://127.0.0.1:2181
-server:
-  port: 6005
-  tomcat:
-    max-http-form-post-size: 4MB
 spring:
   datasource:
     driver-class-name: org.apache.shardingsphere.driver.ShardingSphereDriver

content/content-service/src/main/resources/application0.yml → content/content-service/src/main/resources/application-ha-full.yml

@@ -9,22 +9,22 @@ dubbo:
   protocol:
     name: dubbo
     port: 6105
-server:
-  port: 6005
-  tomcat:
-    max-http-form-post-size: 4MB
+  registry:
+    group: dubbo
+    protocol: zookeeper
+    address: 192.168.0.211:2181,192.168.0.212:2181,192.168.0.213:2181
 spring:
-  threads:
-    virtual:
-      enabled: true
-  application:
-    name: content-service
-  profiles:
-    active: @profile.active@
   datasource:
     driver-class-name: org.apache.shardingsphere.driver.ShardingSphereDriver
     url: jdbc:shardingsphere:classpath:sharding-${spring.profiles.active}.yml
   cloud:
+    discovery:
+      enabled: true
+    nacos:
+      discovery:
+        server-addr: 192.168.0.209:8848
+        username: nacos
+        password: Test_123456
     inetutils:
       ignored-interfaces:
         - docker0
@@ -34,6 +34,17 @@ spring:
     loadbalancer:
       cache:
         enabled: true
+  data:
+    redis:
+      database: 0
+      host: 192.168.0.211
+      port: 6379
+      password: Test_123456
+  rabbitmq:
+    addresses: 192.168.0.211:5672,192.168.0.212:5672,192.168.0.213:5672
+    virtual-host: /
+    username: test
+    password: Test_123456
 mybatis:
   configuration:
     map-underscore-to-camel-case: true

content/content-service/src/main/resources/application-test-full.yml

@@ -12,10 +12,6 @@ dubbo:
   registry:
     group: dubbo
     address: zookeeper://192.168.0.209:2181
-server:
-  port: 6005
-  tomcat:
-    max-http-form-post-size: 4MB
 spring:
   datasource:
     driver-class-name: org.apache.shardingsphere.driver.ShardingSphereDriver

content/content-service/src/main/resources/application.yml

@@ -1,3 +1,7 @@
+server:
+  port: 6005
+  tomcat:
+    max-http-form-post-size: 4MB
 spring:
   application:
     name: content-service

content/content-service/src/main/resources/sharding-dev.yml

@@ -11,14 +11,14 @@ dataSources:
   master3306:
     driverClassName: com.mysql.cj.jdbc.Driver
     dataSourceClassName: com.zaxxer.hikari.HikariDataSource
-    jdbcUrl: jdbc:mysql://localhost:3306/tnb_content_rdb?serverTimezone=GMT%2b8&useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true
+    jdbcUrl: jdbc:mysql://192.168.0.209/tnb_content_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
     username: test
     password: Test_123456
   # 配置从数据库(salve3308可以写自己的名字)
   slave3307:
     driverClassName: com.mysql.cj.jdbc.Driver
     dataSourceClassName: com.zaxxer.hikari.HikariDataSource
-    jdbcUrl: jdbc:mysql://localhost:3306/tnb_content_rdb?serverTimezone=GMT%2b8&useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true
+    jdbcUrl: jdbc:mysql://192.168.0.209/tnb_content_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
     username: test
     password: Test_123456
 # 配置规则

data/data-service/pom.xml

@@ -76,11 +76,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>

data/data-service/src/main/resources/application-dev.yml

@@ -25,8 +25,4 @@ spring:
     port: 5672
     virtual-host: /
     username: test
-    password: Test_123456
-eureka:
-  client:
-    service-url:
-      defaultZone: http://127.0.0.1:6060/eureka/
+    password: Test_123456

data/data-service/src/main/resources/application.yml

@@ -7,10 +7,4 @@ spring:
   application:
     name: data-service
   profiles:
-    active: @profile.active@
-eureka:
-  instance:
-    prefer-ip-address: true
-  client:
-    register-with-eureka: true
-    fetch-registry: true
+    active: @profile.active@

file/file-service/src/main/resources/application-dev-full.yml

@@ -12,10 +12,6 @@ dubbo:
   registry:
     group: dubbo
     address: zookeeper://127.0.0.1:2181
-server:
-  port: 6003
-  tomcat:
-    max-http-form-post-size: 4MB
 spring:
   servlet:
     multipart:

file/file-service/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 127.0.0.1
+        server-addr: 192.168.0.209
         group: DEFAULT_GROUP
         file-extension: yaml
         username: nacos

file/file-service/src/main/resources/application-cluster.yml → file/file-service/src/main/resources/application-ha-full.yml

@@ -15,8 +15,4 @@ spring:
   datasource:
     url: jdbc:mysql://192.168.0.209:3306/tnb_content_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
     username: test
-    password: Test_123456
-eureka:
-  client:
-    service-url:
-      defaultZone: http://192.168.0.210:6060/eureka/
+    password: Test_123456

file/file-service/src/main/resources/application-test-full.yml

@@ -12,10 +12,6 @@ dubbo:
   registry:
     group: dubbo
     address: zookeeper://192.168.0.209:2181
-server:
-  port: 6003
-  tomcat:
-    max-http-form-post-size: 4MB
 spring:
   servlet:
     multipart:

file/file-service/src/main/resources/application.yml

@@ -1,3 +1,7 @@
+server:
+  port: 6003
+  tomcat:
+    max-http-form-post-size: 4MB
 spring:
   application:
     name: file-service

file/file-service/src/main/resources/application0.yml

@@ -1,49 +0,0 @@
-dubbo:
-  application:
-    name: file-service
-    qos-enable: true
-    qos-port: 16103
-    qos-accept-foreign-ip: false
-  scan:
-    base-packages: cn.reghao.tnb.file.app.rpc,cn.reghao.tnb.file.app.zjob.rpc,cn.reghao.tnb.file.app.zorder.rpc,cn.reghao.tnb.file.app.zoss.rpc
-  protocol:
-    name: dubbo
-    port: 6103
-server:
-  port: 6003
-  tomcat:
-    max-http-form-post-size: 4MB
-spring:
-  threads:
-    virtual:
-      enabled: true
-  servlet:
-    multipart:
-      max-request-size: 1GB
-      max-file-size: 1GB
-  application:
-    name: file-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.file.app.model.po
-app:
-  baseDir: /opt/data/tnbfile

gateway/pom.xml

@@ -48,10 +48,6 @@
             <artifactId>guava</artifactId>
             <version>33.0.0-jre</version>
         </dependency>
-        <!--<dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-        </dependency>-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-loadbalancer</artifactId>

gateway/src/main/resources/application-dev-full.yml

@@ -1,5 +1,3 @@
-server:
-  port: 6000
 spring:
   cloud:
     discovery:

gateway/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 127.0.0.1
+        server-addr: 192.168.0.209
         group: DEFAULT_GROUP
         file-extension: yaml
         username: nacos

gateway/src/main/resources/application-ha-full.yml

@@ -1,11 +1,4 @@
-server:
-  port: 6000
 spring:
-  threads:
-    virtual:
-      enabled: true
-  application:
-    name: gateway
   cloud:
     discovery:
       enabled: true

gateway/src/main/resources/application-test-full.yml

@@ -1,5 +1,3 @@
-server:
-  port: 6000
 spring:
   cloud:
     discovery:

gateway/src/main/resources/application.yml

@@ -1,3 +1,5 @@
+server:
+  port: 6000
 spring:
   application:
     name: gateway

gateway/src/main/resources/application0.yml

@@ -1,236 +0,0 @@
-server:
-  port: 6000
-spring:
-  threads:
-    virtual:
-      enabled: true
-  application:
-    name: gateway
-  profiles:
-    active: @profile.active@
-  cloud:
-    loadbalancer:
-      ribbon:
-        enabled: false
-    gateway:
-      # 默认过滤器(对所有 route 均生效)
-      default-filters:
-        # 限流配置
-        - name: MyRequestRateLimiter
-          args:
-            # 如果 keyResolver 返回空 key 则拒绝请求返回 403, 默认 true 表示拒绝, false 表示允许访问
-            deny-empty-key: false
-            # 自定义的 KeyResolver(从请求 exchange 解析 id 来区分独立的限流单元, id 可以是 userId, remoteAddr, sessionId 等)
-            key-resolver: "#{@keyResolver}"
-#            rate-limiter: "#{@myRateLimiter}"
-#            my-rate-limiter.requestedTokens: 1
-            rate-limiter: "#{@redisRateLimiter}"
-            # 令牌桶算法每秒补充的 token 数量(每秒的请求数量)
-            redis-rate-limiter.replenishRate: 100
-            # 令牌桶算法的 token 最大数量(每秒的最大请求数量)
-            redis-rate-limiter.burstCapacity: 150
-            # 单次请求消费的 token 数量
-            redis-rate-limiter.requestedTokens: 1
-      routes:
-        - id: account-router
-          # spring-cloud-starter-zookeeper-discovery 提供服务发现功能
-          uri: lb://auth-service
-          predicates:
-            - Path=/api/account/**
-          filters:
-            - StripPrefix=0
-        - id: static-router
-          uri: lb://auth-service
-          predicates:
-            - Path=/dist/images/**
-          filters:
-            - StripPrefix=0
-        - id: auth-router
-          uri: lb://auth-service
-          predicates:
-            - Path=/api/auth/**
-          filters:
-            - StripPrefix=0
-        - id: oauth-router
-          uri: lb://auth-service
-          predicates:
-            - Path=/oauth/**
-          filters:
-            - StripPrefix=0
-        - id: account-admin-router
-          uri: lb://auth-service
-          predicates:
-            - Path=/api/admin/account/**
-          filters:
-            - StripPrefix=0
-        - id: account-open-router
-          uri: lb://auth-service
-          predicates:
-            - Path=/api/open/account/**
-          filters:
-            - StripPrefix=0
-        ###############################################################################
-        - id: user-router
-          uri: lb://user-service
-          predicates:
-            - Path=/api/user/**
-          filters:
-            - StripPrefix=0
-        - id: user-admin-router
-          uri: lb://user-service
-          predicates:
-            - Path=/api/admin/user/**
-          filters:
-            - StripPrefix=0
-        ###############################################################################
-        - id: content-router
-          uri: lb://content-service
-          predicates:
-            - Path=/api/content/**
-          filters:
-            - StripPrefix=0
-        - id: content-admin-router
-          uri: lb://content-service
-          predicates:
-            - Path=/api/admin/content/**
-          filters:
-            - StripPrefix=0
-        - id: content-open-router
-          uri: lb://content-service
-          predicates:
-            - Path=/api/open/content/**
-          filters:
-            - StripPrefix=0
-        - id: timeline-router
-          uri: lb://content-service
-          predicates:
-            - Path=/api/timeline/**
-          filters:
-            - StripPrefix=0
-        - id: search-router
-          uri: lb://content-service
-          predicates:
-            - Path=/api/search/**
-          filters:
-            - StripPrefix=0
-        - id: mall-router
-          uri: lb://content-service
-          predicates:
-            - Path=/api/mall/**
-          filters:
-            - StripPrefix=0
-        - id: geo-router
-          uri: lb://content-service
-          predicates:
-            - Path=/api/geo/**
-          filters:
-            - StripPrefix=0
-        ###############################################################################
-        - id: data-router
-          uri: lb://data-service
-          #uri: http://192.168.0.39:6005
-          predicates:
-            - Path=/api/data/**
-          filters:
-            - StripPrefix=0
-        ###############################################################################
-        - id: file-router
-          uri: lb://file-service
-          predicates:
-            - Path=/api/file/**
-          filters:
-            - StripPrefix=0
-        - id: file1-router
-          uri: lb://file-service
-          predicates:
-            - Path=/file/**
-          filters:
-            - StripPrefix=0
-        - id: disk-router
-          uri: lb://file-service
-          predicates:
-            - Path=/api/disk/**
-          filters:
-            - StripPrefix=0
-        - id: file-admin-router
-          uri: lb://file-service
-          predicates:
-            - Path=/api/admin/file/**
-          filters:
-            - StripPrefix=0
-        - id: file-open-router
-          uri: lb://file-service
-          predicates:
-            - Path=/api/open/file/**
-          filters:
-            - StripPrefix=0
-        - id: chat-router
-          uri: lb://file-service
-          predicates:
-            - Path=/api/chat/**
-          filters:
-            - StripPrefix=0
-        ###############################################################################
-        - id: message-websocket
-          uri: lb:ws://message-service
-          predicates:
-            - Path=/ws/**
-        - id: message-router
-          uri: lb://message-service
-          predicates:
-            - Path=/api/message/**
-        - id: message-admin-router
-          uri: lb://message-service
-          predicates:
-            - Path=/api/admin/message/**
-        - id: tnb-admin-router
-          uri: lb://message-service
-          predicates:
-            - Path=/api/admin/tnb/**
-          filters:
-            - StripPrefix=0
-        ###############################################################################
-        - id: log-websocket
-          uri: lb:ws://search-service
-          predicates:
-            - Path=/logws/**
-        - id: search1-router
-          uri: lb://search-service
-          predicates:
-            - Path=/api/search1/**
-        - id: blog-router
-          uri: lb://search-service
-          predicates:
-            - Path=/api/blog/**
-        - id: comment-router
-          uri: lb://search-service
-          predicates:
-            - Path=/api/comment/**
-          filters:
-            - StripPrefix=0
-        - id: admin-router
-          uri: lb://admin-service
-          predicates:
-            - Path=/api/admin1/**
-          filters:
-            - StripPrefix=0
-        ###############################################################################
-        - id: oss-router
-          uri: http://127.0.0.1:8010
-          predicates:
-            - Path=/api/oss/**
-          filters:
-            - StripPrefix=0
-#    gateway:
-#      globalcors:
-#        cors-configurations:
-#          '[/**]':
-#            allowedOrigins: "*"
-#            allowedMethods: "*"
-#            allowedHeaders: "*"
-app:
-  resources:
-    _api_admin_: tnb_admin
-    _api_oss_: tnb_admin
-    _api_blog_bg_: tnb_admin
-    _api_disk_: tnb_disk

message/message-service/src/main/resources/application-dev-full.yml

@@ -12,8 +12,6 @@ dubbo:
   registry:
     group: dubbo
     address: zookeeper://127.0.0.1:2181
-server:
-  port: 6002
 spring:
   mvc:
     pathmatch:

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

@@ -5,7 +5,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 127.0.0.1
+        server-addr: 192.168.0.209
         group: DEFAULT_GROUP
         file-extension: yaml
         username: nacos

message/message-service/src/main/resources/application-cluster.yml → message/message-service/src/main/resources/application-ha-full.yml

@@ -21,8 +21,4 @@ spring:
   datasource:
     url: jdbc:mysql://192.168.0.209:3306/tnb_account_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
     username: test
-    password: Test_123456
-eureka:
-  client:
-    service-url:
-      defaultZone: http://192.168.0.210:6060/eureka/
+    password: Test_123456

message/message-service/src/main/resources/application-test-full.yml

@@ -12,8 +12,6 @@ dubbo:
   registry:
     group: dubbo
     address: zookeeper://192.168.0.209:2181
-server:
-  port: 6002
 spring:
   mvc:
     pathmatch:

message/message-service/src/main/resources/application.yml

@@ -1,3 +1,5 @@
+server:
+  port: 6002
 spring:
   application:
     name: message-service

message/message-service/src/main/resources/application0.yml

@@ -1,43 +0,0 @@
-dubbo:
-  application:
-    name: message-service
-    qos-enable: true
-    qos-port: 16102
-    qos-accept-foreign-ip: false
-  scan:
-    base-packages: cn.reghao.tnb.message.app.rpc
-  protocol:
-    name: dubbo
-    port: 6102
-server:
-  port: 6002
-spring:
-  threads:
-    virtual:
-      enabled: true
-  application:
-    name: message-service
-  profiles:
-    active: @profile.active@
-  mvc:
-    pathmatch:
-      matching-strategy: ant_path_matcher
-mybatis:
-  configuration:
-    map-underscore-to-camel-case: true
-  mapper-locations: classpath*:mapper/**.xml
-  type-aliases-package: cn.reghao.tnb.message.app.model.po
-hystrix:
-  dashboard:
-    proxy-stream-allow-list: "127.0.0.1"
-turbine:
-  # 指定需要收集信息的服务名(注册到 EurekaServer 中的名字)
-  appConfig: user-service
-  aggregator:
-    cluster-config: default
-  # 指定集群名称
-  # 当服务实例非常多时可以使用多个 Turbine 来构建不同的聚合集群，本参数则用于区分这些不同的集群
-  # 同时本参数可以在 HystrixDashboard 中用来定位不同的聚合集群，只需在 Hystrix Stream 的 URL 中通过 cluster 参数来指定即可
-  cluster-name-expression: new String("default")
-  # 让同一主机上的服务通过主机名和端口号的组合来进行区分，默认以 host 来区分不同的服务
-  combine-host-port: true

search/search-service/src/main/resources/application-dev-full.yml

@@ -13,8 +13,6 @@ dubbo:
   registry:
     group: dubbo
     address: zookeeper://127.0.0.1:2181
-server:
-  port: 6006
 spring:
   mvc:
     pathmatch:

search/search-service/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 127.0.0.1
+        server-addr: 192.168.0.209
         group: DEFAULT_GROUP
         file-extension: yaml
         username: nacos

search/search-service/src/main/resources/application-cluster.yml → search/search-service/src/main/resources/application-ha-full.yml

@@ -15,8 +15,4 @@ spring:
   datasource:
     url: jdbc:mysql://192.168.0.209/tnb_content_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
     username: test
-    password: Test_123456
-eureka:
-  client:
-    service-url:
-      defaultZone: http://192.168.0.210:6060/eureka/
+    password: Test_123456

search/search-service/src/main/resources/application-test-full.yml

@@ -13,8 +13,6 @@ dubbo:
   registry:
     group: dubbo
     address: zookeeper://192.168.0.209:2181
-server:
-  port: 6006
 spring:
   mvc:
     pathmatch:

search/search-service/src/main/resources/application.yml

@@ -1,3 +1,5 @@
+server:
+  port: 6006
 spring:
   application:
     name: search-service

search/search-service/src/main/resources/application0.yml

@@ -1,19 +0,0 @@
-spring:
-  application:
-    name: search-service
-  profiles:
-    active: @profile.active@
-  threads:
-    virtual:
-      enabled: true
-#  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}

user/user-service/src/main/resources/application-dev-full.yml

@@ -12,10 +12,6 @@ dubbo:
   registry:
     group: dubbo
     address: zookeeper://127.0.0.1:2181
-server:
-  port: 6004
-  tomcat:
-    max-http-form-post-size: 4MB
 spring:
   mvc:
     pathmatch:

user/user-service/src/main/resources/application-ha-full.yml

@@ -12,10 +12,6 @@ dubbo:
   registry:
     group: dubbo
     address: zookeeper://192.168.0.211:2181?backup=192.168.0.212:2181,192.168.0.213:2181
-server:
-  port: 6004
-  tomcat:
-    max-http-form-post-size: 4MB
 spring:
   mvc:
     pathmatch:

user/user-service/src/main/resources/application-test-full.yml

@@ -12,10 +12,6 @@ dubbo:
   registry:
     group: dubbo
     address: zookeeper://192.168.0.209:2181
-server:
-  port: 6004
-  tomcat:
-    max-http-form-post-size: 4MB
 spring:
   mvc:
     pathmatch:

user/user-service/src/main/resources/application.yml

@@ -1,3 +1,7 @@
+server:
+  port: 6004
+  tomcat:
+    max-http-form-post-size: 4MB
 spring:
   application:
     name: user-service

user/user-service/src/main/resources/application0.yml

@@ -1,43 +0,0 @@
-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