diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 839bc4d..e79d19c 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -13,7 +13,7 @@
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="zhyw" options="-extdirs D:\Java\program\newProgram\zhyw/src/web/web/WEB-INF/lib/lib" />
+      <module name="zhyw" options="-extdirs {basedir}\web\WEB-INF\lib\lib" />
     </option>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 1fbd3fb..da02453 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -5,6 +5,7 @@
     <file url="file://$PROJECT_DIR$/src/main/java/com/zky/bjca/cert/service/impl/TdBjcaServiceImpl.java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/java/com/zky/zhyw/smsj/WorkDB.java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/java/com/zky/zhyw/smtj/pxtj/TrainTjManageServlet.java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/web/help/help_bmj.htm" charset="GBK" />
     <file url="file://$PROJECT_DIR$/web/myjs/popCal.js" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/web/zhyw/smwj/wjff/debug.html" charset="UTF-8" />
     <file url="PROJECT" charset="UTF-8" />
diff --git a/.idea/projectInfo.xml b/.idea/projectInfo.xml
index 41767e8..3e8295d 100644
--- a/.idea/projectInfo.xml
+++ b/.idea/projectInfo.xml
@@ -10,18 +10,13 @@
         <option value="Maven: javax.servlet:javax.servlet-api:4.0.1" />
         <option value="aopalliance-1.0" />
         <option value="Maven: com.google.code.gson:gson:2.10.1" />
-        <option value="commons-logging-1.2 (3)" />
         <option value="Maven: com.fasterxml.jackson.core:jackson-databind:2.16.1" />
         <option value="Maven: com.fasterxml.jackson.core:jackson-core:2.16.1" />
-        <option value="commons-logging-1.2 (4)" />
         <option value="Maven: com.fasterxml.jackson.core:jackson-annotations:2.16.1" />
-        <option value="nls_charset11" />
         <option value="Maven: com.alibaba:fastjson:1.2.71" />
-        <option value="rt" />
         <option value="Maven: cn.com.kingbase:kingbase8:8.6.0" />
-        <option value="commons-logging-1.2 (5)" />
-        <option value="commons-logging-1.2 (6)" />
-        <option value="commons-logging-1.2 (7)" />
+        <option value="aopalliance-1.0 (4)" />
+        <option value="aopalliance-1.0 (3)" />
       </list>
     </option>
     <option name="projectName" value="zhyw" />
diff --git a/README/Statement b/README/Statement
index 5ec6998..2a74f86 100644
--- a/README/Statement
+++ b/README/Statement
@@ -1,5 +1,5 @@
 *注：SM4为对称加密算法，常用来做敏感数据的加解密以及MAC算法进行数据完整性保护等场景。
-加入国密算法（SM4）的内容：
+加入国密算法(SM4）的内容：
     1.涉密人员培训----地址
     2.涉密人员离职----离职原因
     3.涉密网络登记----网络名称
diff --git a/pom.xml b/pom.xml
index c105036..a1a1422 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,8 @@
             <artifactId>kingbase8</artifactId>
             <version>8.6.0</version>
         </dependency>
+
+
     </dependencies>
 
     <build>
@@ -75,8 +77,8 @@
                     <target>1.8</target>
                     <encoding>UTF-8</encoding>
                     <compilerArguments>
-                        <extdirs>${basedir}/src/web/web/WEB-INF/lib</extdirs>
-                        <extdirs>${basedir}/src/web/web/WEB-INF/lib/lib</extdirs>
+                        <extdirs>{basedir}\web\WEB-INF\lib</extdirs>
+                        <extdirs>{basedir}\web\WEB-INF\lib\lib</extdirs>
                     </compilerArguments>
                 </configuration>
             </plugin>
diff --git a/src/main/java/com/zky/manager/Login.java b/src/main/java/com/zky/manager/Login.java
index 9be0e90..20b463d 100644
--- a/src/main/java/com/zky/manager/Login.java
+++ b/src/main/java/com/zky/manager/Login.java
@@ -1,6 +1,14 @@
 
 package com.zky.manager;
 
+import com.zky.pub.Common;
+import com.zky.pub.DbConn;
+import com.zky.pub.HashFmlBuf;
+import com.zky.util.jdbc.HashFmlBufResultSetHandler;
+import com.zky.util.jdbc.JDBCUtils;
+import org.apache.log4j.Logger;
+
+import javax.servlet.http.HttpServletRequest;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -8,13 +16,6 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
-import com.zky.pub.Common;
-import com.zky.pub.DbConn;
-import com.zky.pub.HashFmlBuf;
-import com.zky.util.jdbc.HashFmlBufResultSetHandler;
-import com.zky.util.jdbc.JDBCUtils;
 /**
 功能：
 1、验证口令 checkPwd
@@ -71,6 +72,7 @@ public class Login {
 
     public HashFmlBuf para_menu;
 
+    public String loginresult = null;
     public Login() {
         para_menu = new HashFmlBuf();
     }
@@ -381,6 +383,10 @@ public class Login {
     public int checkPwd(String emppwd, HashFmlBuf para_out) {
         //清除输出缓冲区中的数据
         para_out.finit();
+        int j = 0;
+        ResultSet rs;
+        Connection conn = null;
+        PreparedStatement prep = null;
 
         //比较口令是否校验成功
         if (encrypt_optr_password(emppwd).equals(this.emppwd) && certid.equals(this.certid)) {
@@ -400,6 +406,7 @@ public class Login {
         } else if(!encrypt_optr_password(emppwd).equals(this.emppwd)){
             para_out.fchg("CHECKTAG", 0, "00002");
             para_out.fchg("ERRORINFO", 0, "您输入的登录密码不正确!");
+
             return -1;
         } else {
             para_out.fchg("ERRORINFO", 0, "您的UKEY登录信息不正确!");
@@ -408,10 +415,7 @@ public class Login {
         
 		//判断岗位是否存在
         //根据工号查询表 tab_empdept 获取部门
-        int j = 0;
-        ResultSet rs;
-        Connection conn = null;
-        PreparedStatement prep = null;
+
         String sql = "select b.frameworkid,b.parentdeptid,b.areaid,b.departid,b.acptsiteid,b.departname,b.departtypeid,a.jobcode,a.emppro ,a.DEPARTLVLID adjustlvlid, b.DEPARTLVLID lvlid from tab_empdept a,tab_department b where a.departid=b.departid and a.empid = ?";
 
         try {
@@ -494,6 +498,7 @@ public class Login {
 
         //表示用户身份验证通过
         passtag = "1";
+
         return 0;
 
     }
@@ -782,10 +787,11 @@ public class Login {
     public void loginLog(HttpServletRequest request) {
     	Login login = (Login) request.getSession().getAttribute("login");
         String ipAddr = request.getRemoteAddr();
-        ipAddr = "BMXT:"+ipAddr;;
+        ipAddr = "BMXT:"+ipAddr;
+        loginresult = "登录成功!";
         Connection conn = null;
         PreparedStatement prep= null;
-        String sql = "insert into tf_l_logonlog (IPADDR,OPTRID,ACPTSITEID,LOGONTIME) values(?,?,?,now())";
+        String sql = "insert into tf_l_logonlog (IPADDR,OPTRID,ACPTSITEID,LOGONTIME,LOGINRESULT) values(?,?,?,now(),?)";
         try {
             conn = DbConn.getConn();
             conn.setAutoCommit(true);
@@ -793,6 +799,7 @@ public class Login {
             prep.setString(1,ipAddr);
             prep.setString(2,login.getEmpname());
             prep.setString(3,login.getDepartname());
+            prep.setString(4,loginresult);
             prep.executeUpdate();
         } catch (Exception e) {
         }finally{
@@ -804,6 +811,40 @@ public class Login {
             }
         }
     }
+
+
+    public void loginLogfalse(HttpServletRequest request) {
+        Login login = (Login) request.getSession().getAttribute("login");
+        String ipAddr = request.getRemoteAddr();
+        ipAddr = "BMXT:"+ipAddr;
+        loginresult = "登陆失败！";
+        Connection conn = null;
+        PreparedStatement prep= null;
+        String sql = "insert into tf_l_logonlog (IPADDR,OPTRID,ACPTSITEID,LOGONTIME,LOGINRESULT) values(?,?,?,now(),?)";
+        try {
+            conn = DbConn.getConn();
+            conn.setAutoCommit(true);
+            prep = conn.prepareStatement(sql);
+            prep.setString(1,ipAddr);
+            prep.setString(2,login.getEmpname());
+            prep.setString(3,login.getDepartname());
+            prep.setString(4,loginresult);
+            prep.executeUpdate();
+        } catch (Exception e) {
+        }finally{
+            try{
+                if (prep != null) prep.close();
+                if (conn != null) conn.close();
+
+            }catch(Exception e){
+            }
+        }
+    }
+
+
+
+
+
     public void operateLog(HttpServletRequest request,String menugn) {
         String ipAddr = request.getRemoteAddr();
         ipAddr = "BMXT"+ipAddr;
diff --git a/src/main/java/com/zky/manager/LoginServlet.java b/src/main/java/com/zky/manager/LoginServlet.java
index 6066c42..403b77d 100644
--- a/src/main/java/com/zky/manager/LoginServlet.java
+++ b/src/main/java/com/zky/manager/LoginServlet.java
@@ -1,17 +1,21 @@
 
 package com.zky.manager;
 
-import java.io.IOException;
-import java.net.URLEncoder;
-import javax.servlet.ServletException;
-import javax.servlet.http.*;
-
-import org.apache.log4j.Logger;
-import com.zky.pub.*;
-import com.zky.util.*;
+import com.zky.pub.DbConn;
+import com.zky.pub.HashFmlBuf;
+import com.zky.util.PageQuery;
 import com.zky.util.jdbc.HashFmlBufResultSetHandler;
+import org.apache.log4j.Logger;
 
-import java.sql.*;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.sql.Connection;
+import java.sql.SQLException;
 
 /**
  * @author luoluo
@@ -45,6 +49,7 @@ public class LoginServlet extends HttpServlet {
         	url = "../login.jsp?type=relogin&errorinfo="+URLEncoder.encode("验证码不正确,请重新输入!", "utf-8");
             response.sendRedirect(url);
             session.setAttribute("obj", obj);
+
         }
         String departid = request.getParameter("departid");
         //sss
@@ -115,6 +120,7 @@ public class LoginServlet extends HttpServlet {
                 session.setAttribute("login", login_obj);
                 // 调用方法验证口令
                 para_out.finit();
+
                 login_obj.checkPwd(emppwd, para_out);
                 //login_obj.checkPwd(emppwd, para_out);
 
@@ -196,7 +202,7 @@ public class LoginServlet extends HttpServlet {
 				
 				if (versionOfJxc != null && versionOfJxc.equals("1")) {
                     response.sendRedirect("../index.jsp");
-                } else  { 
+                } else  {
                     //根据分辨率转换
                     if (fbl != null && fbl.equals("1024")) {
                         response.sendRedirect("../indexFor1024.jsp");
@@ -205,7 +211,8 @@ public class LoginServlet extends HttpServlet {
                     }
                 }
             } else { //菜单获取失败
-            	
+                login_obj.loginLogfalse(request);
+
 				errorinfo = para_out.fget("ERRORINFO", 0);
 				url = "../login.jsp?type=relogin&errorinfo=" + URLEncoder.encode(errorinfo,"utf-8");
 				response.sendRedirect(url);
diff --git a/src/main/java/com/zky/manager/LogonLogServlet.java b/src/main/java/com/zky/manager/LogonLogServlet.java
index 8cb311c..943d6f6 100644
--- a/src/main/java/com/zky/manager/LogonLogServlet.java
+++ b/src/main/java/com/zky/manager/LogonLogServlet.java
@@ -1,18 +1,19 @@
 
 package com.zky.manager;
 
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
 import com.zky.pub.Common;
 import com.zky.pub.DbConn;
 import com.zky.pub.DispatchServlet;
 import com.zky.pub.HashFmlBuf;
 import com.zky.util.PageQuery;
 import com.zky.util.jdbc.HashFmlBufResultSetHandler;
+import org.apache.log4j.Logger;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.SQLException;
 
 /**
  * @author dy
@@ -28,7 +29,7 @@ public class LogonLogServlet extends DispatchServlet {
         String empidbegindate  = request.getParameter("begindate");
         String empidenddate    = request.getParameter("enddate");
         
-        StringBuffer sql = new StringBuffer("select  a.optrid,a.acptsiteid ,c.empid,c.empname,a.ipaddr,a.logontime, b.departid, b.departname  from tf_l_logonlog a left join tab_department b "
+        StringBuffer sql = new StringBuffer("select  a.optrid,a.acptsiteid ,c.empid,c.empname,a.ipaddr,a.logontime,a.loginresult,    b.departid, b.departname  from tf_l_logonlog a left join tab_department b "
         		+ "on a.acptsiteid=b.departname left join tab_employee c on a.optrid=c.empname  where 1=1 order by logontime desc");
         if (!Common.isNull(empid)) {
             sql.append(" and a.optrid like '%" + empid + "%'");
diff --git a/src/main/java/com/zky/manager/Operate.java b/src/main/java/com/zky/manager/Operate.java
index bff40c5..7f95bce 100644
--- a/src/main/java/com/zky/manager/Operate.java
+++ b/src/main/java/com/zky/manager/Operate.java
@@ -1,19 +1,10 @@
 package com.zky.manager;
 
+import com.zky.pub.DbConn;
+
+import javax.servlet.http.HttpServletRequest;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
-import com.zky.pub.Common;
-import com.zky.pub.DbConn;
-import com.zky.pub.HashFmlBuf;
-import com.zky.util.jdbc.HashFmlBufResultSetHandler;
-import com.zky.util.jdbc.JDBCUtils;
 
 public class Operate {
 	// 涉密人员查询
@@ -237,6 +228,40 @@ public class Operate {
 		}
 	}
 
+	// 涉密人员培训
+	public void operatesmrytjLog(HttpServletRequest request) {
+		Login login = (Login) request.getSession().getAttribute("login");
+		String ipAddr = request.getRemoteAddr();
+		ipAddr = "BMXT" + ipAddr;
+		Connection conn = null;
+		PreparedStatement prep = null;
+		String sql = "insert into tf_l_operaelog (IPADDR,OPTRID,OPERAESITEID,OPERAEMENUITEM,OPERAEGN,OPERAETIME) values(?,?,?,'涉密人员登记','登记',now())";
+
+		try {
+			conn = DbConn.getConn();
+			conn.setAutoCommit(true);
+			prep = conn.prepareStatement(sql);
+			prep.setString(1, ipAddr);
+
+			prep.setString(2, login.getDepartname());
+
+			prep.setString(3, login.getEmpname());
+
+			prep.executeUpdate();
+		} catch (Exception e) {
+		} finally {
+			try {
+				if (prep != null)
+					prep.close();
+				if (conn != null)
+					conn.close();
+			} catch (Exception e) {
+			}
+		}
+	}
+
+
+
 	// 涉密人员培训修改
 	public void operatesmrypxxgLog(HttpServletRequest request) {
 		Login login = (Login) request.getSession().getAttribute("login");
diff --git a/src/main/java/com/zky/zhyw/smry/EmpManageServlet.java b/src/main/java/com/zky/zhyw/smry/EmpManageServlet.java
index 9ef2556..5193d8e 100644
--- a/src/main/java/com/zky/zhyw/smry/EmpManageServlet.java
+++ b/src/main/java/com/zky/zhyw/smry/EmpManageServlet.java
@@ -160,10 +160,14 @@ public class EmpManageServlet extends DispatchServlet {
                     .append("a.examintname,a.examintstate,a.examinttime,a.updatedepartment,a.updateuserid,a.examintdepartment,")
                     .append("a.updatedate,a.radioresult from tab_employee a  where 1=1");
                 conn = DbConn.getConn();
+
                 PageQuery pageQuery = new PageQuery(conn,sql1.toString(),new HashFmlBufResultSetHandler(),request);
     			HashFmlBuf buf=(HashFmlBuf)pageQuery.query(1000);		
                 request.setAttribute("employee_info",buf);
                 request.getRequestDispatcher("/zhyw/smry/rydj/EmpManage.jsp").forward(request,response);
+
+            Operate oper=new Operate();
+            oper.operatesmrytjLog(request);
         } catch (SQLException e) {
             String errorinfo = "";
             if (e.getMessage().startsWith("ORA-00001")) {
diff --git a/src/main/java/com/zky/zhyw/smwj/FileProvideManageServlet.java b/src/main/java/com/zky/zhyw/smwj/FileProvideManageServlet.java
index 956fd7b..6518aa2 100644
--- a/src/main/java/com/zky/zhyw/smwj/FileProvideManageServlet.java
+++ b/src/main/java/com/zky/zhyw/smwj/FileProvideManageServlet.java
@@ -1,4 +1,22 @@
 package com.zky.zhyw.smwj;
+
+import com.zky.manager.Login;
+import com.zky.manager.Operate;
+import com.zky.manager.StudentPullulate;
+import com.zky.pojo.FileInfo;
+import com.zky.pub.Common;
+import com.zky.pub.DbConn;
+import com.zky.pub.DispatchServlet;
+import com.zky.pub.HashFmlBuf;
+import com.zky.util.PageQuery;
+import com.zky.util.jdbc.HashFmlBufResultSetHandler;
+import com.zky.util.jdbc.JDBCUtils;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -12,22 +30,6 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import com.zky.manager.Login;
-import com.zky.manager.Operate;
-import com.zky.manager.StudentPullulate;
-import com.zky.pojo.FileInfo;
-import com.zky.pub.Common;
-import com.zky.pub.DbConn;
-import com.zky.pub.DispatchServlet;
-import com.zky.pub.HashFmlBuf;
-import com.zky.util.PageQuery;
-import com.zky.util.jdbc.HashFmlBufResultSetHandler;
-import com.zky.util.jdbc.JDBCUtils;
 
 public class FileProvideManageServlet extends DispatchServlet {
 Connection conn,conn1;
diff --git a/src/test/java/kingbase8test.java b/src/test/java/kingbase8test.java
index c334489..54bbe91 100644
--- a/src/test/java/kingbase8test.java
+++ b/src/test/java/kingbase8test.java
@@ -1,15 +1,9 @@
 
-package org.apache.dolphinscheduler.dao.utils;
 
 
 import com.zky.zhyw.smtj.Jdbc;
 
 import java.sql.*;
-
-    /**
-     * @author wx
-     * @create  2022-02-14 16:12
-     */
 public class kingbase8test {
 
     public PreparedStatement pst = null;
diff --git a/web/auth.jsp b/web/auth.jsp
index bbeac10..513e2c3 100644
--- a/web/auth.jsp
+++ b/web/auth.jsp
@@ -12,7 +12,7 @@
     if(login_obj == null) {
         ls_url1 = "/error.jsp?errorinfo=" + "<table><tr><td><font size='3' color='red'>"+Common.toGb("您尚未登录或已经过期！")+"</font></td></tr><tr><td align='center'> <a href='/login.jsp' target='_parent'>"+Common.toGb("重新登录")+"</a></td></tr></table>";
         //outstr1 = new String(ls_url1.getBytes("gb2312"),"iso8859-1");
-        outstr1 = Common.GbConvertIso(ls_url1);
+        outstr1 = ls_url1;
         response.sendRedirect(outstr1);
         return;
     }
@@ -21,7 +21,7 @@
     if(login_obj.checkPasstag() == false) {
         ls_url1 = "/error.jsp?errorinfo=" + Common.toGb("您没有成功登录！")+"<br> <a href='/login.jsp' target='_parent'>"+Common.toGb("重新登录")+"</a>";
         //outstr1 = new String(ls_url1.getBytes("gb2312"),"iso8859-1");
-        outstr1 = Common.GbConvertIso(ls_url1);
+        outstr1 = ls_url1;
         response.sendRedirect(outstr1);
         return;
     }
diff --git a/web/chg_pwd.jsp b/web/chg_pwd.jsp
index 15a50fb..a786316 100644
--- a/web/chg_pwd.jsp
+++ b/web/chg_pwd.jsp
@@ -2,6 +2,16 @@
 <%@ page language="java" pageEncoding="utf-8" %>
 
 <script>
+	function validateInput() {
+		var inputValue = document.getElementById('newpassword').value;
+		var pattern = /^(?=.*[0-9])(?=.*[a-zA-Z])(?=.*[!@#$%^&*]).{8,}$/;
+
+		if (!pattern.test(inputValue)) {
+			alert('密码必须包含至少一个大写字母、一个小写字母、一个特殊字符和8个或更多字符。');
+			return false;
+		}
+		return true;
+	}
 	function check()
 	{
 		if(document.form1.old_pwd.value == null || document.form1.old_pwd.value == "")
@@ -11,6 +21,14 @@
 			return false;
 		}
 
+		var inputValue = document.getElementById('newpassword').value;
+		var pattern = /^(?=.*[0-9])(?=.*[a-zA-Z])(?=.*[!@#$%^&*]).{8,}$/;
+
+		if (!pattern.test(inputValue)) {
+			alert('密码必须包含至少一个大写字母、一个小写字母、一个特殊字符和8个或更多字符。');
+			return false;
+		}
+
 		if(document.form1.new_pwd.value == null || document.form1.new_pwd.value == "")
 		{
 			alert("新登录口令不能为空!");
@@ -33,17 +51,21 @@
 			return false;
 		}
 		if(document.form1.old_pwd.value ==document.form1.new_pwd.value ){
-			
-			if (!confirm("新口令和旧口令相同是否要修改？")) {
+				alert("新登录口令不能与原登录口令相同!")
 				return false;
-			}
 		}
 		if (!confirm("你确定要修改密码吗？")) {
 			return false;
 		}
-        form1.submit();		
+        form1.submit();
+
 		return true;
+
+	}
+	function settimeout(){
+		window.location = "/index.jsp";
 	}
+
 	function aut()
 	{
 		if(document.form1.new_pwd.value.length == 0) return;
@@ -56,6 +78,10 @@
 			document.form1.au_pwd.focus();
 		}
 	}
+
+
+
+
 </script>
 <html>
 <link href="/css/font.css" rel="stylesheet" type="text/css">
@@ -103,7 +129,7 @@ body {
         </tr>
       </table>                     
 	<p align="center"><font size="2" color='red'>(如果是默认口令在办理业务的时候会自动切换到该页面，请务必修改口令)</font></p>
-	<form name="form1" action="/chg_pwd.jsp" method="post" >
+	<form name="form1" action="/chg_pwd.jsp" method="post"  >
    <table width="90%"  border="0" align="center" cellpadding="2" cellspacing="1" bgcolor="d8e9fe" class="table02">
       	   <tr bgcolor="#FFFFFF">
 				<td  class="cell1">
@@ -118,7 +144,7 @@ body {
 					新口令
 				</td>
 				<td class="cell2">
-					<input name='new_pwd' type="password" maxlength="10">
+					<input name='new_pwd' id="newpassword" type="password" maxlength="10">
 				</td>
 			</tr>
 			<tr bgcolor="#FFFFFF">
@@ -135,6 +161,8 @@ body {
 			<tr>
 				<td align='center'>
 					<input  class="box_button" type="button" name="button"  value=" 确定 "  onclick="return check();">
+
+					<input  class="box_button" type="reset" name="reset"  value=" 返回 "  onclick="settimeout();">
 				</td>
 			</tr>
 		</table>
@@ -162,6 +190,7 @@ body {
 		{
 
 			out.println("<font color='blue'>修改口令成功" + "</font>");
+			out.println("<font color='blue'>系统将在7天后提醒你修改密码！" + "</font>");
 			//login_obj.optrpwd = login_obj.encrypt_optr_password(ls_newpwd);
 			//session.setAttribute("login",login_obj);
 		}
diff --git a/web/images/input.css b/web/images/input.css
index cf0fdd2..5d25135 100644
--- a/web/images/input.css
+++ b/web/images/input.css
@@ -23,22 +23,22 @@ A:link {
 	BACKGROUND-COLOR: #c4d8be
 }
 .button1 {
-	BORDER-RIGHT: #665b8e 1px solid; BORDER-TOP: #ffffff 1px solid; FONT-SIZE: 12px; BORDER-LEFT: #ffffff 1px solid; COLOR: #000000; BORDER-BOTTOM: #665b8e 1px solid; FONT-FAMILY: "MS Shell Dlg", "����"; HEIGHT: 18px; BACKGROUND-COLOR: #ff9900
+	BORDER-RIGHT: #665b8e 1px solid; BORDER-TOP: #ffffff 1px solid; FONT-SIZE: 12px; BORDER-LEFT: #ffffff 1px solid; COLOR: #000000; BORDER-BOTTOM: #665b8e 1px solid; FONT-FAMILY: "MS Shell Dlg", "����"; HEIGHT: 18px; BACKGROUND-COLOR: #ff9900
 }
 .editbox1 {
-	BORDER-RIGHT: #000000 1px solid; PADDING-RIGHT: 1px; BORDER-TOP: #000000 1px solid; PADDING-LEFT: 1px; FONT-SIZE: 12px; PADDING-BOTTOM: 1px; BORDER-LEFT: 1px solid; COLOR: #000000; PADDING-TOP: 1px; BORDER-BOTTOM: #000000 1px solid; FONT-FAMILY: "MS Shell Dlg","����"; HEIGHT: 18px; BACKGROUND-COLOR: #fefefe
+	BORDER-RIGHT: #000000 1px solid; PADDING-RIGHT: 1px; BORDER-TOP: #000000 1px solid; PADDING-LEFT: 1px; FONT-SIZE: 12px; PADDING-BOTTOM: 1px; BORDER-LEFT: 1px solid; COLOR: #000000; PADDING-TOP: 1px; BORDER-BOTTOM: #000000 1px solid; FONT-FAMILY: "MS Shell Dlg","����"; HEIGHT: 18px; BACKGROUND-COLOR: #fefefe
 }
 .editbox2 {
-	BORDER-RIGHT: #000000 1px solid; PADDING-RIGHT: 1px; BORDER-TOP: #000000 1px solid; PADDING-LEFT: 1px; FONT-SIZE: 12px; PADDING-BOTTOM: 1px; BORDER-LEFT: #000000 1px solid; CURSOR: text; COLOR: #000000; PADDING-TOP: 1px; BORDER-BOTTOM: #000000 1px solid; FONT-FAMILY: "����","MS Shell Dlg"; BACKGROUND-COLOR: #fefefe
+	BORDER-RIGHT: #000000 1px solid; PADDING-RIGHT: 1px; BORDER-TOP: #000000 1px solid; PADDING-LEFT: 1px; FONT-SIZE: 12px; PADDING-BOTTOM: 1px; BORDER-LEFT: #000000 1px solid; CURSOR: text; COLOR: #000000; PADDING-TOP: 1px; BORDER-BOTTOM: #000000 1px solid; FONT-FAMILY: "����","MS Shell Dlg"; BACKGROUND-COLOR: #fefefe
 }
 .editbox3 {
-	BORDER-RIGHT: #000000 1px solid; PADDING-RIGHT: 1px; BORDER-TOP: #000000 1px solid; PADDING-LEFT: 1px; FONT-SIZE: 12px; PADDING-BOTTOM: 1px; BORDER-LEFT: 1px solid; COLOR: #000000; PADDING-TOP: 1px; BORDER-BOTTOM: #000000 1px solid; FONT-FAMILY: "MS Shell Dlg","����"; HEIGHT: 18px; BACKGROUND-COLOR: #dcd8b6
+	BORDER-RIGHT: #000000 1px solid; PADDING-RIGHT: 1px; BORDER-TOP: #000000 1px solid; PADDING-LEFT: 1px; FONT-SIZE: 12px; PADDING-BOTTOM: 1px; BORDER-LEFT: 1px solid; COLOR: #000000; PADDING-TOP: 1px; BORDER-BOTTOM: #000000 1px solid; FONT-FAMILY: "MS Shell Dlg","����"; HEIGHT: 18px; BACKGROUND-COLOR: #dcd8b6
 }
 .editbox5 {
-	BORDER-RIGHT: #3d3e45 1px solid; PADDING-RIGHT: 1px; BORDER-TOP: #3d3e45 1px solid; PADDING-LEFT: 1px; FONT-SIZE: 12px; PADDING-BOTTOM: 1px; BORDER-LEFT: #3d3e45 1px solid; COLOR: #d5d093; PADDING-TOP: 1px; BORDER-BOTTOM: #3d3e45 1px solid; FONT-FAMILY: "MS Shell Dlg","����"; HEIGHT: 18px; BACKGROUND-COLOR: #74788a
+	BORDER-RIGHT: #3d3e45 1px solid; PADDING-RIGHT: 1px; BORDER-TOP: #3d3e45 1px solid; PADDING-LEFT: 1px; FONT-SIZE: 12px; PADDING-BOTTOM: 1px; BORDER-LEFT: #3d3e45 1px solid; COLOR: #d5d093; PADDING-TOP: 1px; BORDER-BOTTOM: #3d3e45 1px solid; FONT-FAMILY: "MS Shell Dlg","����"; HEIGHT: 18px; BACKGROUND-COLOR: #74788a
 }
 .TopicPage {
-	FONT-SIZE: 10.5pt; FONT-FAMILY: "����"; BACKGROUND-COLOR: #ccffff
+	FONT-SIZE: 10.5pt; FONT-FAMILY: "����"; BACKGROUND-COLOR: #ccffff
 }
 A.TopicPage1 {
 	COLOR: #0022ff; TEXT-DECORATION: none
@@ -56,10 +56,10 @@ A.TopicPage1:visited {
 	BORDER-RIGHT: #808080 1px solid; BORDER-TOP: #ffffff 1px solid; FONT-SIZE: 12px; BORDER-LEFT: #ffffff 1px solid; BORDER-BOTTOM: #808080 1px solid; BACKGROUND-COLOR: menu
 }
 TD {
-	FONT-SIZE: 12px; LINE-HEIGHT: 15px; FONT-FAMILY: ����
+	FONT-SIZE: 12px; LINE-HEIGHT: 15px; FONT-FAMILY: ����
 }
 .TD2 {
-	FONT-SIZE: 12px; LINE-HEIGHT: 25px; FONT-FAMILY: ����
+	FONT-SIZE: 12px; LINE-HEIGHT: 25px; FONT-FAMILY: ����
 }
 TH {
 	FONT-WEIGHT: bold; FONT-SIZE: 12px; BACKGROUND-IMAGE: url(../images/bg2.gif); COLOR: white; BACKGROUND-COLOR: #4455aa
@@ -77,7 +77,7 @@ TD.TopDarkNav {
 	BACKGROUND-IMAGE: url(../images/topbg.gif)
 }
 TD.TopLighNav {
-	BACKGROUND-IMAGE: url(../images/bottombg.gif)
+	BACKGROUND-IMAGE: url(/images/bottombg.gif)
 }
 TD.TopLighNav1 {
 	BACKGROUND-IMAGE: url(../images/tabs_m_tile.gif)
@@ -104,13 +104,13 @@ TD.TopLighNav2 {
 	COLOR: #ffffff; TEXT-DECORATION: underline
 }
 INPUT {
-	FONT-SIZE: 12px; LINE-HEIGHT: 15px; FONT-FAMILY: Tahoma,Verdana,����
+	FONT-SIZE: 12px; LINE-HEIGHT: 15px; FONT-FAMILY: Tahoma,Verdana,����
 }
 SELECT {
-	FONT-SIZE: 12px; LINE-HEIGHT: 15px; FONT-FAMILY: Tahoma,Verdana,����
+	FONT-SIZE: 12px; LINE-HEIGHT: 15px; FONT-FAMILY: Tahoma,Verdana,����
 }
 TEXTAREA {
-	FONT-SIZE: 12px; LINE-HEIGHT: 15px; FONT-FAMILY: Tahoma,Verdana,����
+	FONT-SIZE: 12px; LINE-HEIGHT: 15px; FONT-FAMILY: Tahoma,Verdana,����
 }
 .normalTextSmall {
 	FONT-SIZE: 11px; COLOR: #000000; FONT-FAMILY: Verdana, Arial, Helvetica, sans-serif
diff --git a/web/login.jsp b/web/login.jsp
index 66c01ff..2a07353 100644
--- a/web/login.jsp
+++ b/web/login.jsp
@@ -167,7 +167,7 @@ a:visited {
 											<tr>
 												<td height="33" align="right" style="padding-right: 5px">密&nbsp;码:</td>
 												<td colspan="2"><INPUT class=textbox id=txtUserPassword
-													value="123456" type=password name=password datatype="text"
+													value="qwer1234!" type=password name=password datatype="text"
 													size="21" /></td>
 											</tr>
 											<tr>
diff --git a/web/manage/LogonLog.jsp b/web/manage/LogonLog.jsp
index 8f7f243..4b58cc5 100644
--- a/web/manage/LogonLog.jsp
+++ b/web/manage/LogonLog.jsp
@@ -205,6 +205,7 @@ form{
 	    <span width="21px">登录人员姓名</span>
 		<span width="25px">登录单位名称</span>
 		<span width="25px">登录时间</span>
+		<span width="21px">登录结果</span>
 		</div>
         </div>
 		<div class="gridBody"> 
@@ -217,6 +218,7 @@ form{
 	     <span><%=buf.fget("empname",i)%></span>
 		<span  width="25px;"><%=buf.fget("departname",i)%></span>
 		<span  width="25px;"><%=buf.fget("logontime",i)%></span>
+		<span  width="25px;"><%=buf.fget("loginresult",i)%></span>
 		</div>
 <%
 		}
diff --git a/web/web/WEB-INF/lib/rt.jar b/web/web/WEB-INF/lib/rt.jar
new file mode 100644
index 0000000..8e7aa86
Binary files /dev/null and b/web/web/WEB-INF/lib/rt.jar differ
diff --git a/web/web/WEB-INF/web.xml b/web/web/WEB-INF/web.xml
new file mode 100644
index 0000000..d80081d
--- /dev/null
+++ b/web/web/WEB-INF/web.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+         version="4.0">
+</web-app>
\ No newline at end of file