Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -19,6 +19,7 @@ liquidnet:
     port: 5672
     username: admin
     password: admin
+    virtual-host: /
   knife4j:
     disable: false
   redis:

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-dev.yml

@@ -27,46 +27,5 @@ liquidnet:
 
 #以下为spring各环境个性配置
 spring:
-  rabbitmq:
-    addresses: ${liquidnet.rabbitmq.host}
-    port: ${liquidnet.rabbitmq.port}
-    username: ${liquidnet.rabbitmq.username}
-    password: ${liquidnet.rabbitmq.password}
-  redis:
-    port: ${liquidnet.redis.port}
-    host: ${liquidnet.redis.host}
-    password: ${liquidnet.redis.password}
-    lettuce:
-      pool:
-        max-active: 8
-        max-wait: -1
-        max-idle: 8
-        min-idle: 0
-    redisson:
-      singleServerConfig:
-        address: redis://${liquidnet.redis.host}:${liquidnet.redis.port}
-        password: ${liquidnet.redis.password}
-        clientName: null
-        database: 7 #选择使用哪个数据库0~15
-        idleConnectionTimeout: 10000
-        connectTimeout: 10000
-        timeout: 3000
-        retryAttempts: 3
-        retryInterval: 1500
-        subscriptionsPerConnection: 5
-        subscriptionConnectionMinimumIdleSize: 1
-        subscriptionConnectionPoolSize: 50
-        connectionMinimumIdleSize: 32
-        connectionPoolSize: 64
-        dnsMonitoringInterval: 5000
-      threads: 16
-      nettyThreads: 32
-      codec:
-        class: "org.redisson.codec.JsonJacksonCodec"
-      transportMode: "NIO"
-  data:
-    mongodb:
-      sslEnabled: false
-      database: dev_ln_scene
-      trustStore:
-      trustStorePassword:
+  data-mongo-sslEnabled: false
+  data-mongo-database: dev_ln_scene

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test.yml

@@ -27,46 +27,5 @@ liquidnet:
 
 #以下为spring各环境个性配置
 spring:
-  rabbitmq:
-    addresses: ${liquidnet.rabbitmq.host}
-    port: ${liquidnet.rabbitmq.port}
-    username: ${liquidnet.rabbitmq.username}
-    password: ${liquidnet.rabbitmq.password}
-  redis:
-    port: ${liquidnet.redis.port}
-    host: ${liquidnet.redis.host}
-    password: ${liquidnet.redis.password}
-    lettuce:
-      pool:
-        max-active: 8
-        max-wait: -1
-        max-idle: 8
-        min-idle: 0
-    redisson:
-      singleServerConfig:
-        address: redis://${liquidnet.redis.host}:${liquidnet.redis.port}
-        password: ${liquidnet.redis.password}
-        clientName: null
-        database: 7 #选择使用哪个数据库0~15
-        idleConnectionTimeout: 10000
-        connectTimeout: 10000
-        timeout: 3000
-        retryAttempts: 3
-        retryInterval: 1500
-        subscriptionsPerConnection: 5
-        subscriptionConnectionMinimumIdleSize: 1
-        subscriptionConnectionPoolSize: 50
-        connectionMinimumIdleSize: 32
-        connectionPoolSize: 64
-        dnsMonitoringInterval: 5000
-      threads: 16
-      nettyThreads: 32
-      codec:
-        class: "org.redisson.codec.JsonJacksonCodec"
-      transportMode: "NIO"
-  data:
-    mongodb:
-      sslEnabled: false
-      database: test_ln_scene
-      trustStore:
-      trustStorePassword:
+  data-mongo-sslEnabled: false
+  data-mongo-database: test_ln_scene

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam.yml

@@ -73,11 +73,44 @@ spring:
     port: ${liquidnet.rabbitmq.port}
     username: ${liquidnet.rabbitmq.username}
     password: ${liquidnet.rabbitmq.password}
+    virtual-host: ${liquidnet.rabbitmq.virtual-host}
+  redis:
+    port: ${liquidnet.redis.port}
+    host: ${liquidnet.redis.host}
+    password: ${liquidnet.redis.password}
+    lettuce:
+      pool:
+        max-active: 8
+        max-wait: -1
+        max-idle: 8
+        min-idle: 0
+    redisson:
+      singleServerConfig:
+        address: redis://${liquidnet.redis.host}:${liquidnet.redis.port}
+        password: ${liquidnet.redis.password}
+        clientName: null
+        database: 7 #选择使用哪个数据库0~15
+        idleConnectionTimeout: 10000
+        connectTimeout: 10000
+        timeout: 3000
+        retryAttempts: 3
+        retryInterval: 1500
+        subscriptionsPerConnection: 5
+        subscriptionConnectionMinimumIdleSize: 1
+        subscriptionConnectionPoolSize: 50
+        connectionMinimumIdleSize: 32
+        connectionPoolSize: 64
+        dnsMonitoringInterval: 5000
+      threads: 16
+      nettyThreads: 32
+      codec:
+        class: "org.redisson.codec.JsonJacksonCodec"
+      transportMode: "NIO"
   data:
     mongodb:
       uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=4000&waitQueueMultiple=100
-      sslEnabled: false
-      database: ${spring.data.mongodb.database}
+      sslEnabled: ${spring.data-mongo-sslEnabled}
+      database: ${spring.data-mongo-database}
   datasource:
     name: ${liquidnet.mysql.database-name}
     url: jdbc:mysql://${liquidnet.mysql.urlHostAndPort}/${liquidnet.mysql.database-name}?serverTimezone=UTC&characterEncoding=utf-8&useSSL=false
@@ -98,14 +131,6 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxOpenPreparedStatements: 20
-#  mvc:
-#    static-path-pattern: /templates/**
-#    # 定位模板的目录
-#    view:
-#      prefix: classpath:/templates/
-#      suffix: .html
-#  resources:
-#    static-locations: classpath:/templates/,classpath:/static/page
 # -----------------------------------------------------------
 
 # -----------------------------------------------------------

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -262,6 +262,7 @@ public class AdamLoginController {
         // TODO: 2021/5/25 修改手机号更新TOKEN
         claimsMap.put("mobile", userInfoVo.getMobile());
         claimsMap.put("nickname", userInfoVo.getNickname());
+        claimsMap.put("type", "user");
 
         String token = jwtValidator.create(claimsMap);