From c7d5392fbd8cab7323b3840cb68d379039ddd461 Mon Sep 17 00:00:00 2001
From: liuhanqing <447067298@qq.com>
Date: Mon, 25 Jan 2021 23:23:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90message=E3=80=91=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=8A=A0websocket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kernel/auth/api/pojo/login/LoginUser.java | 22 +++++++++--
 kernel-d-auth/auth-sdk/pom.xml                |  8 ++++
 .../kernel/auth/auth/AuthServiceImpl.java     |  4 ++
 .../kernel/db/flyway/FlywayInitListener.java  | 22 ++++++++---
 .../api/expander/WebSocketConfigExpander.java | 37 +++++++++++++++++++
 .../starter/GunsMessageAutoConfiguration.java |  7 +++-
 6 files changed, 90 insertions(+), 10 deletions(-)
 create mode 100644 kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/expander/WebSocketConfigExpander.java

diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java
index 8f176d6f6..2755ddec3 100644
--- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java
+++ b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java
@@ -1,15 +1,15 @@
 package cn.stylefeng.roses.kernel.auth.api.pojo.login;
 
 import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.StrUtil;
 import cn.stylefeng.roses.kernel.auth.api.enums.DataScopeTypeEnum;
 import cn.stylefeng.roses.kernel.auth.api.pojo.login.basic.SimpleRoleInfo;
 import cn.stylefeng.roses.kernel.auth.api.pojo.login.basic.SimpleUserInfo;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * 登录用户信息
@@ -89,4 +89,20 @@ public class LoginUser implements Serializable {
      */
     private Dict otherInfos;
 
+    /**
+     * 用户的ws-url
+     */
+    private String wsUrl;
+
+
+    public String getWsUrl(){
+        AtomicReference<String> returnUrl = new AtomicReference<>(StrUtil.EMPTY);
+        Optional.ofNullable(this.wsUrl).ifPresent(url -> {
+            Map<String, Long> user = new HashMap<>(1);
+            user.put("userId", this.userId);
+            returnUrl.set(StrUtil.format(url, user));
+        });
+        return returnUrl.get();
+    }
+
 }
diff --git a/kernel-d-auth/auth-sdk/pom.xml b/kernel-d-auth/auth-sdk/pom.xml
index 242798772..173b98e82 100644
--- a/kernel-d-auth/auth-sdk/pom.xml
+++ b/kernel-d-auth/auth-sdk/pom.xml
@@ -79,6 +79,14 @@
             <scope>provided</scope>
         </dependency>
 
+        <!--系统消息业务模块的api-->
+        <!--获取当前登录用户的ws-url-->
+        <dependency>
+            <groupId>cn.stylefeng.roses</groupId>
+            <artifactId>message-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java
index b9612f00c..8ccaa20f1 100644
--- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java
+++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java
@@ -16,6 +16,7 @@ import cn.stylefeng.roses.kernel.jwt.api.context.JwtContext;
 import cn.stylefeng.roses.kernel.jwt.api.exception.JwtException;
 import cn.stylefeng.roses.kernel.jwt.api.exception.enums.JwtExceptionEnum;
 import cn.stylefeng.roses.kernel.jwt.api.pojo.payload.DefaultJwtPayload;
+import cn.stylefeng.roses.kernel.message.api.expander.WebSocketConfigExpander;
 import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil;
 import cn.stylefeng.roses.kernel.system.LoginLogServiceApi;
 import cn.stylefeng.roses.kernel.system.UserServiceApi;
@@ -213,6 +214,9 @@ public class AuthServiceImpl implements AuthServiceApi {
 
         synchronized (SESSION_OPERATE_LOCK) {
 
+            // 8.1 获取ws-url 保存到用户信息中
+            loginUser.setWsUrl(WebSocketConfigExpander.getWebSocketWsUrl());
+
             // 9. 缓存用户信息，创建会话
             sessionManagerApi.createSession(jwtToken, loginUser);
 
diff --git a/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java b/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java
index 48ea59a5d..32ef1fb33 100644
--- a/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java
+++ b/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java
@@ -37,26 +37,38 @@ public class FlywayInitListener implements ApplicationListener<ApplicationContex
         String dataSourcePassword = environment.getProperty("spring.datasource.password");
 
         // flyway的配置
+        String enabledStr = environment.getProperty("spring.flyway.enabled");
         String locations = environment.getProperty("spring.flyway.locations");
         String baselineOnMigrateStr = environment.getProperty("spring.flyway.baseline-on-migrate");
         String outOfOrderStr = environment.getProperty("spring.flyway.out-of-order");
 
+        // 是否开启flyway，默认false.
+        boolean enabled = false;
+        if (StrUtil.isNotBlank(enabledStr)) {
+            enabled = Boolean.parseBoolean(enabledStr);
+        }
+
+        // 如果未开启flyway 直接return
+        if (!enabled) {
+            return;
+        }
+
         // 如果有为空的配置，终止执行
         if (ObjectUtil.hasEmpty(dataSourceUrl, dataSourceUsername, dataSourcePassword)) {
             throw new DaoException(FlywayExceptionEnum.DB_CONFIG_ERROR);
         }
 
-        // 如果未设置flyway路径，则设置为默认flyway路径
-        if (StrUtil.isBlank(locations)) {
-            locations = FLYWAY_LOCATIONS;
-        }
-
         // 当迁移时发现目标schema非空，而且带有没有元数据的表时，是否自动执行基准迁移，默认false.
         boolean baselineOnMigrate = false;
         if (StrUtil.isNotBlank(baselineOnMigrateStr)) {
             baselineOnMigrate = Boolean.parseBoolean(baselineOnMigrateStr);
         }
 
+        // 如果未设置flyway路径，则设置为默认flyway路径
+        if (StrUtil.isBlank(locations)) {
+            locations = FLYWAY_LOCATIONS;
+        }
+
         // 是否允许无序的迁移 开发环境最好开启, 生产环境关闭
         boolean outOfOrder = false;
         if (StrUtil.isNotBlank(outOfOrderStr)) {
diff --git a/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/expander/WebSocketConfigExpander.java b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/expander/WebSocketConfigExpander.java
new file mode 100644
index 000000000..b2230ee29
--- /dev/null
+++ b/kernel-s-message/message-api/src/main/java/cn/stylefeng/roses/kernel/message/api/expander/WebSocketConfigExpander.java
@@ -0,0 +1,37 @@
+package cn.stylefeng.roses.kernel.message.api.expander;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import cn.stylefeng.roses.kernel.config.api.context.ConfigContext;
+
+/**
+ * websocket相关配置快速获取
+ *
+ * @author liuhanqing
+ * @date 2021/1/25 20:05
+ */
+public class WebSocketConfigExpander {
+
+    /**
+     * 获取websocket的ws-url
+     *
+     * @author liuhanqing
+     * @date 2021/1/25 20:34
+     */
+    public static String getWebSocketWsUrl() {
+        String webSocketWsUr = ConfigContext.me().getConfigValueNullable("WEB_SOCKET_WS_URL", String.class);
+
+        if (webSocketWsUr == null) {
+            // 没配置就查询配置文件
+            String propertiesUrl = SpringUtil.getProperty("web-socket.ws-url");
+            if(StrUtil.isNotEmpty(propertiesUrl)){
+                return propertiesUrl;
+            }
+            // 没配置就返回一个空串
+            return StrUtil.EMPTY;
+        }
+        return webSocketWsUr;
+
+    }
+
+}
diff --git a/kernel-s-message/message-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/message/starter/GunsMessageAutoConfiguration.java b/kernel-s-message/message-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/message/starter/GunsMessageAutoConfiguration.java
index 9248c9c98..907c72c89 100644
--- a/kernel-s-message/message-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/message/starter/GunsMessageAutoConfiguration.java
+++ b/kernel-s-message/message-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/message/starter/GunsMessageAutoConfiguration.java
@@ -1,5 +1,6 @@
 package cn.stylefeng.roses.kernel.message.starter;
 
+import cn.stylefeng.roses.kernel.message.api.expander.WebSocketConfigExpander;
 import cn.stylefeng.roses.kernel.message.api.pojo.MessageWebSocketProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -28,8 +29,10 @@ public class GunsMessageAutoConfiguration {
      */
     @Bean
     @ConfigurationProperties(prefix = WEB_SOCKET_PREFIX)
-    public MessageWebSocketProperties sysLogProperties() {
-        return new MessageWebSocketProperties();
+    public MessageWebSocketProperties messageWebSocketProperties() {
+        MessageWebSocketProperties properties = new MessageWebSocketProperties();
+        properties.setWsUrl(WebSocketConfigExpander.getWebSocketWsUrl());
+        return properties;
     }