Explorar el Código

修改mqtt授权为sn

李进 hace 2 años
padre
commit
7866adf885

+ 2 - 6
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());

+ 0 - 3
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;
     }