修改人员学习

doc/api.md

@@ -17,7 +17,7 @@ arrays|数组类型|[{"name":"zhang3"},{"name":"zhang2"}]
 ## 系统服务
 ### 登录
 
-**请求URL:** office/login/login
+**请求URL:** study/login/login
 
 **请求方式:** POST
 

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("密码转换异常");
+        }
+    }
 }

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);
 
                         //判断角色是否更新，如果更新了 则更新角色权限