Browse Source

Merge branch 'test' of jishutao/kede-server into prod

anderx 3 years ago
parent
commit
3b9cf789fa

+ 3 - 2
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -529,7 +529,8 @@
     a.department_id as departmentId,
     a.last_login_time as lastLoginTime,
     a.contact_mobile as contactMobile,
-    a.duty,a.status
+    a.duty,a.status,
+    a.type
     from admin a
     left join admin_location al on a.id = al.admin_id
     left join admin aa on aa.id = a.superior_id
@@ -642,7 +643,7 @@
            a.province, a.`position`,a.reviewer , a.superior_id as superiorId,
            a.department_id as departmentId, a.status,a.user_no as userNo,a.duty,a.district,
            a.head_portrait_url as headPortraitUrl, a.contact_mobile as contactMobile,
-           b.name superior,c.name reviewerName
+           b.name superior,c.name reviewerName,a.type
     from admin a left join admin b on a.superior_id =b.id left join admin c on a.reviewer =c.id
     where a.id= #{id,jdbcType=VARCHAR}
   </select>

+ 14 - 0
src/main/java/com/goafanti/core/shiro/token/TokenManager.java

@@ -162,6 +162,20 @@ public class TokenManager {
 		return (String) getSession().getAttribute(CSRF_TOKEN);
 	}
 
+	/**
+	 * 用户登录
+	 *
+	 * @param user
+	 * @param rememberMe
+	 * @return
+	 */
+	public static User login(User user, Boolean rememberMe) {
+		ShiroToken token = new ShiroToken(user.getMobile(), user.getPassword(), user.getType(),AFTConstants.USER_SOURCE_REGISTER);
+		token.setRememberMe(null == rememberMe ? false : rememberMe);
+		SecurityUtils.getSubject().login(token);
+		setVal2Session(CSRF_TOKEN, UUID.randomUUID().toString().replace("-", ""));
+		return (User) getToken();
+	}
 
 
 	/**