dengsixing hace 3 años
padre
commit
d909eaff18

+ 76 - 0
4dkankan-center-scene/src/main/resources/bootstrap-dev-eur.yml

@@ -0,0 +1,76 @@
+spring:
+  application:
+    name: 4dkankan-center-scene
+  cloud:
+    nacos:
+      config:
+        server-addr: 192.168.0.47:8848
+        file-extension: yaml
+        namespace: 4dkankan-dev
+        extension-configs:
+          - data-id: 4dkankan-center-scene.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+        shared-configs:
+          - data-id: common-db-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-redis-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-rabbitmq-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: other-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-upload-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+      discovery:
+        server-addr: 192.168.0.47:8848
+        namespace: 4dkankan-dev
+    sentinel:
+      transport:
+        dashboard: 192.168.0.47:8888
+        heartbeat-interval-ms: 500
+        port: 8719
+      eager: true #取消sentinel控制台懒加载
+      #sentinel配置持久化nacos
+      datasource:
+        #流控规则
+        flow:
+          nacos:
+            server-addr: ${spring.cloud.nacos.config.server-addr}
+            dataId: ${spring.application.name}-flow-rules
+            groupId: SENTINEL_GROUP
+            namespace: 4dkankan-dev
+            rule-type: flow
+        #熔断规则
+        degrade:
+          nacos:
+            server-addr: ${spring.cloud.nacos.config.server-addr}
+            dataId: ${spring.application.name}-degrade-rules
+            groupId: SENTINEL_GROUP
+            namespace: 4dkankan-dev
+            rule-type: degrade
+#      log:
+#        dir: ./logs # 默认值${home}/logs/csp/
+#        switch-pid: true # 日志带上线程id
+
+#开启feign熔断降级,如果没有开启,feign调用链路不会显示再sentinel控制中
+#feign:
+#  sentinel:
+#    enabled: true
+
+feign:
+  httpclient:
+    connection-timeout: 200000
+
+
+
+

+ 0 - 19
4dkankan-center-scene/src/main/resources/bootstrap-dev.yml

@@ -1,20 +1,6 @@
 spring:
-#  jackson:
-#    serialization:
-#      #关闭jackson转换 实体属性空值校验
-#      FAIL_ON_EMPTY_BEANS: false
-#    date-format: yyyy-MM-dd HH:mm:ss
-#    time-zone: GMT+8
   application:
     name: 4dkankan-center-scene
-#  servlet:
-#    multipart:
-#      # 设置单个文件大小
-#      max-file-size: 50MB
-#      # 设置单次请求文件的总大小
-#      max-request-size: 50MB
-#  mvc:
-#    throw-exception-if-no-handler-found: true
   cloud:
     nacos:
       config:
@@ -34,10 +20,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-#          - data-id: common-mq-config.yaml
-#            group: DEFAULT_GROUP
-#            refresh: true
-
           - data-id: common-rabbitmq-config.yaml
             group: DEFAULT_GROUP
             refresh: true
@@ -55,7 +37,6 @@ spring:
     sentinel:
       transport:
         dashboard: 192.168.0.47:8888
-#        dashboard: localhost:8888
         heartbeat-interval-ms: 500
         port: 8719
       eager: true #取消sentinel控制台懒加载

+ 77 - 0
4dkankan-center-scene/src/main/resources/bootstrap-pro-eur.yml

@@ -0,0 +1,77 @@
+spring:
+  application:
+    name: 4dkankan-center-scene
+  cloud:
+    nacos:
+      config:
+        server-addr: 192.168.0.47:8848
+        file-extension: yaml
+        namespace: 4dkankan-dev
+        extension-configs:
+          - data-id: 4dkankan-center-scene.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+        shared-configs:
+          - data-id: common-db-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-redis-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-rabbitmq-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: other-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-upload-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+      discovery:
+        server-addr: 192.168.0.47:8848
+        namespace: 4dkankan-dev
+    sentinel:
+      transport:
+        dashboard: 192.168.0.47:8888
+#        dashboard: localhost:8888
+        heartbeat-interval-ms: 500
+        port: 8719
+      eager: true #取消sentinel控制台懒加载
+      #sentinel配置持久化nacos
+      datasource:
+        #流控规则
+        flow:
+          nacos:
+            server-addr: ${spring.cloud.nacos.config.server-addr}
+            dataId: ${spring.application.name}-flow-rules
+            groupId: SENTINEL_GROUP
+            namespace: 4dkankan-pro
+            rule-type: flow
+        #熔断规则
+        degrade:
+          nacos:
+            server-addr: ${spring.cloud.nacos.config.server-addr}
+            dataId: ${spring.application.name}-degrade-rules
+            groupId: SENTINEL_GROUP
+            namespace: 4dkankan-pro
+            rule-type: degrade
+#      log:
+#        dir: ./logs # 默认值${home}/logs/csp/
+#        switch-pid: true # 日志带上线程id
+
+#开启feign熔断降级,如果没有开启,feign调用链路不会显示再sentinel控制中
+#feign:
+#  sentinel:
+#    enabled: true
+
+feign:
+  httpclient:
+    connection-timeout: 200000
+
+
+
+

+ 3 - 25
4dkankan-center-scene/src/main/resources/bootstrap-pro.yml

@@ -1,24 +1,10 @@
 spring:
-#  jackson:
-#    serialization:
-#      #关闭jackson转换 实体属性空值校验
-#      FAIL_ON_EMPTY_BEANS: false
-#    date-format: yyyy-MM-dd HH:mm:ss
-#    time-zone: GMT+8
   application:
     name: 4dkankan-center-scene
-#  servlet:
-#    multipart:
-#      # 设置单个文件大小
-#      max-file-size: 50MB
-#      # 设置单次请求文件的总大小
-#      max-request-size: 50MB
-#  mvc:
-#    throw-exception-if-no-handler-found: true
   cloud:
     nacos:
       config:
-        server-addr: 192.168.0.47:8848
+        server-addr: 8.129.209.131:8848
         file-extension: yaml
         namespace: 4dkankan-pro
         extension-configs:
@@ -34,10 +20,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-#          - data-id: common-mq-config.yaml
-#            group: DEFAULT_GROUP
-#            refresh: true
-
           - data-id: common-rabbitmq-config.yaml
             group: DEFAULT_GROUP
             refresh: true
@@ -50,12 +32,11 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
       discovery:
-        server-addr: 192.168.0.47:8848
+        server-addr: 8.129.209.131:8848
         namespace: 4dkankan-pro
     sentinel:
       transport:
-        dashboard: 192.168.0.47:8888
-#        dashboard: localhost:8888
+        dashboard: 8.129.209.131:8888
         heartbeat-interval-ms: 500
         port: 8719
       eager: true #取消sentinel控制台懒加载
@@ -90,9 +71,6 @@ feign:
   httpclient:
     connection-timeout: 200000
 
-tlog:
-  enable-invoke-time-print: true
-
 
 
 

+ 88 - 0
4dkankan-center-scene/src/main/resources/bootstrap-test-eur.yml

@@ -0,0 +1,88 @@
+spring:
+  application:
+    name: 4dkankan-center-scene
+  cloud:
+    nacos:
+      config:
+        server-addr: 120.24.144.164:8848
+        file-extension: yaml
+        namespace: 4dkankan-test
+        extension-configs:
+          - data-id: 4dkankan-center-scene.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+        shared-configs:
+          - data-id: common-db-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-redis-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-rabbitmq-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: other-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-upload-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+      discovery:
+        server-addr: 120.24.144.164:8848
+        namespace: 4dkankan-test
+    sentinel:
+      transport:
+        dashboard: 120.24.144.164:8888
+        heartbeat-interval-ms: 500
+        port: 8719
+      eager: true #取消sentinel控制台懒加载
+      #sentinel配置持久化nacos
+      datasource:
+        #流控规则
+        flow:
+          nacos:
+            server-addr: ${spring.cloud.nacos.config.server-addr}
+            dataId: ${spring.application.name}-flow-rules
+            groupId: SENTINEL_GROUP
+            namespace: 4dkankan-test
+            rule-type: flow
+        #熔断规则
+        degrade:
+          nacos:
+            server-addr: ${spring.cloud.nacos.config.server-addr}
+            dataId: ${spring.application.name}-degrade-rules
+            groupId: SENTINEL_GROUP
+            namespace: 4dkankan-test
+            rule-type: degrade
+#      log:
+#        dir: ./logs # 默认值${home}/logs/csp/
+#        switch-pid: true # 日志带上线程id
+
+#开启feign熔断降级,如果没有开启,feign调用链路不会显示再sentinel控制中
+#feign:
+#  sentinel:
+#    enabled: true
+
+feign:
+  httpclient:
+    connection-timeout: 200000
+
+server:
+  tomcat:
+    threads:
+      min-spare: 100  #最小工作线程数
+      max: 1000       #最大工作线程数,建议配置为cpu核心数的200~250倍
+    accept-count: 1000   #能够接受的最大等待数,默认100。如果等待队列也被放满了,新的请求会被tomcat拒绝(connection refused)
+    max-connections: 2000   #同一时间,tomcat能够接受的最大连接数。一般这个值要大于(max-threads)+(accept-count)
+    connection-timeout: 3000  #连接建立超时时间
+
+
+
+
+
+
+

+ 0 - 20
4dkankan-center-scene/src/main/resources/bootstrap-test.yml

@@ -1,21 +1,6 @@
-
 spring:
-#  jackson:
-#    serialization:
-#      #关闭jackson转换 实体属性空值校验
-#      FAIL_ON_EMPTY_BEANS: false
-#    date-format: yyyy-MM-dd HH:mm:ss
-#    time-zone: GMT+8
   application:
     name: 4dkankan-center-scene
-#  servlet:
-#    multipart:
-#      # 设置单个文件大小
-#      max-file-size: 50MB
-#      # 设置单次请求文件的总大小
-#      max-request-size: 50MB
-#  mvc:
-#    throw-exception-if-no-handler-found: true
   cloud:
     nacos:
       config:
@@ -35,10 +20,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-#          - data-id: common-mq-config.yaml
-#            group: DEFAULT_GROUP
-#            refresh: true
-
           - data-id: common-rabbitmq-config.yaml
             group: DEFAULT_GROUP
             refresh: true
@@ -56,7 +37,6 @@ spring:
     sentinel:
       transport:
         dashboard: 120.24.144.164:8888
-#        dashboard: localhost:8888
         heartbeat-interval-ms: 500
         port: 8719
       eager: true #取消sentinel控制台懒加载