|
|
@@ -1,17 +1,12 @@
|
|
|
package com.goafanti.common.controller;
|
|
|
|
|
|
-import java.text.DateFormat;
|
|
|
-import java.text.MessageFormat;
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
-
|
|
|
-import javax.annotation.Resource;
|
|
|
-import javax.servlet.http.HttpServletRequest;
|
|
|
-
|
|
|
+import com.goafanti.common.bo.Error;
|
|
|
+import com.goafanti.common.constant.AFTConstants;
|
|
|
+import com.goafanti.common.model.Admin;
|
|
|
+import com.goafanti.common.model.User;
|
|
|
import com.goafanti.common.utils.ParamUtils;
|
|
|
import com.goafanti.common.utils.RedisUtil;
|
|
|
+import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.poi.ss.formula.functions.T;
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
@@ -26,11 +21,12 @@ import org.springframework.web.bind.WebDataBinder;
|
|
|
import org.springframework.web.bind.annotation.InitBinder;
|
|
|
import org.springframework.web.bind.annotation.ModelAttribute;
|
|
|
|
|
|
-import com.goafanti.common.bo.Error;
|
|
|
-import com.goafanti.common.constant.AFTConstants;
|
|
|
-import com.goafanti.common.model.Admin;
|
|
|
-import com.goafanti.common.model.User;
|
|
|
-import com.goafanti.core.shiro.token.TokenManager;
|
|
|
+import javax.annotation.Resource;
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
+import java.text.DateFormat;
|
|
|
+import java.text.MessageFormat;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
+import java.util.Date;
|
|
|
|
|
|
@Controller
|
|
|
public class BaseController {
|
|
|
@@ -145,7 +141,7 @@ public class BaseController {
|
|
|
}
|
|
|
|
|
|
private String getshiroList() {
|
|
|
- String shiroList = redisUtil.getString("shiroList");
|
|
|
+ String shiroList = redisUtil.getString(TokenManager.getAdminId());
|
|
|
if (StringUtils.isBlank(shiroList)){
|
|
|
shiroList=shiroAddRedis();
|
|
|
}
|
|
|
@@ -158,7 +154,7 @@ public class BaseController {
|
|
|
* 8=技术员,9=技术经理,10=技术管理员,11=运营管理,12=总裁助理,13=总裁,14=董事长助理,15=董事长
|
|
|
*/
|
|
|
public String shiroAddRedis() {
|
|
|
- redisUtil.deleteString("shiroList");
|
|
|
+ redisUtil.deleteString(TokenManager.getAdminId());
|
|
|
StringBuffer str=new StringBuffer();
|
|
|
if (TokenManager.hasRole(AFTConstants.SALESMAN))str=str.append(1).append(",");
|
|
|
if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER))str=str.append(2).append(",");
|
|
|
@@ -175,7 +171,9 @@ public class BaseController {
|
|
|
if (TokenManager.hasRole(AFTConstants.CED))str=str.append(13).append(",");
|
|
|
if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT))str=str.append(14).append(",");
|
|
|
if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION))str=str.append(15).append(",");
|
|
|
- if (str.length()<1)return "";
|
|
|
+ if (TokenManager.hasRole(AFTConstants.SUPERADMIN))str=str.append(99).append(",");
|
|
|
+
|
|
|
+ if (str.length()<1)return "0";
|
|
|
String shiroList=str.substring(0,str.length()-1);
|
|
|
redisUtil.setString("shiroList",shiroList);
|
|
|
return shiroList;
|