修改前端集成接口

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/TokenLoginController.java → YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/LoginController.java

@@ -23,11 +23,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -39,13 +36,10 @@ import java.util.Map;
 
 @RestController
 @RequestMapping(value = "/api/loginBytoken")
-@Api(tags = "外部token登录Api")
-public class TokenLoginController {
+@Api(tags = "通过userName登录Api")
+public class LoginController {
 
-    private static final Logger logger = LoggerFactory.getLogger(TokenLoginController.class);
-
-    @Autowired
-    private OutTokenLoginFeign outTokenLoginFeign;
+    private static final Logger logger = LoggerFactory.getLogger(LoginController.class);
 
     @Autowired
     private PrivilegeFeign privilegeFeign;
@@ -65,33 +59,28 @@ public class TokenLoginController {
     @Value("${security.appKeyWeb}")
     private String appKey;
 
-    @ApiOperation(value = "外部token登錄", notes = "查询设备指标")
-    @GetMapping(value = "/{token}")
-    synchronized  public ReginParams getBindEquipment(@PathVariable("token") String  outToken) throws Exception {
-        if ( ObjectUtils.isEmpty(outToken)) {
-            throw new Exception("token异常");
-        }
-        String userId = "wk";
-//        String userId = outTokenLoginFeign.getUserName(outToken);
+    @ApiOperation(value = "通过userId登录", notes = "查询设备指标")
+    @GetMapping(value = "/{userId}")
+    synchronized  public ReginParams getBindEquipment(@PathVariable("userId") String userId) throws Exception {
+
         if (ObjectUtils.isEmpty(userId)){
             throw new Exception("用户信息不存在");
         }
-
         ReginParams reginParams;
-        reginParams = JSON.parseObject(redisTemplate.opsForValue().get(buildKey(userId, outToken)), ReginParams.class);
+        reginParams = JSON.parseObject(redisTemplate.opsForValue().get(buildKey(userId)), ReginParams.class);
         if(reginParams == null){
             reginParams = new ReginParams();
             Map<String, String> param = new HashMap<>();
             param.put("loginId", userId);
             param.put("password", password);
-            Object result = privilegeFeign.login(appKey, product, outToken, param).getResult();
+            Object result = privilegeFeign.login(appKey, product, param).getResult();
             if (ObjectUtils.isEmpty(result)){
                 throw new Exception("缺失登录信息");
             }
 
             Map<String ,String > re = (Map<String ,String >) result;
             String token = re.get("token");
-            privilegeFeign.warrant(appKey,product,token);
+            privilegeFeign.warrant(appKey, product, token);
 
             RequestContext.setToken(token);
             RequestContext.setProduct(product);
@@ -106,15 +95,10 @@ public class TokenLoginController {
                 reginParams.setDepartment(departmentBo);
                 reginParams.setCompany(companyBo);
             }
-
             reginParams.setToken(token);
             reginParams.setUserModel(userModel);
-
-            redisTemplate.opsForValue().set(buildKey(userId, token), JSONObject.toJSONString(reginParams));
-            redisTemplate.opsForValue().set(buildKey(userId, outToken), JSONObject.toJSONString(reginParams));
-
+            redisTemplate.opsForValue().set(buildKey(userId), JSONObject.toJSONString(reginParams));
         }
-
         return reginParams;
     }
     private DepartmentBo convertDepartmentModelToBo(DepartmentModel departmentModel){
@@ -163,8 +147,8 @@ public class TokenLoginController {
         return roleBo;
     }
 
-    private String buildKey(String userId, String token) {
-        return "region_" + userId + "_" + token;
+    private String buildKey(String userId) {
+        return "region_" + userId;
 
     }
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/PrivilegeFeign.java

@@ -18,7 +18,7 @@ public interface PrivilegeFeign {
     FeignClientResult login(
             @RequestHeader(name = "appKey", required = true) String appKey,
             @RequestHeader(name = "product", required = true) String product,
-            @RequestHeader(name = "token", required = true) String token,
+//            @RequestHeader(name = "token", required = true) String token,
             @RequestBody Map person);
 
     @RequestMapping(value = "privilege/v1/application/list/user/service", method = RequestMethod.GET)