From a412254b69d4c5ea06dae44db354fd33adde3b33 Mon Sep 17 00:00:00 2001 From: 20918 <2091823062@qq.com> Date: Thu, 21 Mar 2024 14:40:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/dataSources.xml | 16 ++ .../com/zky/manager/MenuManageServlet.java | 4 +- src/main/resources/system.properties | 1 - web/WEB-INF/web.xml | 176 +++++++++--------- web/zhyw/smry/rydj/EmpManage.jsp | 9 - web/zhyw/smry/rydj/EmpState.jsp | 2 +- zhyw.iml | 6 + 7 files changed, 118 insertions(+), 96 deletions(-) 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 @@ true com.mysql.cj.jdbc.Driver jdbc:mysql://localhost:3306/orcl + + + + + + + $ProjectFileDir$ + + + java.sql.Driver + true + com.kingbase8.Driver + jdbc:kingbase8://192.168.254.197:54321/orcl + + + $ProjectFileDir$ 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 @@ - - DB Connection - jdbc/orcl - javax.sql.DataSource - Container - + + Apache-Axis - + + + weblogic.httpd.inputCharset./* + UTF-8 + + + + charFilter com.zky.util.CharFilter @@ -20,22 +23,7 @@ charFilter /* - - validateCode - com.zky.manager.ValidateCode - - - validateCode - /auth.jpg - - - org.apache.axis.transport.http.AxisHTTPSessionListener - - - weblogic.httpd.inputCharset./* - UTF-8 - - + Set Character Encoding com.zky.pub.SetCharacterEncodingFilter @@ -53,7 +41,18 @@ /servlet/* + + org.apache.axis.transport.http.AxisHTTPSessionListener + + + validateCode + com.zky.manager.ValidateCode + + + validateCode + /auth.jpg + ImportExcelServlet com.zky.manager.ImportExcelServlet @@ -164,14 +163,14 @@ /servlet/loginServlet - - SelectParaServlet - com.zky.orcl.para.SelectParaServlet - - - SelectParaServlet - /servlet/SelectPara - + + + + + + + + FrameworkServlet com.zky.manager.FrameworkServlet @@ -196,22 +195,22 @@ ClassManageServlet /servlet/ClassManage - - StudentManageServlet - com.zky.manager.StudentManageServlet - - - StudentManageServlet - /servlet/StudentManage - - - ClassStuRelationServlet - com.zky.manager.ClassStuRelationServlet - - - ClassStuRelationServlet - /servlet/ClassStuRelation - + + + + + + + + + + + + + + + + CheckCoderTool @@ -232,14 +231,14 @@ FileWriteManage /servlet/FileWriteManage - - SupplierManage - com.zky.zhyw.gys.SupplierManageServlet - - - SupplierManage - /servlet/SupplierManage - + + + + + + + + ActivitiesApplyManage com.zky.zhyw.smhd.ActivitiesApplyServlet @@ -321,12 +320,12 @@ /servlet/FileReceiveManage - FileBorrowManage - com.zky.zhyw.smwj.FileBorrowManageServlet + FileWriteServlet + com.zky.zhyw.smwj.FileWriteServlet - FileBorrowManage - /servlet/FileBorrowManage + FileWriteServlet + /servlet/FileWriteServlet FileRecoverManage @@ -352,32 +351,32 @@ FileDestoryManage /servlet/FileDestoryManage - - FileTypeQueryManage - com.zky.zhyw.tjcx.FileQueryManageServlet - - - FileTypeQueryManage - /servlet/FileQueryManage - + + + + + + + + PropertyTypeQueryManage - com.zky.zhyw.tjcx.PropertyQueryManageServlet + com.zky.zhyw.smsb.PropertyProvideManageServlet PropertyTypeQueryManage /servlet/PropertyQueryManage - - maskbarcode - com.mask.util.barcode.BarCodeServlet - 1 - - - - maskbarcode - *.bar - + + + + + + + + + + @@ -534,7 +533,7 @@ - + ImportPropertyQuestionExcelServlet com.zky.manager.ImportPropertyQuestionExcelServlet @@ -563,6 +562,10 @@ 100 + + AdminServlet + + @@ -615,7 +618,10 @@ 5 --> - - - 30 - + index.html @@ -653,6 +657,12 @@ /WEB-INF/tlds/PageLinkTag.xml /WEB-INF/tlds/PageLinkTag.xml + + DB Connection + jdbc/orcl + javax.sql.DataSource + Container + \ 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{ - UKEY名 - - - UKEY id - - - 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 @@ + + + + + +