Merge remote-tracking branch 'origin/master'

device-api-service/src/main/java/com/xy/service/DeviceRegisterServiceImpl.java

@@ -118,8 +118,8 @@ public class DeviceRegisterServiceImpl extends ServiceImpl<DeviceRegisterMapper,
             //mqtt认证信息
             String deviceId = deviceRegister.getDeviceId().toString();
             MqttUserDto.Save mqttUserInfo = new MqttUserDto.Save();
-            mqttUserInfo.setUsername(deviceId);
-            mqttUserInfo.setPasswordHash(deviceId);
+            mqttUserInfo.setUsername(deviceRegister.getDeviceSn());
+            mqttUserInfo.setPasswordHash(deviceRegister.getDeviceSn());
             mqttUserInfo.setCreated(LocalDateTime.now());
             mqttUserInfo.setTopic(deviceId + CommConsts.DEVICE_MQTT_TOPIC_SUFFIX);
             mqttUserInfo.setSn(deviceRegister.getDeviceSn());

device-api-service/src/main/java/com/xy/service/MqttUserServiceImpl.java

@@ -3,7 +3,6 @@ package com.xy.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xy.config.SpringConfigs;
 import com.xy.dto.MqttUserDto;
 import com.xy.entity.MqttUser;
 import com.xy.entity.SysDictRedis;
@@ -39,8 +38,6 @@ import static com.xy.utils.PlusBeans.toPageBean;
 @Api(tags = "mqtt认证")
 public class MqttUserServiceImpl extends ServiceImpl<MqttUserMapper, MqttUser> implements MqttUserService {
 
-    private SpringConfigs springConfigs;
-
     @PostMapping("obj")
     @ApiOperation("对象查询")
     public R<MqttUserDto.Vo> obj(@RequestBody MqttUserDto.Obj obj) {
@@ -50,10 +47,9 @@ public class MqttUserServiceImpl extends ServiceImpl<MqttUserMapper, MqttUser> i
             return R.ok();
         }
         MqttUserDto.Vo mqttUser = list.get(0);
-        String env = !Emptys.check(obj.getEnv()) ? springConfigs.getProfiles().getActive() : obj.getEnv();
         Map<String, SysDictRedis> map = SysDictUtils.get(DictEnum.ENV_PARAMS.getKey());
-        SysDictRedis mqttUrl = map.get(env + "_mqtt_url");
-        SysDictRedis serverUrl = map.get(env + "_server_url");
+        SysDictRedis mqttUrl = map.get("mqtt_url");
+        SysDictRedis serverUrl = map.get("server_url");
         mqttUser.setServerTime(System.currentTimeMillis())
                 .setIpAddress(mqttUrl.getValue())
                 .setServerUrl(serverUrl.getValue());

device-api/src/main/java/com/xy/dto/MqttUserDto.java

@@ -47,9 +47,6 @@ public class MqttUserDto {
         @NotBlank(message = "sn不能为空")
         @ApiModelProperty("sn号")
         private String sn;
-
-        @ApiModelProperty("环境标识")
-        private String env;
     }
 
 

device-start/src/main/resources/bootstrap.yml

@@ -17,7 +17,4 @@ cloud:
   feign:
     head:
       carr-heads:
-        - satoken
-
-mysql:
-  doc: false
+        - satoken