fix login by token

rankin-api-web/src/main/java/cn/rankin/apiweb/service/user/UserClient.java

@@ -33,7 +33,7 @@ public interface UserClient {
     APIResult<TerminalDeviceVo> findDeviceByUid(@PathVariable("userId") String uid);
 
     @RequestMapping(value = "/device/deviceCode/{deviceCode}", method = RequestMethod.GET)
-    APIResult<List<TerminalDeviceVo>> findByDeviceCode(@PathVariable("deviceCode") String deviceCode);
+    List<TerminalDeviceVo> findByDeviceCode(@PathVariable("deviceCode") String deviceCode);
 
     @RequestMapping(value = "/white/user/{userId}", method = RequestMethod.GET)
     APIResult<WhiteUserVo> findWhiteUserById(@PathVariable("userId") String userId);
@@ -77,8 +77,8 @@ public interface UserClient {
         }
 
         @Override
-        public APIResult findByDeviceCode(String deviceCode) {
-            return APIResult.error(ApiWebCode.SERVER_ERROR);
+        public List<TerminalDeviceVo> findByDeviceCode(String deviceCode) {
+            return null;
         }
 
         @Override

rankin-api-web/src/main/java/cn/rankin/apiweb/service/user/UserService.java

@@ -182,13 +182,7 @@ public class UserService {
 
     public APIResult<UserInfoVo> refresh(String deviceCode, String merchant, Boolean force) {
 
-        APIResult<List<TerminalDeviceVo>> deviceAPIResult = userClient.findByDeviceCode(deviceCode);
-        if (!deviceAPIResult.getSuccess()) {
-            log.error("load device api error, {}", deviceAPIResult.getMessage());
-            return APIResult.error(ApiWebCode.NOT_FOUND);
-        }
-
-        List<TerminalDeviceVo> deviceVoList = deviceAPIResult.getData();
+        List<TerminalDeviceVo> deviceVoList = userClient.findByDeviceCode(deviceCode);
         if (CollectionUtils.isEmpty(deviceVoList)) {
             log.error("device code not bind any eid! deviceCode={}", deviceCode);
             return APIResult.error(ApiWebCode.NOT_EXISTS);

rankin-data-api/src/main/java/cn/rankin/data/api/app/vo/DeviceUserVo.java

@@ -15,9 +15,6 @@ public class DeviceUserVo implements Serializable {
     //设备信息
     private String deviceCode;
 
-    //渠道信息 simple
-    private String merchant;
-
     //用户信息
     private String eid;
 

rankin-data-api/src/main/java/cn/rankin/data/api/user/dto/TerminalDeviceDTO.java

@@ -15,7 +15,6 @@ public class TerminalDeviceDTO {
     @NotNull
     private String deviceCode;
 
-    @NotNull
     private String merchant;
 
     @NotNull

rankin-user-service/src/main/java/cn/rankin/userservice/controller/TerminalDeviceController.java

@@ -44,7 +44,7 @@ public class TerminalDeviceController {
     }
 
     @RequestMapping(value = "/deviceCode/{deviceCode}", method = RequestMethod.GET)
-    public APIResult<List<TerminalDevice>> findByDeviceCode(@PathVariable("deviceCode") String deviceCode) {
+    public List<TerminalDevice> findByDeviceCode(@PathVariable("deviceCode") String deviceCode) {
         return terminalDeviceService.findByDeviceCode(deviceCode);
     }
 }

rankin-user-service/src/main/java/cn/rankin/userservice/service/TerminalDeviceService.java

@@ -85,12 +85,12 @@ public class TerminalDeviceService {
         return terminalDeviceRepository.findByUserId(userId);
     }
 
-    public APIResult<List<TerminalDevice>> findByDeviceCode(String deviceCode) {
+    public List<TerminalDevice> findByDeviceCode(String deviceCode) {
         List<TerminalDevice> terminalDeviceList = terminalDeviceRepository.findByDeviceCode(deviceCode);
         /*if (terminalDevice == null) {
             return APIResult.error(UserServiceAPICode.NOT_EXISTS);
         }*/
-        return APIResult.ok(terminalDeviceList);
+        return terminalDeviceList;
     }
 
     public APIResult<TerminalDevice> updatebind(TerminalDeviceDTO terminalDeviceDTO) {