diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index 2b587ab..d157836 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -6,6 +6,22 @@
       <synchronize>true</synchronize>
       <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
       <jdbc-url>jdbc:mysql://localhost:3306/orcl</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.host.port" />
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.resource.type" value="Deployment" />
+        <property name="com.intellij.clouds.kubernetes.db.container.port" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+    <data-source source="LOCAL" name="kingbase8 [2]" uuid="966dd824-76e1-4934-93b7-d5d1cb96a50f">
+      <driver-ref>java.sql.Driver</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>com.kingbase8.Driver</jdbc-driver>
+      <jdbc-url>jdbc:kingbase8://192.168.254.197:54321/orcl</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+      </jdbc-additional-properties>
       <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
   </component>
diff --git a/src/main/java/com/zky/manager/MenuManageServlet.java b/src/main/java/com/zky/manager/MenuManageServlet.java
index eaac609..05f155f 100644
--- a/src/main/java/com/zky/manager/MenuManageServlet.java
+++ b/src/main/java/com/zky/manager/MenuManageServlet.java
@@ -95,7 +95,7 @@ public class MenuManageServlet extends DispatchServlet
     String areaid = request.getParameter("areaid");
     MenuTree tree = new MenuTree(companyid, areaid, treeid, treename);
     request.getSession().setAttribute("menu_tree", tree);
-    request.getRequestDispatcher("../manage/MenuEdit.jsp").forward(request, response);
+    request.getRequestDispatcher("/manage/MenuEdit.jsp").forward(request, response);
   }
 
   public void getMenuTree(HttpServletRequest request, HttpServletResponse response) throws Exception {
@@ -171,7 +171,7 @@ public class MenuManageServlet extends DispatchServlet
     if (tree != null) {
       String upMenuId = request.getParameter("upmenuid");
       String menuid = request.getParameter("menuid");
-      String menuName = Common.IsoConvertGb(request.getParameter("menuname"));
+      String menuName = request.getParameter("menuname");
       String type = request.getParameter("type");
       if (upMenuId.equals(tree.getTreeId()))
         tree.addMenu(new MenuBean(menuid, menuName, type));
diff --git a/src/main/resources/system.properties b/src/main/resources/system.properties
index 000a403..e178cd4 100644
--- a/src/main/resources/system.properties
+++ b/src/main/resources/system.properties
@@ -1,5 +1,4 @@
 province.sj=0000
-sjs=
 datasource=java:comp/env/jdbc/orcl
 
 
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index cbcead9..e352da6 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app>
-    <resource-ref>
-        <description>DB Connection</description>
-        <res-ref-name>jdbc/orcl</res-ref-name>
-        <res-type>javax.sql.DataSource</res-type>
-        <res-auth>Container</res-auth>
-    </resource-ref>
+
+
     <display-name>Apache-Axis</display-name>
-    	<filter>
+
+    <context-param>
+        <param-name>weblogic.httpd.inputCharset./*</param-name>
+        <param-value>UTF-8</param-value>
+    </context-param>
+
+
+    <filter>
 		<filter-name>charFilter</filter-name>
 		<filter-class>com.zky.util.CharFilter</filter-class>
 		<init-param>
@@ -20,22 +23,7 @@
 		<filter-name>charFilter</filter-name>
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
-    	<servlet>
-		<servlet-name>validateCode</servlet-name>
-		<servlet-class>com.zky.manager.ValidateCode</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>validateCode</servlet-name>
-		<url-pattern>/auth.jpg</url-pattern>
-	</servlet-mapping>
-    <listener>
-        <listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>  <!-- 配置 AxisHTTPSessionListener监听器-->
-    </listener>
-    <context-param>
-        <param-name>weblogic.httpd.inputCharset./*</param-name>
-        <param-value>UTF-8</param-value>
-    </context-param>
- 
+
   	<filter>
 	    <filter-name>Set Character Encoding</filter-name>
 	    <filter-class>com.zky.pub.SetCharacterEncodingFilter</filter-class>
@@ -53,7 +41,18 @@
 	    <url-pattern>/servlet/*</url-pattern>
   	</filter-mapping>
 
+    <listener>
+        <listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>  <!-- 配置 AxisHTTPSessionListener监听器-->
+    </listener>
 
+    <servlet>
+        <servlet-name>validateCode</servlet-name>
+        <servlet-class>com.zky.manager.ValidateCode</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>validateCode</servlet-name>
+        <url-pattern>/auth.jpg</url-pattern>
+    </servlet-mapping>
     <servlet>
         <servlet-name>ImportExcelServlet</servlet-name>
         <servlet-class>com.zky.manager.ImportExcelServlet</servlet-class>
@@ -164,14 +163,14 @@
         <url-pattern>/servlet/loginServlet</url-pattern>
     </servlet-mapping>
 
-    <servlet>
-        <servlet-name>SelectParaServlet</servlet-name>
-        <servlet-class>com.zky.orcl.para.SelectParaServlet</servlet-class>
-    </servlet>
-	<servlet-mapping>
-        <servlet-name>SelectParaServlet</servlet-name>
-        <url-pattern>/servlet/SelectPara</url-pattern>
-    </servlet-mapping>   
+<!--    <servlet>-->
+<!--        <servlet-name>SelectParaServlet</servlet-name>-->
+<!--        <servlet-class>com.zky.orcl.para.SelectParaServlet</servlet-class>-->
+<!--    </servlet>-->
+<!--	<servlet-mapping>-->
+<!--        <servlet-name>SelectParaServlet</servlet-name>-->
+<!--        <url-pattern>/servlet/SelectPara</url-pattern>-->
+<!--    </servlet-mapping>   -->
     <servlet>
         <servlet-name>FrameworkServlet</servlet-name>
         <servlet-class>com.zky.manager.FrameworkServlet</servlet-class>
@@ -196,22 +195,22 @@
         <servlet-name>ClassManageServlet</servlet-name>
         <url-pattern>/servlet/ClassManage</url-pattern>
     </servlet-mapping>
-    <servlet>
-        <servlet-name>StudentManageServlet</servlet-name>
-        <servlet-class>com.zky.manager.StudentManageServlet</servlet-class>
-    </servlet>
-	<servlet-mapping>
-        <servlet-name>StudentManageServlet</servlet-name>
-        <url-pattern>/servlet/StudentManage</url-pattern>
-    </servlet-mapping>	
-    <servlet>
-        <servlet-name>ClassStuRelationServlet</servlet-name>
-        <servlet-class>com.zky.manager.ClassStuRelationServlet</servlet-class>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>ClassStuRelationServlet</servlet-name>
-        <url-pattern>/servlet/ClassStuRelation</url-pattern>
-    </servlet-mapping> 
+<!--    <servlet>-->
+<!--        <servlet-name>StudentManageServlet</servlet-name>-->
+<!--        <servlet-class>com.zky.manager.StudentManageServlet</servlet-class>-->
+<!--    </servlet>-->
+<!--	<servlet-mapping>-->
+<!--        <servlet-name>StudentManageServlet</servlet-name>-->
+<!--        <url-pattern>/servlet/StudentManage</url-pattern>-->
+<!--    </servlet-mapping>	-->
+<!--    <servlet>-->
+<!--        <servlet-name>ClassStuRelationServlet</servlet-name>-->
+<!--        <servlet-class>com.zky.manager.ClassStuRelationServlet</servlet-class>-->
+<!--    </servlet>-->
+<!--    <servlet-mapping>-->
+<!--        <servlet-name>ClassStuRelationServlet</servlet-name>-->
+<!--        <url-pattern>/servlet/ClassStuRelation</url-pattern>-->
+<!--    </servlet-mapping> -->
     
     <servlet>  
         <servlet-name>CheckCoderTool</servlet-name>  
@@ -232,14 +231,14 @@
         <servlet-name>FileWriteManage</servlet-name>  
         <url-pattern>/servlet/FileWriteManage</url-pattern>  
     </servlet-mapping> 
-    <servlet>
-        	<servlet-name>SupplierManage</servlet-name>
-        	<servlet-class>com.zky.zhyw.gys.SupplierManageServlet</servlet-class>
-    </servlet>
-    <servlet-mapping>
-        	<servlet-name>SupplierManage</servlet-name>
-        	<url-pattern>/servlet/SupplierManage</url-pattern>
-    </servlet-mapping>
+<!--    <servlet>-->
+<!--        	<servlet-name>SupplierManage</servlet-name>-->
+<!--        	<servlet-class>com.zky.zhyw.gys.SupplierManageServlet</servlet-class>-->
+<!--    </servlet>-->
+<!--    <servlet-mapping>-->
+<!--        	<servlet-name>SupplierManage</servlet-name>-->
+<!--        	<url-pattern>/servlet/SupplierManage</url-pattern>-->
+<!--    </servlet-mapping>-->
     <servlet>
         	<servlet-name>ActivitiesApplyManage</servlet-name>
         	<servlet-class>com.zky.zhyw.smhd.ActivitiesApplyServlet</servlet-class>
@@ -321,12 +320,12 @@
          <url-pattern>/servlet/FileReceiveManage</url-pattern>
      </servlet-mapping>
      <servlet>
-         <servlet-name>FileBorrowManage</servlet-name>
-         <servlet-class>com.zky.zhyw.smwj.FileBorrowManageServlet</servlet-class>
+         <servlet-name>FileWriteServlet</servlet-name>
+         <servlet-class>com.zky.zhyw.smwj.FileWriteServlet</servlet-class>
      </servlet>
      <servlet-mapping>
-        <servlet-name>FileBorrowManage</servlet-name>
-        <url-pattern>/servlet/FileBorrowManage</url-pattern>
+        <servlet-name>FileWriteServlet</servlet-name>
+        <url-pattern>/servlet/FileWriteServlet</url-pattern>
      </servlet-mapping>
      <servlet>
          <servlet-name>FileRecoverManage</servlet-name>
@@ -352,32 +351,32 @@
          <servlet-name>FileDestoryManage</servlet-name>
          <url-pattern>/servlet/FileDestoryManage</url-pattern>
      </servlet-mapping>
-       <servlet>
-         <servlet-name>FileTypeQueryManage</servlet-name>
-         <servlet-class>com.zky.zhyw.tjcx.FileQueryManageServlet</servlet-class>
-     </servlet>
-     <servlet-mapping>
-         <servlet-name>FileTypeQueryManage</servlet-name>
-         <url-pattern>/servlet/FileQueryManage</url-pattern>
-     </servlet-mapping>
+<!--       <servlet>-->
+<!--         <servlet-name>FileTypeQueryManage</servlet-name>-->
+<!--         <servlet-class>com.zky.zhyw.tjcx.FileQueryManageServlet</servlet-class>-->
+<!--     </servlet>-->
+<!--     <servlet-mapping>-->
+<!--         <servlet-name>FileTypeQueryManage</servlet-name>-->
+<!--         <url-pattern>/servlet/FileQueryManage</url-pattern>-->
+<!--     </servlet-mapping>-->
        <servlet>
          <servlet-name>PropertyTypeQueryManage</servlet-name>
-         <servlet-class>com.zky.zhyw.tjcx.PropertyQueryManageServlet</servlet-class>
+         <servlet-class>com.zky.zhyw.smsb.PropertyProvideManageServlet</servlet-class>
      </servlet>
      <servlet-mapping>
          <servlet-name>PropertyTypeQueryManage</servlet-name>
          <url-pattern>/servlet/PropertyQueryManage</url-pattern>
      </servlet-mapping>
-     <servlet>   
-  <servlet-name>maskbarcode</servlet-name>   
-  <servlet-class>com.mask.util.barcode.BarCodeServlet</servlet-class>   
-  <load-on-startup>1</load-on-startup>   
-  </servlet>   
- 
-  <servlet-mapping>   
-  <servlet-name>maskbarcode</servlet-name>   
-  <url-pattern>*.bar</url-pattern>   
-  </servlet-mapping>
+<!--     <servlet>   -->
+<!--&lt;!&ndash;  <servlet-name>maskbarcode</servlet-name>   &ndash;&gt;-->
+<!--&lt;!&ndash;  <servlet-class>com.mask.util.barcode.BarCodeServlet</servlet-class>   &ndash;&gt;-->
+<!--  <load-on-startup>1</load-on-startup>   -->
+<!--  </servlet>   -->
+<!-- -->
+<!--  <servlet-mapping>   -->
+<!--  <servlet-name>maskbarcode</servlet-name>   -->
+<!--  <url-pattern>*.bar</url-pattern>   -->
+<!--  </servlet-mapping>-->
     <!-- END -->
    <!-- cxz -->
    <!--begin -->
@@ -534,7 +533,7 @@
     </servlet-mapping> 
    <!-- cxz end -->  
   
-           <servlet>
+   <servlet>
         <servlet-name>ImportPropertyQuestionExcelServlet</servlet-name>
         <servlet-class>com.zky.manager.ImportPropertyQuestionExcelServlet</servlet-class>
     </servlet>
@@ -563,6 +562,10 @@
     </servlet-class>
     <load-on-startup>100</load-on-startup>
   </servlet>
+    <servlet-mapping>
+        <servlet-name>AdminServlet</servlet-name>
+        <url-pattern></url-pattern>
+    </servlet-mapping>
 
 <!-- 配置SOAPMonitorService-->
   <servlet>
@@ -615,7 +618,10 @@
         <session-timeout>5</session-timeout>
     </session-config>
  -->
-    <!-- currently the W3C havent settled on a media type for WSDL;
+    <session-config>
+        <session-timeout>30</session-timeout>
+    </session-config>
+    <!-- currently the W3C  settled on a media type for WSDL;
     http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
     for now we go with the basic 'it's XML' response
     将wsdl文件以XML形式发送到客户端
@@ -634,9 +640,7 @@
 
 <!-- webservice end -->	
 
-	<session-config>
-		<session-timeout>30</session-timeout>
-	</session-config>  
+
     
 	<welcome-file-list>
         <welcome-file>index.html</welcome-file>
@@ -653,6 +657,12 @@
         <taglib-uri>/WEB-INF/tlds/PageLinkTag.xml</taglib-uri>
         <taglib-location>/WEB-INF/tlds/PageLinkTag.xml</taglib-location>
     </taglib>
+    <resource-ref>
+        <description>DB Connection</description>
+        <res-ref-name>jdbc/orcl</res-ref-name>
+        <res-type>javax.sql.DataSource</res-type>
+        <res-auth>Container</res-auth>
+    </resource-ref>
 
 
 </web-app>
\ No newline at end of file
diff --git a/web/zhyw/smry/rydj/EmpManage.jsp b/web/zhyw/smry/rydj/EmpManage.jsp
index 03b5e6f..25ef79d 100644
--- a/web/zhyw/smry/rydj/EmpManage.jsp
+++ b/web/zhyw/smry/rydj/EmpManage.jsp
@@ -226,15 +226,6 @@ td .cell1{
 							<td class="cell2"><input type="text" name="empname"
 								setValue="<%=empname%>" /></td>
 
-							<td class="cell1">UKEY名</td>
-							<td class="cell2"><input type="text" name="certname"
-								 setValue="<%=certname%>" /></td>
-
-							<td class="cell1">UKEY id</td>
-							<td class="cell2"><input type="number" name="certid"
-								 setValue="<%=certid%>" /></td>
-
-
 							<td colspan="2" width="30%"><input name="button1"
 								onclick="check('queryEmp');" border="0" type="image"
 								src="../../../images1/cx.png" /></td>
diff --git a/web/zhyw/smry/rydj/EmpState.jsp b/web/zhyw/smry/rydj/EmpState.jsp
index da61c18..e9cc0fa 100644
--- a/web/zhyw/smry/rydj/EmpState.jsp
+++ b/web/zhyw/smry/rydj/EmpState.jsp
@@ -49,7 +49,7 @@
 			certname         = buf.fget("certname        ",pos);
 			certid         = buf.fget("certid       ",pos);
 			sj              = buf.fget("frameworkid    ",pos);
-			birthday        = Common.convertNull(buf.fget("birthday ",pos)).substring(0,10);
+			birthday        = Common.convertNull(buf.fget("birthday ",pos)).substring(0,9);
 			sex             = buf.fget("sex            ",pos);
 			empcontaddr     = buf.fget("empcontaddr    ",pos);
 			empcontphone    = buf.fget("empcontphone   ",pos);
diff --git a/zhyw.iml b/zhyw.iml
index 4208c56..adac535 100644
--- a/zhyw.iml
+++ b/zhyw.iml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$" dumb="true">
+      <excludeFolder url="file://$MODULE_DIR$/.idea/ZeppelinRemoteNotebooks" />
+      <excludeFolder url="file://$MODULE_DIR$/.idea/dataSources" />
+    </content>
+  </component>
   <component name="FacetManager">
     <facet type="web" name="Web">
       <configuration>