anderx 4 years ago
parent
commit
58223ea71a

+ 0 - 6
src/main/java/com/goafanti/admin/controller/AdminNoticeApiController.java

@@ -26,12 +26,6 @@ public class AdminNoticeApiController extends CertifyApiController{
 	@RequestMapping(value = "/unreadCount", method = RequestMethod.GET)
 	public Result unreadCount(){
 		Result res = new Result();
-		//判断是否锁定,已锁定则删除token
-		if(noticeService.checkLock()) {
-			res.getError().add(buildError("账号已经被锁定"));
-			return res;
-		}
-		
 		res.setData(noticeService.findUnreadNoticeCount());
 		return res;
 	}

+ 0 - 1
src/main/java/com/goafanti/admin/service/NoticeService.java

@@ -11,6 +11,5 @@ public interface NoticeService {
 
 	int findUnreadNoticeCount();
 
-	boolean checkLock();
 
 }

+ 1 - 11
src/main/java/com/goafanti/admin/service/impl/NoticeServiceImpl.java

@@ -78,15 +78,5 @@ public class NoticeServiceImpl extends BaseMybatisDao<NoticeMapper> implements N
 		return noticeMapper.selectUnreadedCount(aid);
 	}
 
-	@Override
-	public boolean checkLock() {
-		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
-			Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
-			if (!"正常".contains(a.getStatus())) {
-				TokenManager.logout();
-				return true;
-			}
-		}
-		return false;
-	}
+
 }

+ 9 - 0
src/main/java/com/goafanti/core/shiro/filter/AdminFilter.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.Result;
+import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.AftUser;
 import com.goafanti.common.utils.LoggerUtils;
@@ -20,6 +21,8 @@ public class AdminFilter extends AccessControlFilter {
 
 	@Autowired
 	private ShiroFilterUtils		shiroFilterUtils;
+	@Autowired
+	private AdminMapper adminMapper;
 
 	@Override
 	protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue)
@@ -27,6 +30,12 @@ public class AdminFilter extends AccessControlFilter {
 
 		AftUser token = TokenManager.getToken();
 		if (token instanceof Admin) {
+			Admin admin=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+			System.out.println(admin.getStatus());
+			if (admin !=null&&admin.getStatus()!=null&&!admin.getStatus().equals("正常")) {
+				shiroFilterUtils.out((HttpServletResponse) response, new Result().error(new Error("", "403", "当前用户已被锁定!")));
+				return Boolean.FALSE;
+			}
 			return Boolean.TRUE;
 		}
 		return Boolean.FALSE;

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -64,12 +64,12 @@ user_remind_days=15
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开�
-static.host=//172.16.0.253/1.1.70
-avatar.host=//172.16.0.253
+#static.host=//172.16.0.253/1.1.70
+#avatar.host=//172.16.0.253
 
-#连测è¯
-#avatar.host=//static.jishutao.com
-#static.host=//static.jishutao.com/1.1.70
+•
+avatar.host=//static.jishutao.com
+static.host=//static.jishutao.com/1.1.70
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload