diff --git a/doc/api.md b/doc/api.md index e627bd707bb89c0b58d44a92117d527fce9baa1d..441f40a1fa276d9b9eac3ab7f9601c0a48166c5c 100644 --- a/doc/api.md +++ b/doc/api.md @@ -17,7 +17,7 @@ arrays|鏁扮粍绫诲瀷|[{"name":"zhang3"},{"name":"zhang2"}] ## 绯荤粺鏈嶅姟 ### 鐧诲綍 -**璇锋眰URL:** office/login/login +**璇锋眰URL:** study/login/login **璇锋眰鏂瑰紡:** POST diff --git a/study-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java b/study-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java index 2ec00ed2b410dc11530c7a96b7b8813636e88d42..8a08f00e39177ecb0df09e0527d996145983082b 100644 --- a/study-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java +++ b/study-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java @@ -6,13 +6,11 @@ import com.mortals.framework.ap.CookieService; import com.mortals.framework.ap.GlobalSysInfo; import com.mortals.framework.ap.SysConstains; import com.mortals.framework.common.Rest; +import com.mortals.framework.exception.AppException; import com.mortals.framework.service.IAuthTokenService; import com.mortals.framework.service.ICacheService; import com.mortals.framework.service.IUser; -import com.mortals.framework.util.AESUtil; -import com.mortals.framework.util.DateUtils; -import com.mortals.framework.util.HttpUtil; -import com.mortals.framework.util.StringUtils; +import com.mortals.framework.util.*; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.xhx.base.system.menu.model.MenuEntity; import com.mortals.xhx.base.system.menu.service.MenuService; @@ -272,4 +270,12 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi } return null; } + + public static void main(String[] args) { + try { + System.out.println(SecurityUtil.md5DoubleEncoding("123qwe")); + } catch (Exception e) { + throw new AppException("瀵嗙爜杞崲寮傚父"); + } + } } diff --git a/study-manager/src/main/java/com/mortals/xhx/daemon/task/UserSyncTaskImpl.java b/study-manager/src/main/java/com/mortals/xhx/daemon/task/UserSyncTaskImpl.java index 8fe8af1a11fc2440e8b6822847361bb357ae562c..e65bc556df57be6e68ef9b671dd0d720587f3954 100644 --- a/study-manager/src/main/java/com/mortals/xhx/daemon/task/UserSyncTaskImpl.java +++ b/study-manager/src/main/java/com/mortals/xhx/daemon/task/UserSyncTaskImpl.java @@ -7,6 +7,7 @@ import com.mortals.framework.exception.AppException; import com.mortals.framework.service.ITask; import com.mortals.framework.service.ITaskExcuteService; import com.mortals.framework.util.HttpUtil; +import com.mortals.framework.util.SecurityUtil; import com.mortals.xhx.base.system.role.model.RoleUserQuery; import com.mortals.xhx.base.system.role.service.RoleUserService; import com.mortals.xhx.base.system.user.model.UserEntity; @@ -104,10 +105,14 @@ public class UserSyncTaskImpl implements ITaskExcuteService { userEntity.setRealName(user.getUser_name()); userEntity.setMobile(user.getMobile()); userEntity.setUserType(user.getType()); - userEntity.setLoginPwd(user.getPassword()); + try { + userEntity.setLoginPwd(SecurityUtil.md5DoubleEncoding(user.getPassword())); + } catch (Exception e) { + } userEntity.setUpdateUserId(1L); userEntity.setUpdateTime(new Date()); - userService.update(userEntity); + userService.getUserDao().update(userEntity); + //userService.update(userEntity); //鍒ゆ柇瑙掕壊鏄惁鏇存柊锛屽鏋滄洿鏂颁簡 鍒欐洿鏂拌鑹叉潈闄�