Merge branch 'master' into test

sys-api-service/src/main/java/com/xy/config/WebMqttConfig.java

@@ -17,24 +17,14 @@ public class WebMqttConfig {
     private String ip;
 
     /**
-     * websocket url
-     */
-    private String wsUrl;
-
-    /**
-     * 微信小程序 url
-     */
-    private String wxsUrl;
-
-    /**
-     * websocket端口
+     * ws端口
      */
     private Integer wsPort;
 
     /**
-     * 微信小程序端口
+     * wss端口
      */
-    private Integer wxsPort;
+    private Integer wssPort;
 
     /**
      * 账号
@@ -47,17 +37,54 @@ public class WebMqttConfig {
     private String password;
 
     /**
-     * clientId&topic前缀
+     * 协议前缀
      */
-    private String prefix;
+    private Protocol protocol;
 
     /**
-     * pc管理端topic前缀
+     * topic前缀
      */
-    private String pcManagePrefix;
+    private Topic topic;
 
-    /**
-     * 微信c端小程序topic前缀
-     */
-    private String wxCPrefix;
+    @Data
+    public static class Protocol {
+
+        /**
+         * # pc端
+         */
+        private String pcUrl;
+
+        /**
+         * 微信c端
+         */
+        private String wxsUrl;
+
+        /**
+         * 支付宝c端
+         */
+        private Integer alisUrl;
+    }
+
+    @Data
+    public static class Topic {
+        /**
+         * topic前缀
+         */
+        private String prefix;
+
+        /**
+         * pc管理端
+         */
+        private String pcManagePrefix;
+
+        /**
+         * 微信c端小程序
+         */
+        private String wxCPrefix;
+
+        /**
+         * 支付宝c端小程序
+         */
+        private String alisCPrefix;
+    }
 }

sys-api-service/src/main/java/com/xy/service/UserInfoServiceImpl.java

@@ -201,14 +201,20 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         UserInfoDto.WebUserMqttVo webUserMqttVo = new UserInfoDto.WebUserMqttVo()
                 .setUsername(webMqttConfig.getUsername())
                 .setPassword(webMqttConfig.getPassword());
+        WebMqttConfig.Protocol protocol = webMqttConfig.getProtocol();
+        WebMqttConfig.Topic topic = webMqttConfig.getTopic();
         if (type == 1) {
-            webUserMqttVo.setUrl(webMqttConfig.getWsUrl() + webMqttConfig.getIp())
+            webUserMqttVo.setUrl(protocol.getPcUrl() + webMqttConfig.getIp())
                     .setPort(webMqttConfig.getWsPort())
-                    .setClientTopic(webMqttConfig.getPrefix() + webMqttConfig.getPcManagePrefix() + loginId);
+                    .setClientTopic(topic.getPrefix() + topic.getPcManagePrefix() + loginId);
         } else if (type == 2) {
-            webUserMqttVo.setUrl(webMqttConfig.getWxsUrl() + webMqttConfig.getIp())
-                    .setPort(webMqttConfig.getWxsPort())
-                    .setClientTopic(webMqttConfig.getPrefix() + webMqttConfig.getWxCPrefix() + loginId);
+            webUserMqttVo.setUrl(protocol.getWxsUrl() + webMqttConfig.getIp())
+                    .setPort(webMqttConfig.getWssPort())
+                    .setClientTopic(topic.getPrefix() + topic.getWxCPrefix() + loginId);
+        } else if (type == 3) {
+            webUserMqttVo.setUrl(protocol.getAlisUrl() + webMqttConfig.getIp())
+                    .setPort(webMqttConfig.getWssPort())
+                    .setClientTopic(topic.getPrefix() + topic.getAlisCPrefix() + loginId);
         }
         return R.ok(webUserMqttVo);
     }

sys-api/src/main/java/com/xy/dto/UserInfoDto.java

@@ -208,7 +208,7 @@ public class UserInfoDto {
     public static class WebUserMqtt {
 
         @NotNull(message = "type不能为空")
-        @ApiModelProperty(value = "类型 1=pc管理端 2=c端小程序", required = true)
+        @ApiModelProperty(value = "类型 1=pc管理端 2=微信c端小程序 3=支付宝c端小程序", required = true)
         private Integer type;
 
     }