Просмотр исходного кода

Simplify: Remove unnecessary placeholders, replace with actual values

DevOps Team 2 месяцев назад
Родитель
Сommit
b3f66e31c6
33 измененных файлов с 180 добавлено и 279 удалено
  1. 5 8
      charts/shop-recycle-account/values.yaml
  2. 5 8
      charts/shop-recycle-agent-pc-web/values.yaml
  3. 5 8
      charts/shop-recycle-async-web/values.yaml
  4. 4 7
      charts/shop-recycle-customer-wechat-web/values.yaml
  5. 4 7
      charts/shop-recycle-data-statistics/values.yaml
  6. 16 19
      charts/shop-recycle-dealdata-service/values.yaml
  7. 4 7
      charts/shop-recycle-dispatcher/values.yaml
  8. 4 7
      charts/shop-recycle-erp-pc-web/values.yaml
  9. 2 5
      charts/shop-recycle-gateway-out-upgrade/values.yaml
  10. 3 6
      charts/shop-recycle-gateway-out/values.yaml
  11. 3 6
      charts/shop-recycle-gateway/values.yaml
  12. 4 7
      charts/shop-recycle-import-web/values.yaml
  13. 4 7
      charts/shop-recycle-login-center/values.yaml
  14. 5 8
      charts/shop-recycle-marketer-pc-web/values.yaml
  15. 5 8
      charts/shop-recycle-merchant-pc-web/values.yaml
  16. 5 8
      charts/shop-recycle-merchant-wechat-web/values.yaml
  17. 5 8
      charts/shop-recycle-merchant/values.yaml
  18. 4 7
      charts/shop-recycle-msg/values.yaml
  19. 19 22
      charts/shop-recycle-order-center/values.yaml
  20. 4 7
      charts/shop-recycle-order-search/values.yaml
  21. 5 8
      charts/shop-recycle-oss-web/values.yaml
  22. 4 7
      charts/shop-recycle-out-web/values.yaml
  23. 5 8
      charts/shop-recycle-payment-web/values.yaml
  24. 5 8
      charts/shop-recycle-payment/values.yaml
  25. 4 7
      charts/shop-recycle-pis/values.yaml
  26. 5 8
      charts/shop-recycle-platform-pc-web/values.yaml
  27. 13 16
      charts/shop-recycle-platform/values.yaml
  28. 5 8
      charts/shop-recycle-sche/values.yaml
  29. 4 7
      charts/shop-recycle-store-pc-web/values.yaml
  30. 4 7
      charts/shop-recycle-store-wechat-web/values.yaml
  31. 6 9
      charts/shop-recycle-store/values.yaml
  32. 4 7
      charts/shop-recycle-wechat-web/values.yaml
  33. 6 9
      charts/shop-recycle-wechat/values.yaml

+ 5 - 8
charts/shop-recycle-account/values.yaml

@@ -42,8 +42,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-account-service
             weight: 1
       redis:
         sentinel:
@@ -62,10 +62,10 @@ config:
         virtualHost: shop-recycle-msg
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-account-service
       provider:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         filter: tracing
       consumer:
         filter: tracing
@@ -86,12 +86,9 @@ config:
         map-underscore-to-camel-case: true
         cache-enabled: false
         jdbc-type-for-null: null
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     seata:
       enabled: true
-      application-id: ${spring.application.name}
+      application-id: shop-recycle-account-service
       tx-service-group: my_test_tx_group
       config:
         type: nacos

+ 5 - 8
charts/shop-recycle-agent-pc-web/values.yaml

@@ -28,8 +28,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-agent-pc-web
             weight: 1
       redis:
         sentinel:
@@ -48,21 +48,18 @@ config:
         virtualHost: shop-recycle-msg
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-agent-pc-web
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 50000
         filter: tracing
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     is-reveal-error: true
     seata:
       enabled: true
-      application-id: ${spring.application.name}
+      application-id: shop-recycle-agent-pc-web
       tx-service-group: my_test_tx_group
       config:
         type: nacos

+ 5 - 8
charts/shop-recycle-async-web/values.yaml

@@ -43,8 +43,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-async-web
             weight: 1
       rabbitmq:
         host: mq.bak.com
@@ -59,20 +59,17 @@ config:
           port: 27017
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-async-web
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 5000
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     is-reveal-error: true
     seata:
       enabled: true
-      application-id: ${spring.application.name}
+      application-id: shop-recycle-async-web
       tx-service-group: my_test_tx_group
       config:
         type: nacos

+ 4 - 7
charts/shop-recycle-customer-wechat-web/values.yaml

@@ -30,8 +30,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-customer-web
             weight: 1
       redis:
         sentinel:
@@ -50,15 +50,12 @@ config:
         virtualHost: shop-recycle-msg
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-customer-web
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 50000
         filter: tracing
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     is-reveal-error: false

+ 4 - 7
charts/shop-recycle-data-statistics/values.yaml

@@ -42,8 +42,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-data-statistics-service
             weight: 1
       rabbitmq:
         host: mq.bak.com
@@ -53,10 +53,10 @@ config:
         virtualHost: shop-recycle-msg
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-data-statistics-service
       provider:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         filter: tracing
       consumer:
         filter: tracing
@@ -75,9 +75,6 @@ config:
         map-underscore-to-camel-case: true
         cache-enabled: false
         jdbc-type-for-null: null
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
 podAnnotations: {}

+ 16 - 19
charts/shop-recycle-dealdata-service/values.yaml

@@ -43,9 +43,9 @@ config:
           datasource:
             seata:
               type: com.zaxxer.hikari.HikariDataSource
-              url: jdbc:mysql://${db-host}/seata?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=CTT&allowMultiQueries=true
-              username: ${db-username}
-              password: ${db-password}
+              url: jdbc:mysql://rm-bp19t90t7u8n5b0fh.mysql.rds.aliyuncs.com:3306/seata?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=CTT&allowMultiQueries=true
+              username: root
+              password: Fxjxtdacf8f_a3d_202600104d6c_41
               driver-class-name: com.mysql.cj.jdbc.Driver
               hikari:
                 connection-timeout: 30000
@@ -53,9 +53,9 @@ config:
                 minimum-idle: 1
             shop_recycle_order:
               type: com.zaxxer.hikari.HikariDataSource
-              url: jdbc:mysql://${db-host}/shop_recycle_order?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=CTT&allowMultiQueries=true
-              username: ${db-username}
-              password: ${db-password}
+              url: jdbc:mysql://rm-bp19t90t7u8n5b0fh.mysql.rds.aliyuncs.com:3306/shop_recycle_order?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=CTT&allowMultiQueries=true
+              username: root
+              password: Fxjxtdacf8f_a3d_202600104d6c_41
               driver-class-name: com.mysql.cj.jdbc.Driver
               hikari:
                 connection-timeout: 30000
@@ -63,9 +63,9 @@ config:
                 minimum-idle: 1
             shop_recycle_account:
               type: com.zaxxer.hikari.HikariDataSource
-              url: jdbc:mysql://${db-host}/shop_recycle_account?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=CTT&allowMultiQueries=true
-              username: ${db-username}
-              password: ${db-password}
+              url: jdbc:mysql://rm-bp19t90t7u8n5b0fh.mysql.rds.aliyuncs.com:3306/shop_recycle_account?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=CTT&allowMultiQueries=true
+              username: root
+              password: Fxjxtdacf8f_a3d_202600104d6c_41
               driver-class-name: com.mysql.cj.jdbc.Driver
               hikari:
                 connection-timeout: 30000
@@ -73,9 +73,9 @@ config:
                 minimum-idle: 1
             shop_recycle_platform:
               type: com.zaxxer.hikari.HikariDataSource
-              url: jdbc:mysql://${db-host}/shop_recycle_platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=CTT&allowMultiQueries=true
-              username: ${db-username}
-              password: ${db-password}
+              url: jdbc:mysql://rm-bp19t90t7u8n5b0fh.mysql.rds.aliyuncs.com:3306/shop_recycle_platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=CTT&allowMultiQueries=true
+              username: root
+              password: Fxjxtdacf8f_a3d_202600104d6c_41
               driver-class-name: com.mysql.cj.jdbc.Driver
               hikari:
                 connection-timeout: 30000
@@ -86,8 +86,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-dealdata-service
             weight: 1
       rabbitmq:
         host: mq.bak.com
@@ -97,10 +97,10 @@ config:
         virtualHost: shop-recycle-msg
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-dealdata-service
       provider:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         filter: tracing
       consumer:
         filter: tracing
@@ -119,9 +119,6 @@ config:
         map-underscore-to-camel-case: true
         cache-enabled: false
         jdbc-type-for-null: null
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     db-host: rm-bp19t90t7u8n5b0fh.mysql.rds.aliyuncs.com:3306
     db-username: root
     db-password: Fxjxtdacf8f_a3d_202600104d6c_41

+ 4 - 7
charts/shop-recycle-dispatcher/values.yaml

@@ -29,7 +29,7 @@ config:
         nacos:
           discovery:
             server-addr: nacos.bak.com:8848
-            service: ${spring.application.name}
+            service: shop-recycle-dispatcher-service
             weight: 1
       datasource:
         type: com.zaxxer.hikari.HikariDataSource
@@ -58,10 +58,10 @@ config:
         virtualHost: shop-recycle-order-image
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-dispatcher-service
       provider:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         filter: tracing
       consumer:
         filter: tracing
@@ -82,12 +82,9 @@ config:
         map-underscore-to-camel-case: true
         cache-enabled: false
         jdbc-type-for-null: null
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     seata:
       enabled: true
-      application-id: ${spring.application.name}
+      application-id: shop-recycle-dispatcher-service
       tx-service-group: my_test_tx_group
       config:
         type: nacos

+ 4 - 7
charts/shop-recycle-erp-pc-web/values.yaml

@@ -30,8 +30,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-erp-pc-web
             weight: 1
       redis:
         sentinel:
@@ -50,15 +50,12 @@ config:
         virtualHost: shop-recycle-msg
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-erp-pc-web
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 50000
         filter: tracing
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     is-reveal-error: false

+ 2 - 5
charts/shop-recycle-gateway-out-upgrade/values.yaml

@@ -28,8 +28,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-gateway-out-upgrade
             weight: 1
         gateway:
           discovery:
@@ -78,9 +78,6 @@ config:
           connection-timeout: 30000
           maximum-pool-size: 10
           minimum-idle: 1
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     isFilter: false
     swagger.enable: false
     mybatis-plus:

+ 3 - 6
charts/shop-recycle-gateway-out/values.yaml

@@ -38,8 +38,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-gateway-out
             weight: 1
         gateway:
           discovery:
@@ -73,7 +73,7 @@ config:
           datasource:
             flow:
               nacos:
-                server-addr: ${nacos.service-address}:${nacos.port}
+                server-addr: nacos.bak.com:8848
                 data-id: gateway-sentinel-flow
                 data-type: json
                 rule-type: flow
@@ -86,9 +86,6 @@ config:
           - redis.jxfx3.com:27000
         password: 3sm_redis
         database: 15
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     isFilter: true

+ 3 - 6
charts/shop-recycle-gateway/values.yaml

@@ -28,8 +28,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-gateway
             weight: 1
         gateway:
           discovery:
@@ -111,7 +111,7 @@ config:
           datasource:
             flow:
               nacos:
-                server-addr: ${nacos.service-address}:${nacos.port}
+                server-addr: nacos.bak.com:8848
                 data-id: gateway-sentinel-flow
                 data-type: json
                 rule-type: flow
@@ -124,9 +124,6 @@ config:
           - redis.jxfx3.com:27000
         password: 3sm_redis
         database: 15
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: false
     isFilter: true

+ 4 - 7
charts/shop-recycle-import-web/values.yaml

@@ -30,8 +30,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-import-web
             weight: 1
       redis:
         sentinel:
@@ -50,14 +50,11 @@ config:
         virtualHost: shop-recycle-msg
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-import-web
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 60000
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     is-reveal-error: false

+ 4 - 7
charts/shop-recycle-login-center/values.yaml

@@ -28,8 +28,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-login-center-web
             weight: 1
       redis:
         sentinel:
@@ -58,15 +58,12 @@ config:
       aibao-app-secret: 0a2434f22922a3c95bebab731f20b27d
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-login-center-web
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 50000
         filter: tracing
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     googleCommandEnable: close

+ 5 - 8
charts/shop-recycle-marketer-pc-web/values.yaml

@@ -30,8 +30,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-marketer-pc-web
             weight: 1
       redis:
         sentinel:
@@ -50,21 +50,18 @@ config:
         virtualHost: shop-recycle-msg
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-marketer-pc-web
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 50000
         filter: tracing
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     is-reveal-error: false
     seata:
       enabled: true
-      application-id: ${spring.application.name}
+      application-id: shop-recycle-marketer-pc-web
       tx-service-group: my_test_tx_group
       config:
         type: nacos

+ 5 - 8
charts/shop-recycle-merchant-pc-web/values.yaml

@@ -34,8 +34,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-merchant-pc-web
             weight: 1
       redis:
         sentinel:
@@ -64,17 +64,14 @@ config:
         virtualHost: shop-recycle-msg
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-merchant-pc-web
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 60000
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     seata:
       enabled: true
-      application-id: ${spring.application.name}
+      application-id: shop-recycle-merchant-pc-web
       tx-service-group: my_test_tx_group
       config:
         type: nacos

+ 5 - 8
charts/shop-recycle-merchant-wechat-web/values.yaml

@@ -30,8 +30,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-merchant-wechat-web
             weight: 1
       redis:
         sentinel:
@@ -60,15 +60,12 @@ config:
           port: 27017
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-merchant-wechat-web
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 50000
         filter: tracing
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     is-reveal-error: false
@@ -81,7 +78,7 @@ config:
       url: https://bizlicense.market.alicloudapi.com/rest/160601/ocr/ocr_business_license.json
     seata:
       enabled: true
-      application-id: ${spring.application.name}
+      application-id: shop-recycle-merchant-wechat-web
       tx-service-group: my_test_tx_group
       config:
         type: nacos

+ 5 - 8
charts/shop-recycle-merchant/values.yaml

@@ -42,8 +42,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-merchant-service
             weight: 1
       redis:
         sentinel:
@@ -62,10 +62,10 @@ config:
         virtualHost: shop-recycle-msg
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-merchant-service
       provider:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         filter: tracing
       consumer:
         filter: tracing
@@ -84,14 +84,11 @@ config:
         map-underscore-to-camel-case: true
         cache-enabled: false
         jdbc-type-for-null: null
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     seata:
       enabled: true
-      application-id: ${spring.application.name}
+      application-id: shop-recycle-merchant-service
       tx-service-group: my_test_tx_group
       config:
         type: nacos

+ 4 - 7
charts/shop-recycle-msg/values.yaml

@@ -42,8 +42,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-msg-service
             weight: 1
       redis:
         sentinel:
@@ -62,10 +62,10 @@ config:
         virtualHost: shop-recycle-msg
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-msg-service
       provider:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         filter: tracing
       consumer:
         filter: tracing
@@ -84,9 +84,6 @@ config:
         map-underscore-to-camel-case: true
         cache-enabled: false
         jdbc-type-for-null: null
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     wechat:

+ 19 - 22
charts/shop-recycle-order-center/values.yaml

@@ -42,8 +42,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-order-service
             weight: 1
       redis:
         sentinel:
@@ -66,10 +66,10 @@ config:
         port: 27017
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-order-service
       provider:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         filter: tracing
       consumer:
         filter: tracing
@@ -90,9 +90,6 @@ config:
         map-underscore-to-camel-case: true
         cache-enabled: false
         jdbc-type-for-null: null
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     seata:
@@ -133,27 +130,27 @@ config:
     cxh:
       host: https://openapi-sandboxzczzcz.sand-wan.zhuanzhuan.com
       hostOpenapi: https://openapi-sandboxzczzcz.sand-wan.zhuanzhuan.com
-      authorizeUrl: ${cxh.hostOpenapi}/authorize
-      refreshTokenUrl: ${cxh.hostOpenapi}/refreshToken
-      pushHighestOfferUrl: ${cxh.host}/open/router/hunter/pushHighestOffer
-      pushReceivingNoticeUrl: ${cxh.host}/open/router/hunter/pushReceivingNotice
+      authorizeUrl: https://openapi-sandboxzczzcz.sand-wan.zhuanzhuan.com/authorize
+      refreshTokenUrl: https://openapi-sandboxzczzcz.sand-wan.zhuanzhuan.com/refreshToken
+      pushHighestOfferUrl: https://openapi-sandboxzczzcz.sand-wan.zhuanzhuan.com/open/router/hunter/pushHighestOffer
+      pushReceivingNoticeUrl: https://openapi-sandboxzczzcz.sand-wan.zhuanzhuan.com/open/router/hunter/pushReceivingNotice
       clientId: 88830527-2bca-4904-8aa0-47d43a630fba
       clientSecret: ba38ccd2-8470-42b0-8e37-7ba5cc2d0078
-      pushBargainPriceUrl: ${cxh.host}/open/router/hunter/pushBargainPrice
+      pushBargainPriceUrl: https://openapi-sandboxzczzcz.sand-wan.zhuanzhuan.com/open/router/hunter/pushBargainPrice
       hostBuy: http://openapi-fxagency.test-wan.zhuanzhuan.com
       hostOpenapiBuy: http://openapi-fxagency.test-wan.zhuanzhuan.com
-      authorizeUrlBuy: ${cxh.hostOpenapiBuy}/authorize
-      refreshTokenUrlBuy: ${cxh.hostOpenapiBuy}/refreshToken
-      saveOrderUrl: ${cxh.hostBuy}/open/router/hunter/applyForSellV2
-      agreeOrRejectUrl: ${cxh.hostBuy}/open/router/hunter/confirmOrCancelOrderV2
-      queryPayStateUrl: ${cxh.hostBuy}/open/router/hunter/queryPayStateByOrderId
+      authorizeUrlBuy: http://openapi-fxagency.test-wan.zhuanzhuan.com/authorize
+      refreshTokenUrlBuy: http://openapi-fxagency.test-wan.zhuanzhuan.com/refreshToken
+      saveOrderUrl: http://openapi-fxagency.test-wan.zhuanzhuan.com/open/router/hunter/applyForSellV2
+      agreeOrRejectUrl: http://openapi-fxagency.test-wan.zhuanzhuan.com/open/router/hunter/confirmOrCancelOrderV2
+      queryPayStateUrl: http://openapi-fxagency.test-wan.zhuanzhuan.com/open/router/hunter/queryPayStateByOrderId
       clientIdBuy: 5a23972c-b357-4e7f-a571-c5ac0f5c49e5
       clientSecretBuy: 20da1539-cb4f-4fab-8754-236c7931493b
       uid: 258448128059820544
       warehouseId: 43898636712455
       returnAddressId: 1684842881086392387
-      saveOrderUrlOld: ${cxh.hostBuy}/open/router/hunter/applyForSell
-      agreeOrRejectUrlOld: ${cxh.hostBuy}/open/router/hunter/confirmOrCancelOrder
+      saveOrderUrlOld: http://openapi-fxagency.test-wan.zhuanzhuan.com/open/router/hunter/applyForSell
+      agreeOrRejectUrlOld: http://openapi-fxagency.test-wan.zhuanzhuan.com/open/router/hunter/confirmOrCancelOrder
       clientIdBuyOld: 0f795a81-9b5a-4a7e-8220-eacd9cdcde0b
       clientSecretBuyOld: d2176329-4faf-4616-9075-0b05695ab69f
       uidOld: 330898749679326080
@@ -161,9 +158,9 @@ config:
       version: old
     lb:
       host: https://ecp.xrxyshop.com
-      pushHighestOfferUrl: ${lb.host}/terminal/recoveryBid.do
-      pushReceivingNoticeUrl: ${lb.host}/terminal/recoveryOfGoodsReceived.do
-      getExpressNoUrl: ${lb.host}/terminal/getLogisticsComparison.do
+      pushHighestOfferUrl: https://ecp.xrxyshop.com/terminal/recoveryBid.do
+      pushReceivingNoticeUrl: https://ecp.xrxyshop.com/terminal/recoveryOfGoodsReceived.do
+      getExpressNoUrl: https://ecp.xrxyshop.com/terminal/getLogisticsComparison.do
       sign: 16cc2d348ee943e9ea563c74612b8686
       sign2: 26cc2d348ee943e9ea563c74612b8686
     lbmap:

+ 4 - 7
charts/shop-recycle-order-search/values.yaml

@@ -32,8 +32,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-order-search
             weight: 1
       datasource:
         type: com.zaxxer.hikari.HikariDataSource
@@ -67,10 +67,10 @@ config:
           port: 27017
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-order-search
       provider:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         filter: tracing
       consumer:
         filter: tracing
@@ -91,9 +91,6 @@ config:
         map-underscore-to-camel-case: true
         cache-enabled: false
         jdbc-type-for-null: null
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     seata:
       enabled: true
       application-id: shop-recycle-store-wechat-web

+ 5 - 8
charts/shop-recycle-oss-web/values.yaml

@@ -30,8 +30,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-oss-web
             weight: 1
       redis:
         sentinel:
@@ -56,7 +56,7 @@ config:
       compressFormat: ?x-oss-process=image/format,webp
       saveFilePath: /home/images
       showFileBasePath: https://image.jxfxtd.com
-      host: localhost:${server.port}
+      host: localhost:1212
       imgUrlPre: https://image.jxfxtd.com
       imageFormat: jpgjpegpnggifwebpbmp
       secretId: 60kIeniT4Ur5BFDzXs0vSsDOWejfP0NX
@@ -68,19 +68,16 @@ config:
       queue: deleteImg
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-oss-web
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 5000
     management:
       metrics:
         web:
           server:
             auto-time-requests: false
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
 podAnnotations: {}

+ 4 - 7
charts/shop-recycle-out-web/values.yaml

@@ -43,8 +43,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-out-web
             weight: 1
       rabbitmq:
         host: mq.bak.com
@@ -54,19 +54,16 @@ config:
         virtualHost: shop-recycle-msg
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-out-web
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 5000
     management:
       metrics:
         web:
           server:
             auto-time-requests: false
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     is-reveal-error: true
     store:
       storeMap:

+ 5 - 8
charts/shop-recycle-payment-web/values.yaml

@@ -59,20 +59,17 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-payment-web
             weight: 1
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-payment-web
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 50000
         filter: tracing
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     mobilepay:
       weixinpay-notify-url: http://gateway.jxfxtd.com/payment/api/pay/notify/wechat
       mobile-success-url: http://m.9000ji.com/success
@@ -129,7 +126,7 @@ config:
     is-reveal-error: false
     seata:
       enabled: true
-      application-id: ${spring.application.name}
+      application-id: shop-recycle-payment-web
       tx-service-group: my_test_tx_group
       config:
         type: nacos

+ 5 - 8
charts/shop-recycle-payment/values.yaml

@@ -57,15 +57,15 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-payment-service
             weight: 1
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-payment-service
       provider:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         filter: tracing
       consumer:
         filter: tracing
@@ -84,12 +84,9 @@ config:
         map-underscore-to-camel-case: true
         cache-enabled: false
         jdbc-type-for-null: null
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     seata:
       enabled: true
-      application-id: ${spring.application.name}
+      application-id: shop-recycle-payment-service
       tx-service-group: my_test_tx_group
       config:
         type: nacos

+ 4 - 7
charts/shop-recycle-pis/values.yaml

@@ -51,15 +51,15 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-pis-service
             weight: 1
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-pis-service
       provider:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         filter: tracing
       consumer:
         filter: tracing
@@ -78,9 +78,6 @@ config:
         map-underscore-to-camel-case: true
         cache-enabled: false
         jdbc-type-for-null: null
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     seata:

+ 5 - 8
charts/shop-recycle-platform-pc-web/values.yaml

@@ -28,8 +28,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-platform-pc-web
             weight: 1
       redis:
         sentinel:
@@ -59,21 +59,18 @@ config:
       wx-authorization-url: https://api.weixin.qq.com/sns/jscode2session?grant_type=authorization_code
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-platform-pc-web
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 50000
         filter: tracing
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     is-reveal-error: true
     seata:
       enabled: true
-      application-id: ${spring.application.name}
+      application-id: shop-recycle-platform-pc-web
       tx-service-group: my_test_tx_group
       config:
         type: nacos

+ 13 - 16
charts/shop-recycle-platform/values.yaml

@@ -42,8 +42,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-platform-service
             weight: 1
       redis:
         sentinel:
@@ -67,17 +67,17 @@ config:
           port: 27017
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-platform-service
       provider:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         filter: tracing
       protocol:
         name: dubbo
         port: 2021
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 5000
         filter: tracing
     mybatis-plus:
@@ -92,9 +92,6 @@ config:
         map-underscore-to-camel-case: true
         cache-enabled: false
         jdbc-type-for-null: null
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     index:
@@ -121,24 +118,24 @@ config:
         host: https://openapi.zhuanzhuan.com
         authorize-url: https://gateway.btstars.cn/platform/pc/chx/data/sync/getDataToken
         refresh-token-url: https://gateway.btstars.cn/platform/pc/chx/data/sync/getDataToken
-        get-brands-by-cate-id: ${cxh.basic-data.host}/open/router/hunter/getBrandsByCateId
-        get-models-by-cate-and-brand-id: ${cxh.basic-data.host}/open/router/hunter/getModelsByCateAndBrandId
-        get-recycle-template: ${cxh.basic-data.host}/open/router/hunter/getRecycleTemplate
+        get-brands-by-cate-id: https://openapi.zhuanzhuan.com/open/router/hunter/getBrandsByCateId
+        get-models-by-cate-and-brand-id: https://openapi.zhuanzhuan.com/open/router/hunter/getModelsByCateAndBrandId
+        get-recycle-template: https://openapi.zhuanzhuan.com/open/router/hunter/getRecycleTemplate
         client-id: a14c02bc-7607-49be-a54b-9206deb5464e
         client-secret: a2c7bb58-886e-41c3-b3ee-aca23e728dcc
       price-c2b:
         host: https://openapi.zhuanzhuan.com
         authorize-url: https://gateway.btstars.cn/platform/pc/chx/data/sync/getC2bPriceToken
-        get-price: ${cxh.price-c2b.host}/open/router/hunter/getC2bPrice
+        get-price: https://openapi.zhuanzhuan.com/open/router/hunter/getC2bPrice
         client-id: ade60dbc-bf74-47c2-bc57-65cf58614bcf
         client-secret: 5fa11321-9f49-4b43-9a15-16097ff702df
       new-price-c2b:
         host: https://open.caihuoxia.com/api
         authorize-url: https://gateway.btstars.cn/platform/pc/chx/data/sync/getC2bPriceTokenNew
-        get-brands-by-cate-id: ${cxh.new-price-c2b.host}/price/v1.0/category/%s/brands
-        get-models-by-cate-and-brand-id: ${cxh.new-price-c2b.host}/price/v1.0/category/%s/brand/%s/models
-        get-recycle-template: ${cxh.new-price-c2b.host}/price/v1.0/category/%s/brand/%s/model/%s/recycle-template
-        get-price: ${cxh.new-price-c2b.host}/price/v1.0/recycle-report-info/estimated-price/search
+        get-brands-by-cate-id: https://open.caihuoxia.com/api/price/v1.0/category/%s/brands
+        get-models-by-cate-and-brand-id: https://open.caihuoxia.com/api/price/v1.0/category/%s/brand/%s/models
+        get-recycle-template: https://open.caihuoxia.com/api/price/v1.0/category/%s/brand/%s/model/%s/recycle-template
+        get-price: https://open.caihuoxia.com/api/price/v1.0/recycle-report-info/estimated-price/search
         client-id: saas_fxv2
         client-secret: 51e74860d871249b6fad93bcd93e40ab27765778
 podAnnotations: {}

+ 5 - 8
charts/shop-recycle-sche/values.yaml

@@ -32,8 +32,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-distributed-job-sche
             weight: 1
       redis:
         sentinel:
@@ -64,10 +64,10 @@ config:
         max-appended-wf-context-length: 4096
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-distributed-job-sche
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 50000
         filter: tracing
     management:
@@ -75,9 +75,6 @@ config:
         web:
           server:
             auto-time-requests: false
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     mobilepay:
@@ -112,7 +109,7 @@ config:
       public-key-path: /data/upload/publicPkcs8.pem
     seata:
       enabled: true
-      application-id: ${spring.application.name}
+      application-id: shop-recycle-distributed-job-sche
       tx-service-group: my_test_tx_group
       config:
         type: nacos

+ 4 - 7
charts/shop-recycle-store-pc-web/values.yaml

@@ -30,8 +30,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-store-pc-web
             weight: 1
       redis:
         sentinel:
@@ -55,15 +55,12 @@ config:
           port: 27017
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-store-pc-web
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 50000
         filter: tracing
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     is-reveal-error: false

+ 4 - 7
charts/shop-recycle-store-wechat-web/values.yaml

@@ -30,8 +30,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-store-wechat-web
             weight: 1
       redis:
         sentinel:
@@ -60,15 +60,12 @@ config:
           port: 27017
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-store-wechat-web
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 50000
         filter: tracing
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
     is-reveal-error: false

+ 6 - 9
charts/shop-recycle-store/values.yaml

@@ -42,8 +42,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-store-service
             weight: 1
       redis:
         sentinel:
@@ -67,10 +67,10 @@ config:
           port: 27017
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-store-service
       provider:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         filter: tracing
       consumer:
         filter: tracing
@@ -91,12 +91,9 @@ config:
         map-underscore-to-camel-case: true
         cache-enabled: false
         jdbc-type-for-null: null
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     seata:
       enabled: true
-      application-id: ${spring.application.name}
+      application-id: shop-recycle-store-service
       tx-service-group: my_test_tx_group
       config:
         type: nacos
@@ -110,7 +107,7 @@ config:
         type: nacos
         nacos:
           application: seata-server
-          server-addr: ${nacos.service-address}:8848
+          server-addr: nacos.bak.com:8848
           namespace: null
           userName: nacos
           password: nacos

+ 4 - 7
charts/shop-recycle-wechat-web/values.yaml

@@ -40,8 +40,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-wechat-web
             weight: 1
       redis:
         sentinel:
@@ -98,17 +98,14 @@ config:
             auto-time-requests: false
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-wechat-web
       consumer:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         timeout: 50000
         filter: tracing
     message:
       autoreply: 感谢关注繁星回收saas系统,繁星的使命是解决二手机回收整个交易闭环,为门店和回收商提供完整的技术解决方案。我们的目标是让合作企业均能实现回收的数据在线、产品在线、员工在线。我们的愿景是让技术驱动行业标准
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     swagger:
       show: true
 podAnnotations: {}

+ 6 - 9
charts/shop-recycle-wechat/values.yaml

@@ -42,8 +42,8 @@ config:
       cloud:
         nacos:
           discovery:
-            server-addr: ${nacos.service-address}:${nacos.port}
-            service: ${spring.application.name}
+            server-addr: nacos.bak.com:8848
+            service: shop-recycle-wechat-service
             weight: 1
       redis:
         sentinel:
@@ -56,10 +56,10 @@ config:
         database: 15
     dubbo:
       application:
-        name: ${spring.application.name}
+        name: shop-recycle-wechat-service
       provider:
         registry:
-          address: nacos://${nacos.service-address}:${nacos.port}
+          address: nacos://nacos.bak.com:8848
         filter: tracing
       consumer:
         filter: tracing
@@ -80,12 +80,9 @@ config:
         map-underscore-to-camel-case: true
         cache-enabled: false
         jdbc-type-for-null: null
-    nacos:
-      service-address: nacos.bak.com
-      port: 8848
     seata:
       enabled: true
-      application-id: ${spring.application.name}
+      application-id: shop-recycle-wechat-service
       tx-service-group: my_test_tx_group
       config:
         type: nacos
@@ -99,7 +96,7 @@ config:
         type: nacos
         nacos:
           application: seata-server
-          server-addr: ${nacos.service-address}:8848
+          server-addr: nacos.bak.com:8848
           namespace: null
           userName: nacos
           password: nacos