Merge branch 'dev/20220228_v3.0.1通用版_渠道管理第一期' into debug

config-center/src/main/resources/shared/daqe-center-debug.yml

@@ -3,11 +3,14 @@ spring:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(3G5NNq4jd+XnD/waOrs9rW50Hv9YPX7OisChDzM4xSveyLFYb6sn2cYVdN3XogyU) # Redis服务器连接密码（默认为空）
+    password: lemRatO6351 # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.237:3306/daqe?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: ENC(j00VNE8vjb8dg6WJJpmAapN0DyT/TO3qdiQoloOrDWmJdei2DnWylArt/g2QiwZo)
-      password: ENC(RZz4slfEuQ7z1tjMo1uEyKcIa0wtq9pNEIxFXWbd/LeCXia3r3xF08VvzpEdLnwr)
+      username: root
+      password: lantone
+  flyway:
+    # 启用Flyway功能
+    enabled: false
 
 swagger.show: true

config-center/src/main/resources/shared/daqe-center-inner.yml

@@ -9,5 +9,8 @@ spring:
       url: jdbc:mysql://192.168.2.125:3306/daqe?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: ENC(Az6Fp+AgkR0iiHP2l5HjH8UKmud+5w3bxv096AGiHVWgJxn4KnrgjgK4esoPwmxd)
       password: ENC(iLkrdRLPM/5Y+1gAWdniZx/rDVbJILF7x3M8VuQ20219/p3Mck7hwfe7M8OntVTkDxqwpa4hLm8Q4n0qD5Lsog==)
+  flyway:
+    # 启用Flyway功能
+    enabled: true
 
 swagger.show: false

config-center/src/main/resources/shared/daqe-center-local.yml

@@ -3,11 +3,14 @@ spring:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(LfJiGcjvB77hgiTZHrBzI4ccwrZ9jjrjmk9jLKLKOf8iOEeeTfzHOKyAkQrMIE0c) # Redis服务器连接密码（默认为空）
+    password: lemRatO6351 # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.237:3306/daqe?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: ENC(Y/ndna0Me4aL99A1+VtbuiZmj0+0jxqa7DCP0jOQo+Yc+r+igFT7oayrwj/vw4fy)
-      password: ENC(WD7m3iIAAPiHt8PTCG6Wqng/CY7MX16+hhrygtMFg10k81tiyTdBsRxKazg/dqsw)
+      username: root
+      password: lantone
+  flyway:
+    # 启用Flyway功能
+    enabled: false
 
 swagger.show: true

config-center/src/main/resources/shared/daqe-center-outer.yml

@@ -9,5 +9,8 @@ spring:
       url: jdbc:mysql://192.168.2.129:3306/daqe?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: ENC(W8OCGadBpumA0shuwzaPU6kcjdXhajivb0+wKjZowCid7YVvsxi7s436hcThGn9q)
       password: ENC(K3iC2nMnARmKclU/50vfBLs2oJC/MlfqRgo/qXO+6eOxQnDKdm1hDCHwveo3ZRUGXlA5v219748Dw7EZKn/siA==)
+  flyway:
+    # 启用Flyway功能
+    enabled: true
 
 swagger.show: false

config-center/src/main/resources/shared/daqe-center-test.yml

@@ -3,11 +3,14 @@ spring:
     database: 12
     host: 192.168.2.126 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(2mpOAdlOoqAWPpaZYwK50FVqS12jjdxj7m/SdtbqlNIexoWEb4ReBk3IXKx2MhI2) # Redis服务器连接密码（默认为空）
+    password: Lan@T0Ne@6351 # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.126:3306/daqe?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: ENC(jcBffg13qhhFZr8OQ6uFu7eLvtxNq5uwQqLLO6jyGdSUEFw0IO1Waesrz3DhqVMx)
-      password: ENC(TCiDVOvl/3KAZhVKEA/4+bVwgq2pcLx9VFf7zzDKJVvNpOkWX4Gm1nSw0bPcOycj)
+      username: root
+      password: Lat0ne@tesT
+  flyway:
+    # 启用Flyway功能
+    enabled: false
 
 swagger.show: true

config-center/src/main/resources/shared/gateway-service-debug.yml

@@ -3,6 +3,6 @@ spring:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(+3QNcQazEQDeidXgbssRGSXb5N0vb96HsByTC+zUmjPnzlOuoZgd3BGLS27E3/wG) # Redis服务器连接密码（默认为空）
+    password: lemRatO6351 # Redis服务器连接密码（默认为空）
 
 swagger.show: true

config-center/src/main/resources/shared/gateway-service-local.yml

@@ -3,6 +3,6 @@ spring:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(Ibu5vcLTqqaMwPgTtf/H2jeYwTmidL+Yk0CtNVBsQ3Alh/uVx1NpRrjjXfAFavy1) # Redis服务器连接密码（默认为空）
+    password: lemRatO6351 # Redis服务器连接密码（默认为空）
 
 swagger.show: true

config-center/src/main/resources/shared/gateway-service-test.yml

@@ -3,6 +3,6 @@ spring:
     database: 12
     host: 192.168.2.126 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(YMitYYfJ8WlrvbtKPNdEtyVqP7tPcbfegllqF2mnGtDJiq0pRZRoVpoa78dUfzyU) # Redis服务器连接密码（默认为空）
+    password: Lan@T0Ne@6351 # Redis服务器连接密码（默认为空）
 
 swagger.show: true

config-center/src/main/resources/shared/mdsp-service-debug.yml

@@ -3,7 +3,7 @@ spring:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(Pfc4r7aTbxCpd0XAVZEpsoOTfvKlR+h3lK2RDwFntoeKt7RNo98hT8G2vznKCdg6) # Redis服务器连接密码（默认为空）
+    password: lemRatO6351 # Redis服务器连接密码（默认为空）
   datasource:
     dynamic:
       datasource:

config-center/src/main/resources/shared/mdsp-service-local.yml

@@ -3,7 +3,7 @@ spring:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(j/i26SYVLx6wfhf3GQZHVSXezzyyl41W7wChMG+FIgzZzlk+BYi1yDXe36zwoVLZ) # Redis服务器连接密码（默认为空）
+    password: lemRatO6351 # Redis服务器连接密码（默认为空）
   datasource:
     dynamic:
       datasource:

config-center/src/main/resources/shared/mdsp-service-test.yml

@@ -3,7 +3,7 @@ spring:
     database: 12
     host: 192.168.2.126 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(4ueOtw8DSAJ5BcYg0kVIMwuhRhklV+vFjWFX3iLD9XDSVqw1ysb8w2ari1ch5Ro7) # Redis服务器连接密码（默认为空）
+    password: Lan@T0Ne@6351 # Redis服务器连接密码（默认为空）
   datasource:
     dynamic:
       datasource:

config-center/src/main/resources/shared/message-service-debug.yml

@@ -3,12 +3,12 @@ spring:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(yRoG5bY7HWMt5GedSBemK4+2crMSBLCGYGYvbYpMJvIqEKOzPbAR/BfOWG0RS+w8) # Redis服务器连接密码（默认为空）
+    password: lemRatO6351 # Redis服务器连接密码（默认为空）
   rabbitmq:
     host: 192.168.2.237
     port: 5672
-    username: ENC(9gQ7zU0IG+yknvcwxcWHO6l8TvUxODcoWNF6LnrlMIXcUitDl2MIy2uIUsg53LdA)
-    password: ENC(rW44uZL01M3njrwpyyvk5SnArnsGQZJmeovqjqaSg9RFznlsmu4T4eJZrYqs2yk9)
+    username: emrais
+    password: emrais
     virtual-host: /emrais # 虚拟host
 
 rabbitmq:

config-center/src/main/resources/shared/message-service-local.yml

@@ -3,12 +3,12 @@ spring:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(Uwufo1Fak0Cs5UZgNUpufficR3HUUYGc86SPyUW0CrLn3n2thMuFgzukUx95iBJU) # Redis服务器连接密码（默认为空）
+    password: lemRatO6351 # Redis服务器连接密码（默认为空）
   rabbitmq:
     host: 192.168.2.237
     port: 5672
-    username: ENC(c4T35OSMySYtaMnLIQznBeUKzcMmqi8khmE5RysqzYzIuLwWIg8mjQxhBlRQCZ0M)
-    password: ENC(uvbSuKGBONevV0hJzvoQVLLAMGlGTczbyLMGRcrFCl6+uY00Ds/rLKkgJfpv4qV0)
+    username: emrais
+    password: emrais
     virtual-host: /emrais # 虚拟host
 
 rabbitmq:

config-center/src/main/resources/shared/message-service-test.yml

@@ -3,12 +3,12 @@ spring:
     database: 12
     host: 192.168.2.126 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(ZXXJ4nNpwUD3iyn9rmb9bhQlUeoWDMZ02Fj7fWV2AprPLTR1uT7NwyybBZl3go3Z) # Redis服务器连接密码（默认为空）
+    password: Lan@T0Ne@6351 # Redis服务器连接密码（默认为空）
   rabbitmq:
     host: 192.168.2.126
     port: 5672
-    username: ENC(w8kdx+MILgTw77/jqTfwJv68oXowOfbnC2hiaj7M1IrR8xdsDImmJAFwlG+bcjZS)
-    password: ENC(gYwMH/4WB7fVbB2k7MOTpkgT3pV6yE12XByjmHYgxgd6k91wtOH8XBXjUxC4hPBAAGJTyLXLs3edHuH945t7Yw==)
+    username: admin
+    password: La11t230ne@te0sT
     virtual-host: /emrais # 虚拟host
 
 rabbitmq:

config-center/src/main/resources/shared/report-service-debug.yml

@@ -3,11 +3,14 @@ spring:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(Pfc4r7aTbxCpd0XAVZEpsoOTfvKlR+h3lK2RDwFntoeKt7RNo98hT8G2vznKCdg6) # Redis服务器连接密码（默认为空）
+    password: lemRatO6351 # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.237:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: ENC(iJ6mLZ4QEwAg5NNzgTw317tGlGqz1+UfKqrPKqopWih7bXrgsnknynFfDShkaVYv)
-      password: ENC(IlFDlxVjx+PfV2mYzBulkz5LfkiV54Syvzq/bky7Ij9+G5cZySPe2cFOHqKAdp2n)
+      username: root
+      password: lantone
+  flyway:
+    # 启用Flyway功能
+    enabled: false
 
 swagger.show: true

config-center/src/main/resources/shared/report-service-inner.yml

@@ -9,5 +9,8 @@ spring:
       url: jdbc:mysql://192.168.2.125:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: ENC(YJB0kpEK7yuHA9BxwPYNQVcmlRcRjMqXfyHsr64UplJ0zpGooSdbBsQNd0L/c3lk)
       password: ENC(Lse35eqXdyY9JtY6o+FTzlOdQcQE5gyt4YioxE3i75yamWM5sdF+NTpnGlxIoVtT)
+  flyway:
+    # 启用Flyway功能
+    enabled: true
 
 swagger.show: false

config-center/src/main/resources/shared/report-service-local.yml

@@ -3,11 +3,14 @@ spring:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(j/i26SYVLx6wfhf3GQZHVSXezzyyl41W7wChMG+FIgzZzlk+BYi1yDXe36zwoVLZ) # Redis服务器连接密码（默认为空）
+    password: lemRatO6351 # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.237:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: ENC(gvpQNZ97vaoD8tZkfegBuE7tp/yavyYV7XrkTHNkQJrO2qTILluezSU3e47hKLzx)
-      password: ENC(byBymj6qCH+dViJJ5EM2Aca/k5HazyPMjaswD8aioi67JY+43dVkQH6a5tn7FC99)
+      username: root
+      password: lantone
+  flyway:
+    # 启用Flyway功能
+    enabled: false
 
 swagger.show: true

config-center/src/main/resources/shared/report-service-outer.yml

@@ -9,5 +9,8 @@ spring:
       url: jdbc:mysql://192.168.2.129:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: ENC(rMQ76oaGbiSXvkV11yOmhTGLsZpg7eQAg0DDEBlMlP77A88W2OmAWRM99EDJOKEM)
       password: ENC(tZuUlohI/e4NkaWnB08PaUSmovn+IRfhC70A4oMuJDFJm1FJyzXycl0mBVtNEEpr)
+  flyway:
+    # 启用Flyway功能
+    enabled: true
 
 swagger.show: false

config-center/src/main/resources/shared/report-service-test.yml

@@ -3,11 +3,14 @@ spring:
     database: 12
     host: 192.168.2.126 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(4ueOtw8DSAJ5BcYg0kVIMwuhRhklV+vFjWFX3iLD9XDSVqw1ysb8w2ari1ch5Ro7) # Redis服务器连接密码（默认为空）
+    password: Lan@T0Ne@6351 # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.126:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: ENC(yh8BEagmXKGqJydg/j7ckKECbKNUczR8hDQ98xhh+vIgR83qg0HNqfDFtKZO2WW9)
-      password: ENC(BTLHRtCI4JhXSxbABxoyy3MiGJ4+0nffLdL9Mnq0M9xnJgonqJkopXhoQ7uaAcCu)
+      username: root
+      password: Lat0ne@tesT
+  flyway:
+    # 启用Flyway功能
+    enabled: false
 
 swagger.show: true

config-center/src/main/resources/shared/security-center-debug.yml

@@ -3,11 +3,14 @@ spring:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(9gkJqEGZe2OrdEOZ0JrG5f4laCUvZJj5EAgRrTeUJVa2DLFcPwuPxuDAhuwa5hau) # Redis服务器连接密码（默认为空）
+    password: lemRatO6351 # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: ENC(Y5/U4Vq7FFBTpnxMgTR+9JdVkGpO3jTgWDv3MlfQpvkIa7fc3SCXdWzn/13hiamc)
-      password: ENC(GdcFB7Ju+WOMZ78t+cdzT2qRmcsMv3OzDQnSBa0FzXwLtz2MQ8CHAC5WXefomwSD)
+      username: root
+      password: lantone
+  flyway:
+    # 启用Flyway功能
+    enabled: false
 
 swagger.show: true

config-center/src/main/resources/shared/security-center-inner.yml

@@ -9,5 +9,8 @@ spring:
       url: jdbc:mysql://192.168.2.125:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: ENC(mOhdbcO/tq5rpmVioHRTrLYtSBKhNE1vxlHaTMF+ffWkxvoC0aHww91Dwe8oSeKh)
       password: ENC(j48SjDCv+7iYIsByq6hz5cNMWDWK4DR5nhbXUO5p8egqNe+5lXJb8XQ9AFbaOOcEjM6HR4ae/ko+YsAJz6EMfw==)
+  flyway:
+    # 启用Flyway功能
+    enabled: true
 
 swagger.show: false

config-center/src/main/resources/shared/security-center-local.yml

@@ -3,11 +3,14 @@ spring:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(9elxU0rUdCuxKTMqrVZlSWTARWNOimFfEzCrCJY5sO0+0+Dcmqd75rVzZBRSOEut) # Redis服务器连接密码（默认为空）
+    password: lemRatO6351 # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: ENC(4uo3ZjSEkn5SX+w2fJLQ+9hc9dXcUhFIh3F0ElAuDr6pgcZVS04ENIHMitnYUcwE)
-      password: ENC(X+6h5MH2c7X/18c9QPC+ctNwRwlv66I5OBeiyVpKCO8my7jhTgj87kyNLD6uLtmf)
+      username: root
+      password: lantone
+  flyway:
+    # 启用Flyway功能
+    enabled: false
 
 swagger.show: true

config-center/src/main/resources/shared/security-center-outer.yml

@@ -9,5 +9,8 @@ spring:
       url: jdbc:mysql://192.168.2.129:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: ENC(Qs3DXZnOP4vT0wUJ/hvYF64wT8Gn8JaRbDQjwWlEpSP8X2OuxfilxJDPwiZmLeLp)
       password: ENC(Kzq13ofPtHZfkXvC5A28C8+7+/BgOOli0T+DW5j9d9ed22x3qqGYc1gqjJf5Ewd93/QcmymCjhhVIVTxt4pDTA==)
+  flyway:
+    # 启用Flyway功能
+    enabled: true
 
 swagger.show: false

config-center/src/main/resources/shared/security-center-test.yml

@@ -3,11 +3,14 @@ spring:
     database: 12
     host: 192.168.2.126 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(yPq+iIBDk/h2N+AP1xdicK45btGXdKDHoV3niq2xxW5/lrUkR2+uVbjukWHdnDVS) # Redis服务器连接密码（默认为空）
+    password: Lan@T0Ne@6351 # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.126:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: ENC(xNnlWjS3J+pLkO7q8GWVfG88sCKaDyuw3XuAP32f3ZUbM2AxF62yEDNWx65dhBlg)
-      password: ENC(ThDAoitAtd2K1ehZCLEdbxCZvLuvHNjw2o8+1fgg6TJjOcupdijwcJt4V+zQ+Tei)
+      username: root
+      password: Lat0ne@tesT
+  flyway:
+    # 启用Flyway功能
+    enabled: false
 
 swagger.show: true

config-center/src/main/resources/shared/structure-center-debug.yml

@@ -3,7 +3,7 @@ spring:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(LgNsL+qixdWlBQyO6i4a6cJZGyW14J3eF7WeiqtQi6kSFZzCN6sHAg0uWQRsU3BC) # Redis服务器连接密码（默认为空）
+    password: lemRatO6351 # Redis服务器连接密码（默认为空）
 
 swagger.show: true
 

config-center/src/main/resources/shared/structure-center-local.yml

@@ -3,7 +3,7 @@ spring:
     database: 12
     host: 192.168.2.237 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(7CunTnFrG8V3TstUO8EGQhSJ1Z+9fM3VaugXm2B9JxkYI4TPmoDcYbH3AzbLIp3+) # Redis服务器连接密码（默认为空）
+    password: lemRatO6351 # Redis服务器连接密码（默认为空）
 
 swagger.show: true
 

config-center/src/main/resources/shared/structure-center-test.yml

@@ -3,7 +3,7 @@ spring:
     database: 12
     host: 192.168.2.126 # Redis服务器地址
     port: 6351 # Redis服务器连接端口
-    password: ENC(E2F32Sm/6nE/Kk8z2FKXOM5xVcihg2a+/y135r+XO2uHtWnfq/8sSIBiPiorARh5) # Redis服务器连接密码（默认为空）
+    password: Lan@T0Ne@6351 # Redis服务器连接密码（默认为空）
 
 swagger.show: true
 

dblayer-mbg/src/main/resources/application.yml

@@ -48,7 +48,7 @@ spring:
         login-password: root
   flyway:
     # 启用Flyway功能
-    enabled: false
+    #enabled: false
     # 禁用Flyway的clean命令，使用clean命令会删除schema下的所有表
     clean-disabled: true
     # 设置Flyway的SQL脚本路径

message-service/src/main/java/com/lantone/message/config/MqttInboundConfig.java

@@ -7,6 +7,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.core.MessageProducer;
+import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
 import org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannelAdapter;
 import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
 import org.springframework.messaging.Message;
@@ -25,6 +26,8 @@ public class MqttInboundConfig {
 
     @Autowired
     private MqttConfig mqttConfig;
+    @Autowired
+    private MqttPahoClientFactory mqttPahoClientFactory;
 
     @Bean
     public MessageChannel mqttInputChannel() {
@@ -34,7 +37,7 @@ public class MqttInboundConfig {
     @Bean
     public MessageProducer inbound() {
         MqttPahoMessageDrivenChannelAdapter adapter =
-                new MqttPahoMessageDrivenChannelAdapter(mqttConfig.getUrl(), "subscriberClient",
+                new MqttPahoMessageDrivenChannelAdapter("subscriberClient", mqttPahoClientFactory,
                         mqttConfig.getDefaultTopic());
         adapter.setCompletionTimeout(5000);
         adapter.setConverter(new DefaultPahoMessageConverter());

message-service/src/main/java/com/lantone/message/config/MqttOutboundConfig.java

@@ -3,6 +3,7 @@ package com.lantone.message.config;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.integration.annotation.ServiceActivator;
@@ -25,12 +26,18 @@ public class MqttOutboundConfig {
 
     @Autowired
     private MqttConfig mqttConfig;
+    @Value("${spring.rabbitmq.username}")
+    private String username;
+    @Value("${spring.rabbitmq.password}")
+    private String password;
 
     @Bean
     public MqttPahoClientFactory mqttClientFactory() {
         DefaultMqttPahoClientFactory factory = new DefaultMqttPahoClientFactory();
         MqttConnectOptions options = new MqttConnectOptions();
         options.setServerURIs(new String[] { mqttConfig.getUrl() });
+        options.setUserName(username);
+        options.setPassword(password.toCharArray());
         factory.setConnectionOptions(options);
         return factory;
     }

security-center/src/main/java/com/lantone/security/facade/UserManagementFacade.java

@@ -66,7 +66,6 @@ import com.lantone.security.enums.ReturnTypeEnum;
 import com.lantone.security.client.AuthService;
 import com.lantone.security.client.MessageService;
 import eu.bitwalker.useragentutils.UserAgent;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -87,7 +86,6 @@ import java.util.stream.Collectors;
  * @time: 2021/7/20 12:39
  */
 @Component
-@Slf4j
 public class UserManagementFacade {
 
     @Autowired
@@ -152,23 +150,13 @@ public class UserManagementFacade {
                     sendToTopicDTO.setType("login");
                     sendToTopicDTO.setTopic(userId);
                     sendToTopics.add(sendToTopicDTO);
-                    try {
-                        messageService.sendToTopic(sendToTopics);
-                    }catch (Exception e){
-                        e.printStackTrace();
-                        log.error(e.getMessage());
-                    }
+                    messageService.sendToTopic(sendToTopics);
                 }
                 JwtStore jwtStore = new JwtStore();
                 jwtStore.setAccessToken(map.get(AuthConstant.ASSESS_TOKEN).toString());
                 jwtStore.setRefreshToken(map.get(AuthConstant.REFRESH_TOKEN).toString());
                 jwtStore.setIp(HttpUtils.getIpAddress());
-                try {
-                    sysTokenService.createToken(jwtStore);
-                }catch (Exception e){
-                    e.printStackTrace();
-                    log.error(e.getMessage());
-                }
+                sysTokenService.createToken(jwtStore);
             }
         }
     }
@@ -870,12 +858,7 @@ public class UserManagementFacade {
                 // 获取客户端浏览器
                 String browser = userAgent.getBrowser().getName();
                 loginLog.setLoginBrowser(browser);
-                try {
-                    messageService.loginLogHandle(loginLog);
-                }catch (Exception e){
-                    e.printStackTrace();
-                    log.error(e.getMessage());
-                }
+                messageService.loginLogHandle(loginLog);
             }
         }
     }