remove test intercepter, same the terminal user id

rankin-api-web/src/main/java/cn/rankin/apiweb/intercepter/RequestSignatureInterceptor.java

@@ -87,9 +87,9 @@ public class RequestSignatureInterceptor implements HandlerInterceptor {
         }
 
         request.setAttribute("RANKIN_DEVICE_USER_INFO", du);
-        if (true) {
-            return true;
-        }
+//        if (true) {
+//            return true;
+//        }
 
         if (du.getExpireAt().before(new Date())) {
             writeResponse(request, response, ApiWebCode.TOKEN_EXPIRE);

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/TerminalUser.java

@@ -50,9 +50,6 @@ public class TerminalUser implements Serializable {
     @Column(name = "merchant_id", updatable = false, nullable = false)
     private String merchantId;
 
-    @Column(name = "uid")
-    private String uid;
-
     @Transient
     private String merchantName;
 

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

@@ -144,6 +144,18 @@ public class TerminalUserController {
             terminalUserDTO.setName(StudentNumberUtil.toChinese(serialNo, "教室"));
         }
 
+        // 远程注册
+        String password = terminalUserDTO.getPassword();
+        APIResult<RemoteUser> remoteUserAPIResult = remoteUserProxy.register(code, password, HttpUtil.getClientIp(request), "0");
+        if (!remoteUserAPIResult.getSuccess()) {
+            log.error(JSON.toJSONString(remoteUserAPIResult));
+            return APIResult.error(UserServiceAPICode.REMOTE_USER_REGISTER_ERROR);
+        }else {
+            // 设置资源中心id为本地用户id
+            RemoteUser remoteUser = remoteUserAPIResult.getData();
+            terminalUserDTO.setId(remoteUser.getUid());
+        }
+
         // 存储数据库
         APIResult<TerminalUser> result = terminalUserService.create(terminalUserDTO);
         if (!result.getSuccess()) {
@@ -153,16 +165,6 @@ public class TerminalUserController {
         TerminalUser terminalUser = result.getData();
         setUserInfo(terminalUser, campus, merchant);
 
-        // 远程注册
-        APIResult<RemoteUser> remoteUserAPIResult = remoteUserProxy.register(terminalUser, HttpUtil.getClientIp(request), "0");
-        if (!remoteUserAPIResult.getSuccess()) {
-            log.error(JSON.toJSONString(remoteUserAPIResult));
-            return APIResult.error(UserServiceAPICode.REMOTE_USER_REGISTER_ERROR);
-        }
-
-        // 再存储远程uid
-        terminalUserService.addUid(terminalUser.getId(), remoteUserAPIResult.getData().getUid());
-
         return result;
     }
 

rankin-user-service/src/main/java/cn/rankin/userservice/proxy/RemoteUserProxy.java

@@ -20,8 +20,12 @@ public class RemoteUserProxy {
     @Autowired
     private RemoteUserFeign remoteUserFeign;
 
-    public APIResult<RemoteUser> register(TerminalUser terminalUser, String userIp, String appVer) {
-        UserRegistry user = DTOConverter.convert(terminalUser);
+    public APIResult<RemoteUser> register(String eid, String password, String userIp, String appVer) {
+//        UserRegistry user = DTOConverter.convert(terminalUser);
+        UserRegistry user = new UserRegistry();
+        user.setEntry(eid);
+        user.setEntryType(Constant.EntryType.EID);
+        user.setPasswd(password);
         return remoteUserFeign.register(user, userIp, appVer);
     }
 
@@ -49,7 +53,7 @@ public class RemoteUserProxy {
         userPasswd.setToken(user.getToken());
         userPasswd.setPasswd(newPassword);
 
-        APIResult result = remoteUserFeign.passwd(terminalUser.getUid(), userPasswd, userIp, appVer);
+        APIResult result = remoteUserFeign.passwd(terminalUser.getId(), userPasswd, userIp, appVer);
         return result;
     }
 }

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

@@ -103,11 +103,4 @@ public class TerminalUserService {
         return APIResult.error(UserServiceAPICode.NOT_EXISTS);
     }
 
-    public void addUid(String id, String uid) {
-        TerminalUser user = new TerminalUser();
-        user.setId(id);
-        user.setUid(uid);
-        terminalUserRepository.update(user);
-    }
-
 }