|
|
@@ -1,11 +1,8 @@
|
|
|
package com.sckw.core.filter;
|
|
|
|
|
|
-import cn.hutool.core.date.DateUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.sckw.core.model.enums.ApprovalEnum;
|
|
|
import com.sckw.core.model.enums.SystemTypeEnum;
|
|
|
-import com.sckw.core.utils.CollectionUtils;
|
|
|
import com.sckw.core.web.config.CustomConfig;
|
|
|
import com.sckw.core.exception.SystemException;
|
|
|
import com.sckw.core.model.constant.Global;
|
|
|
@@ -14,7 +11,6 @@ import com.sckw.core.utils.StringUtils;
|
|
|
import com.sckw.core.web.constant.HttpStatus;
|
|
|
import com.sckw.core.web.constant.RequestConstant;
|
|
|
import com.sckw.core.web.context.LoginUserHolder;
|
|
|
-import com.sckw.core.web.model.EntCertificateInfo;
|
|
|
import com.sckw.core.web.model.LoginEntInfo;
|
|
|
import com.sckw.core.web.model.LoginUserInfo;
|
|
|
import com.sckw.redis.utils.RedissonUtils;
|
|
|
@@ -114,7 +110,6 @@ public class LoginFilter implements Filter {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
//管理员不限制权限,按钮有权限才放行
|
|
|
if (loginUserInfo.getIsMain() != Global.YES && !checkMenu(systemType + Global.COLON + key, requestUri)) {
|
|
|
LoginUserHolder.remove();
|
|
|
@@ -155,6 +150,7 @@ public class LoginFilter implements Filter {
|
|
|
LoginUserHolder.remove();
|
|
|
throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ENTCERTIFICATES_INVAILD);
|
|
|
}
|
|
|
+ RedissonUtils.putString(Global.REDIS_ENTERPRISE_PREFIX + entId, enterpriseInfo, Global.PC_TOKEN_EXPIRE);
|
|
|
// int approval = loginEntInfo.getApproval();
|
|
|
// if (approval == ApprovalEnum.NO.getCode() || approval == ApprovalEnum.PROCESS.getCode() || approval == ApprovalEnum.PASS.getCode()) {
|
|
|
// LoginUserHolder.remove();
|