修改用户体系

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

@@ -51,4 +51,13 @@ public class WebMqttConfig {
      */
     private String prefix;
 
+    /**
+     * pc管理端topic前缀
+     */
+    private String pcManagePrefix;
+
+    /**
+     * 微信c端小程序topic前缀
+     */
+    private String wxCPrefix;
 }

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

@@ -194,14 +194,15 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
         Integer type = webUserMqtt.getType();
         UserInfoDto.WebUserMqttVo webUserMqttVo = new UserInfoDto.WebUserMqttVo()
                 .setUsername(webMqttConfig.getUsername())
-                .setPassword(webMqttConfig.getPassword())
-                .setClientTopic(webMqttConfig.getPrefix() + loginId);
+                .setPassword(webMqttConfig.getPassword());
         if (type == 1) {
             webUserMqttVo.setUrl(webMqttConfig.getWsUrl() + webMqttConfig.getIp())
-                    .setPort(webMqttConfig.getWsPort());
+                    .setPort(webMqttConfig.getWsPort())
+                    .setClientTopic(webMqttConfig.getPrefix() + webMqttConfig.getPcManagePrefix() + loginId);
         } else if (type == 2) {
             webUserMqttVo.setUrl(webMqttConfig.getWxsUrl() + webMqttConfig.getIp())
-                    .setPort(webMqttConfig.getWxsPort());
+                    .setPort(webMqttConfig.getWxsPort())
+                    .setClientTopic(webMqttConfig.getPrefix() + webMqttConfig.getWxCPrefix() + loginId);
         }
         return R.ok(webUserMqttVo);
     }

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

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