update

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/user/service/UserService.java

@@ -24,4 +24,6 @@ public interface UserService {
 
     User findByMarkerId(Integer markerId);
 
+    User externalSaveAndUpdate(Integer schoolId, String account, String name, String password, Role role);
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/user/service/impl/UserServiceImpl.java

@@ -165,6 +165,14 @@ public class UserServiceImpl implements UserService {
     @Override
     @Transactional
     public User externalLogin(Integer schoolId, String account, String name, String password, Role role) {
+        User user = externalSaveAndUpdate(schoolId, account, name, password, role);
+        user.setLastLoginTime(new Date());
+        user.refreshAccessToken();
+        return userDao.save(user);
+    }
+
+    @Override
+    public User externalSaveAndUpdate(Integer schoolId, String account, String name, String password, Role role) {
         User user = userDao.findFirstBySchoolIdAndRelatedAccount(schoolId, account);
         if (user == null) {
             user = new User();
@@ -185,8 +193,6 @@ public class UserServiceImpl implements UserService {
         if (StringUtils.isNotBlank(password)) {
             user.setPassword(EncryptUtils.md5(password));
         }
-        user.setLastLoginTime(new Date());
-        user.refreshAccessToken();
         return userDao.save(user);
     }
 

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/CoreController.java

@@ -479,7 +479,7 @@ public class CoreController extends BaseApiController {
         return result;
     }
 
-    @RequestMapping(value = "/user/save", method = RequestMethod.POST)
+    @RequestMapping(value = "/user/external/save", method = RequestMethod.POST)
     @ResponseBody
     @RoleRequire({ Role.SCHOOL_ADMIN, Role.SCHOOL_DEV })
     public JSONObject subjectSave(HttpServletRequest request, @RequestParam String account,
@@ -491,7 +491,7 @@ public class CoreController extends BaseApiController {
         account = validate("account", account, true, 32);
         name = validate("name", name, true, 32);
         password = validate("password", password, false, 32);
-        User u = userService.externalLogin(user.getSchoolId(), account, name, password, role);
+        User u = userService.externalSaveAndUpdate(user.getSchoolId(), account, name, password, role);
         if (u.isEnable() != enable) {
             u.setEnable(enable);
             userService.save(u);