Merge branch 'dev-lengfaqiang'

# Conflicts:
#	sckw-modules/sckw-message/src/main/resources/bootstrap-dev.yml
#	sckw-modules/sckw-system/src/main/resources/bootstrap-dev.yml

sckw-modules/sckw-example/src/main/resources/bootstrap-dev.yml

@@ -6,10 +6,6 @@ spring:
         server-addr: 10.10.10.230:8848
         # 命名空间
         namespace: sckw-service-platform-dev
-        # nacos用户名
-        username: nacos
-        # nacos密码
-        password: nacos
         # 共享配置
         group: sckw-service-platform
         # 权重 1-100 数值越大权重越大分配的流量就越大，通常结合权重负载均衡策略
@@ -85,8 +81,7 @@ spring:
         client-ip: ${spring.cloud.client.ip-address} # 获取本机IP地址
         port: 8719  #默认8719端口,如果被占用会向上扫描。
         #控制台地址
-#        dashboard: 47.108.162.14:19527
-        dashboard: 127.0.0.1:19527
+        dashboard: 10.10.10.230:19527
       log:
         #日志路径
         dir: logs/sentinel
@@ -101,8 +96,6 @@ spring:
             # 设置Nacos的连接地址、命名空间和Group ID
             namespace:  sckw-service-platform-dev
             server-addr:  ${spring.cloud.nacos.discovery.server-addr}
-#            username: ${spring.cloud.nacos.discovery.username}
-#            password: ${spring.cloud.nacos.discovery.password}
             # 设置Nacos中配置文件的命名规则
 #            data-id:  ${spring.application.name}-sentinel-flow-rules
             data-id:  sckw-example-sentinel-flow-rules
@@ -135,20 +128,16 @@ seata:
     # 指定nacos作为注册中心
     type: nacos
     nacos:
-      server-addr: 127.0.0.1:8848
-#      server-addr: 47.108.162.14:8848
+      server-addr: 10.10.10.230:8848
       namespace: sckw-service-platform-dev
-#      group: SEATA_GROUP
       group: sckw-service-platform
 
   config:
     # 指定nacos作为配置中心
     type: nacos
     nacos:
-      server-addr: 127.0.0.1:8848
-#      server-addr: 47.108.162.14:8848
+      server-addr: 10.10.10.230:8848
       namespace: sckw-service-platform-dev
-#      group: SEATA_GROUP
       group: sckw-service-platform
   application-id: ${spring.application.name}
 # 支持feign对sentinel支持

sckw-modules/sckw-example/src/main/resources/bootstrap.yml

@@ -1,10 +1,10 @@
 server:
-  port: 10301
+  port: 10300
 
 spring:
   application:
     name: sckw-example
   profiles:
-    active: ${DEPLOY_MODE:local}
+    active: ${DEPLOY_MODE:dev}
   main:
     allow-bean-definition-overriding: true

sckw-modules/sckw-file/src/main/resources/bootstrap-dev.yml

@@ -12,10 +12,6 @@ spring:
         server-addr: 10.10.10.230:8848
         # 命名空间
         namespace: sckw-service-platform-dev
-        # nacos用户名
-#        username: nacos
-        # nacos密码
-#        password: nacos
         # 共享配置
         group: sckw-service-platform
         # 权重 1-100 数值越大权重越大分配的流量就越大，通常结合权重负载均衡策略
@@ -67,15 +63,13 @@ spring:
         web-context-unify: false
         #持久化nacos配置中
       datasource:
-        #sentinel-rule: # 唯一名称可自定义
+        #sentinel-rule: 唯一名称可自定义
         #限流
         flow:
           nacos:
             # 设置Nacos的连接地址、命名空间和Group ID
             namespace:  sckw-service-platform-dev
             server-addr:  ${spring.cloud.nacos.discovery.server-addr}
-            # username: ${spring.cloud.nacos.discovery.username}
-            # password: ${spring.cloud.nacos.discovery.password}
             # 设置Nacos中配置文件的命名规则
             #            data-id:  ${spring.application.name}-sentinel-flow-rules
             data-id:  sckw-file-sentinel-flow-rules
@@ -101,11 +95,11 @@ spring:
 seata:
   # seata 服务分组，要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
   # 事务分组名称，要和服务端对应
-  tx-service-group: file-seata-group
+  tx-service-group: file-seata-service-group
   service:
     vgroup-mapping:
       # key是事务分组名称 value要和服务端的机房名称保持一致
-      file-seata-group: default
+      file-seata-service-group: default
   registry:
     # 指定nacos作为注册中心
     type: nacos
@@ -119,7 +113,6 @@ seata:
     type: nacos
     nacos:
       server-addr: ${spring.cloud.nacos.discovery.server-addr}
-      #server-addr: 47.108.162.14:8848
       namespace: ${spring.cloud.nacos.discovery.namespace}
       group: ${spring.cloud.nacos.discovery.group}
   application-id: ${spring.application.name}

sckw-modules/sckw-message/src/main/resources/bootstrap-dev.yml

@@ -17,7 +17,137 @@ spring:
         namespace: sckw-service-platform-dev
         # 共享配置
         group: sckw-service-platform
+    function:
+      definition: sckwSms;sckwMessage
+    stream:
+      binders:
+        defaultRabbit:
+          type: rabbit
+          environment:
+            spring:
+              rabbitmq:
+                virtual-host: /
+                host: 39.104.134.114
+                port: 5672
+                username: wph
+                password: Yy123...
+      bindings:
+        sckwSms-in-0:
+          destination: sckw-sms
+          content-type: application/json
+          binder: defaultRabbit
+          group: sckw
+        sckwSms-out-0:
+          destination: sckw-sms
+          content-type: application/json
+          default-binder: defaultRabbit
+          group: sckw
+        sckwMessage-in-0:
+          destination: sckw-message
+          content-type: application/json
+          binder: defaultRabbit
+          group: sckw
+        sckwMessage-out-0:
+          destination: sckw-message
+          content-type: application/json
+          binder: defaultRabbit
+          group: sckw
+    # sentinel降级配置
+    sentinel:
+      transport:
+        client-ip: ${spring.cloud.client.ip-address} # 获取本机IP地址
+        port: 8719  #默认8719端口,如果被占用会向上扫描。
+        #控制台地址
+        dashboard: 10.10.10.230:19527
+      log:
+        #日志路径
+        dir: logs/sentinel
+        # 默认将调用链路收敛，导致链路流控效果无效
+        web-context-unify: false
+        #持久化nacos配置中
+      datasource:
+        #sentinel-rule: 唯一名称可自定义
+        #限流
+        flow:
+          nacos:
+            # 设置Nacos的连接地址、命名空间和Group ID
+            namespace:  sckw-service-platform-dev
+            server-addr:  ${spring.cloud.nacos.discovery.server-addr}
+            # 设置Nacos中配置文件的命名规则
+            #            data-id:  ${spring.application.name}-sentinel-flow-rules
+            data-id:  sckw-file-sentinel-flow-rules
+            group-id: SENTINEL_GROUP
+            data-type: json
+            # 必填的重要字段，指定当前规则类型是"限流"
+            rule-type: flow
+        #熔断
+        degrade:
+          nacos:
+            namespace:  sckw-service-platform-dev
+            server-addr: ${spring.cloud.nacos.discovery.server-addr}
+            #data-id: ${spring.application.name}-sentinel-degrade-rules
+            data-id: sckw-file-sentinel-degrade-rules
+            group-id: SENTINEL_GROUP
+            #熔断
+            rule-type: degrade
+      #取消慢加载
+      eager: true
+  datasource:
+    dynamic:
+      seata: true
+seata:
+  # seata 服务分组，要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
+  # 事务分组名称，要和服务端对应
+  tx-service-group: message-seata-service-group
+  service:
+    vgroup-mapping:
+      # key是事务分组名称 value要和服务端的机房名称保持一致
+      message-seata-service-group: default
+  registry:
+    # 指定nacos作为注册中心
+    type: nacos
+    nacos:
+      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+      namespace: ${spring.cloud.nacos.discovery.namespace}
+      #group: SEATA_GROUP为默认分组
+      group: ${spring.cloud.nacos.discovery.group}
+  config:
+    # 指定nacos作为配置中心
+    type: nacos
+    nacos:
+      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+      #server-addr: 47.108.162.14:8848
+      namespace: ${spring.cloud.nacos.discovery.namespace}
+      group: ${spring.cloud.nacos.discovery.group}
+  application-id: ${spring.application.name}
+  # 支持feign对sentinel支持
+  #feign:
+  #  sentinel:
+  #    enabled: true
+  rabbitmq:
+    username: admin
+    password: admin
+    host: 10.10.10.138
+    port: 5672
+    virtual-host: /
+
 
+# dubbo
+dubbo:
+  application:
+    # 此处没有延用spring.application.name是因为当前项目本身也会注册到nacos中，如果dubbo也延用相同的名称，在nacos服务里会看到注册的producer-server服务数为2
+    name: message-dubbo-server
+  protocol:
+    name: dubbo
+    port: -1
+    prefer-serialization: java
+  registry:
+    # 配置dubbo的注册中心为nacos
+    address: nacos://${spring.cloud.nacos.discovery.server-addr}
+    group: ${spring.cloud.nacos.config.group}
+    protocol: nacos
+    #use-as-config-center: false
+    #use-as-metadata-center: false
 
 
 

sckw-modules/sckw-message/src/main/resources/bootstrap-local.yml

@@ -0,0 +1,143 @@
+spring:
+  rabbitmq:
+    username: admin
+    password: admin
+    host: 10.10.10.138
+    port: 5672
+    virtual-host: /
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 127.0.0.1:8848
+        # 命名空间
+        namespace: sckw-service-platform-dev
+        # 共享配置
+        group: sckw-service-platform
+        # 权重 1-100 数值越大权重越大分配的流量就越大，通常结合权重负载均衡策略
+      #        weight: 100
+      config:
+        # 配置中心地址
+        #        server-addr: 47.108.162.14:8848
+        server-addr: 127.0.0.1:8848
+        # 配置文件格式
+        file-extension: yaml
+        # 命名空间
+        namespace: sckw-service-platform-dev
+        # 共享配置
+        group: sckw-service-platform
+        enabled: true
+    stream:
+      bindings:
+        sckwSms-out-0:
+          destination: sckw-sms
+          content-type: application/json
+          default-binder: defaultRabbit
+          group: sckw
+        sckwMessage-out-0:
+          destination: sckw-message
+          content-type: application/json
+          default-binder: defaultRabbit
+          group: sckw
+      binders:
+        defaultRabbit:
+          type: rabbit
+          environment:
+            spring:
+              rabbitmq:
+                virtual-host: /
+                host: 39.104.134.114
+                port: 5672
+                username: wph
+                password: Yy123...
+    # sentinel降级配置
+    sentinel:
+      transport:
+        client-ip: ${spring.cloud.client.ip-address} # 获取本机IP地址
+        port: 8719  #默认8719端口,如果被占用会向上扫描。
+        #控制台地址
+        dashboard: 127.0.0.1:19527
+      log:
+        #日志路径
+        dir: logs/sentinel
+        # 默认将调用链路收敛，导致链路流控效果无效
+        web-context-unify: false
+        #持久化nacos配置中
+      datasource:
+        #        sentinel-rule: # 唯一名称可自定义
+        #限流
+        flow:
+          nacos:
+            # 设置Nacos的连接地址、命名空间和Group ID
+            namespace:  sckw-service-platform-dev
+            server-addr:  ${spring.cloud.nacos.discovery.server-addr}
+            # username: ${spring.cloud.nacos.discovery.username}
+            # password: ${spring.cloud.nacos.discovery.password}
+            # 设置Nacos中配置文件的命名规则
+            #            data-id:  ${spring.application.name}-sentinel-flow-rules
+            data-id:  sckw-message-sentinel-flow-rules
+            group-id: SENTINEL_GROUP
+            data-type: json
+            # 必填的重要字段，指定当前规则类型是"限流"
+            rule-type: flow
+        #熔断
+        degrade:
+          nacos:
+            namespace:  sckw-service-platform-dev
+            server-addr: ${spring.cloud.nacos.discovery.server-addr}
+            #data-id: ${spring.application.name}-sentinel-degrade-rules
+            data-id: sckw-message-sentinel-degrade-rules
+            group-id: SENTINEL_GROUP
+            #熔断
+            rule-type: degrade
+      #取消慢加载
+      eager: true
+  datasource:
+    dynamic:
+      seata: true
+#seata:
+  # seata 服务分组，要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
+  # 事务分组名称，要和服务端对应
+  tx-service-group: message-seata-service-group
+  service:
+    vgroup-mapping:
+      # key是事务分组名称 value要和服务端的机房名称保持一致
+      message-seata-service-group: default
+  registry:
+    # 指定nacos作为注册中心
+    type: nacos
+    nacos:
+      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+      namespace: ${spring.cloud.nacos.discovery.namespace}
+#      group: SEATA_GROUP
+      group: ${spring.cloud.nacos.discovery.group}
+  config:
+    # 指定nacos作为配置中心
+    type: nacos
+    nacos:
+      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+      #server-addr: 47.108.162.14:8848
+      namespace: ${spring.cloud.nacos.discovery.namespace}
+      group: ${spring.cloud.nacos.discovery.group}
+  application-id: ${spring.application.name}
+# 支持feign对sentinel支持
+#feign:
+#  sentinel:
+#    enabled: true
+
+dubbo:
+  application:
+    # 此处没有延用spring.application.name是因为当前项目本身也会注册到nacos中，如果dubbo也延用相同的名称，在nacos服务里会看到注册的producer-server服务数为2
+    name: message-dubbo-server
+  protocol:
+    name: dubbo
+    port: -1
+    prefer-serialization: java
+  registry:
+    # 配置dubbo的注册中心为nacos
+    address: nacos://${spring.cloud.nacos.discovery.server-addr}
+    group: ${spring.cloud.nacos.config.group}
+    protocol: nacos
+    #use-as-config-center: false
+    #use-as-metadata-center: false
+

sckw-modules/sckw-message/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-message
   profiles:
-    active: ${DEPLOY_MODE:local}
+    active: ${DEPLOY_MODE:dev}
   main:
     allow-bean-definition-overriding: true
 # Spring

sckw-modules/sckw-system/src/main/resources/bootstrap-dev.yml

@@ -52,6 +52,77 @@ spring:
       port: 6379
       database: 1
       timeout: 5000
+    # sentinel降级配置
+    sentinel:
+      transport:
+        client-ip: ${spring.cloud.client.ip-address} # 获取本机IP地址
+        port: 8719  #默认8719端口,如果被占用会向上扫描。
+        #控制台地址
+        dashboard: 10.10.10.230:19527
+      log:
+        #日志路径
+        dir: logs/sentinel
+        # 默认将调用链路收敛，导致链路流控效果无效
+        web-context-unify: false
+        #持久化nacos配置中
+      datasource:
+        #sentinel-rule: 唯一名称可自定义
+        #限流
+        flow:
+          nacos:
+            # 设置Nacos的连接地址、命名空间和Group ID
+            namespace:  sckw-service-platform-dev
+            server-addr:  ${spring.cloud.nacos.discovery.server-addr}
+            # 设置Nacos中配置文件的命名规则
+            #            data-id:  ${spring.application.name}-sentinel-flow-rules
+            data-id:  sckw-system-sentinel-flow-rules
+            group-id: SENTINEL_GROUP
+            data-type: json
+            # 必填的重要字段，指定当前规则类型是"限流"
+            rule-type: flow
+        #熔断
+        degrade:
+          nacos:
+            namespace:  sckw-service-platform-dev
+            server-addr: ${spring.cloud.nacos.discovery.server-addr}
+            #data-id: ${spring.application.name}-sentinel-degrade-rules
+            data-id: sckw-system-sentinel-degrade-rules
+            group-id: SENTINEL_GROUP
+            #熔断
+            rule-type: degrade
+      #取消慢加载
+      eager: true
+  datasource:
+    dynamic:
+      seata: true
+seata:
+  # seata 服务分组，要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
+  # 事务分组名称，要和服务端对应
+  tx-service-group: system-seata-service-group
+  service:
+    vgroup-mapping:
+      # key是事务分组名称 value要和服务端的机房名称保持一致
+      system-seata-service-group: default
+  registry:
+    # 指定nacos作为注册中心
+    type: nacos
+    nacos:
+      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+      namespace: ${spring.cloud.nacos.discovery.namespace}
+      #group: SEATA_GROUP为默认分组
+      group: ${spring.cloud.nacos.discovery.group}
+  config:
+    # 指定nacos作为配置中心
+    type: nacos
+    nacos:
+      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+      namespace: ${spring.cloud.nacos.discovery.namespace}
+      group: ${spring.cloud.nacos.discovery.group}
+  application-id: ${spring.application.name}
+# 支持feign对sentinel支持
+#feign:
+#  sentinel:
+#    enabled: true
 
 # dubbo
 dubbo:
@@ -69,29 +140,3 @@ dubbo:
     #use-as-config-center: false
     #use-as-metadata-center: false
 
-  datasource:
-    dynamic:
-      primary: master #设置默认的数据源或者数据源组,默认值即为master
-      strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
-      datasource:
-        master:
-          url: jdbc:mysql://47.108.162.14:3306/sckw_system?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: root
-          password: Yy123...
-          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
-        slave_1:
-          url: jdbc:mysql://47.108.162.14:3306/wph_system?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          username: root
-          password: Yy123...
-          driver-class-name: com.mysql.jdbc.Driver
-
-
-mybatis-plus:
-  mapper-locations: classpath*:/mapper/*.xml    #扫描xml文件
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.sckw.*.model
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-links: /auth/login,/kwsUser/resetPassword,/kwsUser/updatePassword,/kwsUser/forgetPassword
-

sckw-modules/sckw-system/src/main/resources/bootstrap-local.yml

@@ -0,0 +1,145 @@
+spring:
+  rabbitmq:
+    username: admin
+    password: admin
+    host: 10.10.10.138
+    port: 5672
+    virtual-host: /
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        #        server-addr: 47.108.162.14:8848
+        server-addr: 127.0.0.1:8848
+        # 命名空间
+        namespace: sckw-service-platform-dev
+        # 共享配置
+        group: sckw-service-platform
+        # 权重 1-100 数值越大权重越大分配的流量就越大，通常结合权重负载均衡策略
+      #        weight: 100
+      config:
+        # 配置中心地址
+        #        server-addr: 47.108.162.14:8848
+        server-addr: 127.0.0.1:8848
+        # 配置文件格式
+        file-extension: yaml
+        # 命名空间
+        namespace: sckw-service-platform-dev
+        # 共享配置
+        group: sckw-service-platform
+        enabled: true
+    stream:
+      bindings:
+        sckwSms-out-0:
+          destination: sckw-sms
+          content-type: application/json
+          default-binder: defaultRabbit
+          group: sckw
+        sckwMessage-out-0:
+          destination: sckw-message
+          content-type: application/json
+          default-binder: defaultRabbit
+          group: sckw
+      binders:
+        defaultRabbit:
+          type: rabbit
+          environment:
+            spring:
+              rabbitmq:
+                virtual-host: /
+                host: 39.104.134.114
+                port: 5672
+                username: wph
+                password: Yy123...
+    # sentinel降级配置
+    sentinel:
+      transport:
+        client-ip: ${spring.cloud.client.ip-address} # 获取本机IP地址
+        port: 8719  #默认8719端口,如果被占用会向上扫描。
+        #控制台地址
+        dashboard: 127.0.0.1:19527
+      log:
+        #日志路径
+        dir: logs/sentinel
+        # 默认将调用链路收敛，导致链路流控效果无效
+        web-context-unify: false
+        #持久化nacos配置中
+      datasource:
+        #sentinel-rule: # 唯一名称可自定义
+        #限流
+        flow:
+          nacos:
+            # 设置Nacos的连接地址、命名空间和Group ID
+            namespace:  sckw-service-platform-dev
+            server-addr:  ${spring.cloud.nacos.discovery.server-addr}
+            # username: ${spring.cloud.nacos.discovery.username}
+            # password: ${spring.cloud.nacos.discovery.password}
+            # 设置Nacos中配置文件的命名规则
+            #            data-id:  ${spring.application.name}-sentinel-flow-rules
+            data-id:  sckw-system-sentinel-flow-rules
+            group-id: SENTINEL_GROUP
+            data-type: json
+            # 必填的重要字段，指定当前规则类型是"限流"
+            rule-type: flow
+        #熔断
+        degrade:
+          nacos:
+            namespace:  sckw-service-platform-dev
+            server-addr: ${spring.cloud.nacos.discovery.server-addr}
+            #data-id: ${spring.application.name}-sentinel-degrade-rules
+            data-id: sckw-system-sentinel-degrade-rules
+            group-id: SENTINEL_GROUP
+            #熔断
+            rule-type: degrade
+      #取消慢加载
+      eager: true
+  datasource:
+    dynamic:
+      seata: true
+seata:
+  # seata 服务分组，要与服务端nacos-config.txt中service.vgroup_mapping的后缀对应
+  # 事务分组名称，要和服务端对应
+  tx-service-group: system-seata-service-group
+  service:
+    vgroup-mapping:
+      # key是事务分组名称 value要和服务端的机房名称保持一致
+      system-seata-service-group: default
+  registry:
+    # 指定nacos作为注册中心
+    type: nacos
+    nacos:
+      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+      #server-addr: 47.108.162.14:8848
+      namespace: ${spring.cloud.nacos.discovery.namespace}
+      #      group: SEATA_GROUP
+      group: ${spring.cloud.nacos.discovery.group}
+  config:
+    # 指定nacos作为配置中心
+    type: nacos
+    nacos:
+      server-addr: ${spring.cloud.nacos.discovery.server-addr}
+      #server-addr: 47.108.162.14:8848
+      namespace: ${spring.cloud.nacos.discovery.namespace}
+      group: ${spring.cloud.nacos.discovery.group}
+  application-id: ${spring.application.name}
+#  application-id: sckw-seata-file
+# 支持feign对sentinel支持
+#feign:
+#  sentinel:
+#    enabled: true
+
+dubbo:
+  application:
+    # 此处没有延用spring.application.name是因为当前项目本身也会注册到nacos中，如果dubbo也延用相同的名称，在nacos服务里会看到注册的producer-server服务数为2
+    name: system-dubbo-server
+  protocol:
+    name: dubbo
+    port: -1
+    prefer-serialization: java
+  registry:
+    # 配置dubbo的注册中心为nacos
+    address: nacos://${spring.cloud.nacos.discovery.server-addr}
+    group: ${spring.cloud.nacos.config.group}
+    protocol: nacos
+    #use-as-config-center: false
+    #use-as-metadata-center: false

sckw-modules/sckw-system/src/main/resources/bootstrap.yml

@@ -5,6 +5,6 @@ spring:
   application:
     name: sckw-system
   profiles:
-    active: ${DEPLOY_MODE:local}
+    active: ${DEPLOY_MODE:dev}
   main:
     allow-bean-definition-overriding: true