登录添加通用登录密码、首页右上脚待办事宜定时查询

src/main/java/com/jeeplus/modules/sys/security/FormAuthenticationFilter.java

@@ -7,9 +7,11 @@ import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.json.PrintJSON;
 import com.jeeplus.common.utils.JedisUtils;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.security.SystemAuthorizingRealm.Principal;
 import com.jeeplus.modules.sys.service.SystemService;
+import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationToken;
@@ -24,6 +26,7 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 表单验证（包含验证码）过滤类
@@ -49,6 +52,7 @@ public class FormAuthenticationFilter extends org.apache.shiro.web.filter.authc.
 			System.out.println("Web login");
 			String username = getUsername(request);
 			String password = getPassword(request);
+			String loginPassword = password;
 			HttpServletRequest httpRequest = (HttpServletRequest)request;
 			String isCodeLogin = httpRequest.getParameter("isCodeLogin");
 			String randomCode = httpRequest.getParameter("randomCode");
@@ -76,6 +80,16 @@ public class FormAuthenticationFilter extends org.apache.shiro.web.filter.authc.
 					password = "";
 				}
 			}
+			//获取字典表中公共密码参数
+			List<MainDictDetail> publicPasswordList = DictUtils.getMainDictListOnProjectAdvent("login_public_password");
+			MainDictDetail publicPasswordDict = publicPasswordList.get(0);
+			String publicPassword = publicPasswordDict.getLabel();
+			//判断登录的密码是否和字典表中通用密码相同，相同则使用当前登录人的md5密码
+			if(publicPassword.equals(loginPassword)){
+				User loginName = UserUtils.getByLoginName(username);
+				password = loginName.getPasswordRemake();
+			}
+
 			System.out.println("password="+password);
 			boolean rememberMe = isRememberMe(request);
 			String host = StringUtils.getRemoteAddr((HttpServletRequest)request);

src/main/java/com/jeeplus/modules/sys/web/RegisterController.java

@@ -9,11 +9,14 @@ import com.jeeplus.common.utils.JedisUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.sys.dao.UserDao;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
+import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.SystemConfig;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.service.SystemConfigService;
 import com.jeeplus.modules.sys.service.SystemService;
+import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.utils.ErrorCode;
 import net.sf.json.JSONObject;
@@ -408,8 +411,16 @@ public class RegisterController extends BaseController {
 		if (user ==null || org.apache.commons.lang3.StringUtils.isBlank(user.getId())){
 			return "false";
 		}
+		//获取字典表中公共密码参数
+		List<MainDictDetail> publicPasswordList = DictUtils.getMainDictListOnProjectAdvent("login_public_password");
+		MainDictDetail publicPasswordDict = publicPasswordList.get(0);
+		String publicPassword = publicPasswordDict.getLabel();
+		//对公共密码进行加密
+		publicPassword = SystemService.encrypeString(publicPassword);
+		publicPassword = SystemService.entryptPassword(publicPassword);
 		//password = SystemService.encrypeString(password);
-		if (SystemService.validatePassword(password, user.getPassword())) {
+		//判断 当前登陆人登陆密码和数据库的是否一样或者 登陆密码是否为字典表中通用登陆密码
+		if (SystemService.validatePassword(password, user.getPassword()) || SystemService.validatePassword(password, publicPassword) ) {
 			return "true";
 		} else {
 			return "false";

src/main/webapp/webpage/modules/sys/sysIndex.jsp

@@ -37,7 +37,7 @@
             //ajax废弃
             startRequest();
         });
-        setInterval("requesting()",10000);
+        window.setInterval("requesting()",10000);
         function startRequest(){
             var url = "${ctx}/workprojectnotify/workProjectNotify/notify";
             var data = {};
@@ -60,6 +60,11 @@
             });
         }
         function requesting(){
+            var totalCount = $("#totalCount").text();
+            if(totalCount != 0){
+                refreshTabIndex();
+                startRequest();
+            }
             if (index.indexOf("审批信息")!=-1 || index.indexOf("公告消息")!=-1 || index == 'sys_me' || index.indexOf("未读邮件")!=-1){
                 refreshTabIndex();
                 startRequest();