From 81df8ce6de7879d75e2e334d1bcca13ea31407ff Mon Sep 17 00:00:00 2001 From: Elvis Date: Fri, 11 May 2018 16:27:08 +0800 Subject: [PATCH] 去掉多余的信息 --- WebRoot/WEB-INF/jsp/feedback/feedback/feedback_list.jsp | 26 ++++---------------------- WebRoot/WEB-INF/jsp/feedback/problemphenomenon/problemphenomenon_list.jsp | 27 +-------------------------- WebRoot/WEB-INF/jsp/system/index/left.jsp | 2 +- WebRoot/WEB-INF/jsp/system/index/login.jsp | 2 +- WebRoot/WEB-INF/jsp/system/role/role_list.jsp | 8 ++++---- src/com/fh/controller/api/ApiServer.java | 6 +++--- src/com/fh/controller/system/login/LoginController.java | 2 +- src/com/fh/util/Const.java | 2 +- 8 files changed, 16 insertions(+), 59 deletions(-) diff --git a/WebRoot/WEB-INF/jsp/feedback/feedback/feedback_list.jsp b/WebRoot/WEB-INF/jsp/feedback/feedback/feedback_list.jsp index b553703..bd4edf8 100644 --- a/WebRoot/WEB-INF/jsp/feedback/feedback/feedback_list.jsp +++ b/WebRoot/WEB-INF/jsp/feedback/feedback/feedback_list.jsp @@ -33,27 +33,8 @@
- - - - - - - + +
-
- - - - -
- 		- -
@@ -110,7 +91,8 @@ ${var.SOFTWARE_NAME} ${var.EXCEPTION_NUM} ${var.DESCRIPTION} - ${var.PROBLEM_PATH} + <%-- ${var.PROBLEM_PATH} --%> + Responsive image ${var.CUSTOMER_CODE} ${var.PERSON_LIABLE} ${var.CREATE_DATE} diff --git a/WebRoot/WEB-INF/jsp/feedback/problemphenomenon/problemphenomenon_list.jsp b/WebRoot/WEB-INF/jsp/feedback/problemphenomenon/problemphenomenon_list.jsp index 406d315..b7fc169 100644 --- a/WebRoot/WEB-INF/jsp/feedback/problemphenomenon/problemphenomenon_list.jsp +++ b/WebRoot/WEB-INF/jsp/feedback/problemphenomenon/problemphenomenon_list.jsp @@ -31,32 +31,7 @@ - - - - - - - - - - - -
-
- - - - -
- 		- -
+ diff --git a/WebRoot/WEB-INF/jsp/system/index/left.jsp b/WebRoot/WEB-INF/jsp/system/index/left.jsp index fced8f3..15f5df4 100644 --- a/WebRoot/WEB-INF/jsp/system/index/left.jsp +++ b/WebRoot/WEB-INF/jsp/system/index/left.jsp @@ -3,7 +3,7 @@ try{ace.settings.check('sidebar' , 'fixed')}catch(e){} -
- +
本组： @@ -64,10 +64,10 @@ - + - Admin 菜单权限 - 组菜单权限 + Admin 菜单权限 + 组菜单权限 diff --git a/src/com/fh/controller/api/ApiServer.java b/src/com/fh/controller/api/ApiServer.java index 656f2f3..248fec4 100644 --- a/src/com/fh/controller/api/ApiServer.java +++ b/src/com/fh/controller/api/ApiServer.java @@ -294,13 +294,13 @@ public class ApiServer extends BaseController { if (content[0].contains("image")) { fileType = content[0].substring(11,content[0].length()); } - File dir = new File(path + File.separator + "fb_" - + System.currentTimeMillis() + "." + fileType); + String filename = "fb_" + System.currentTimeMillis() + "." + fileType ; + File dir = new File(path + File.separator + filename ); if (!dir.exists()) { dir.createNewFile(); } generateImage(content[1], dir.getAbsolutePath()); - pd.put("PROBLEM_PATH", dir.getAbsolutePath()); + pd.put("PROBLEM_PATH", filename); } } } diff --git a/src/com/fh/controller/system/login/LoginController.java b/src/com/fh/controller/system/login/LoginController.java index 3af8797..72e8999 100644 --- a/src/com/fh/controller/system/login/LoginController.java +++ b/src/com/fh/controller/system/login/LoginController.java @@ -96,7 +96,7 @@ public class LoginController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); String errInfo = ""; - String KEYDATA[] = pd.getString("KEYDATA").replaceAll("elvis", "").split(",fh,"); + String KEYDATA[] = pd.getString("KEYDATA").split(";;;"); if(null != KEYDATA && KEYDATA.length >= 2){ Session session = Jurisdiction.getSession(); String sessionCode = (String)session.getAttribute(Const.SESSION_SECURITY_CODE); //获取session中的验证码 diff --git a/src/com/fh/util/Const.java b/src/com/fh/util/Const.java index 599b81b..ea3c7f7 100644 --- a/src/com/fh/util/Const.java +++ b/src/com/fh/util/Const.java @@ -32,7 +32,7 @@ public class Const { public static final String FILEPATHFILE = "uploadFiles/file/"; //文件上传路径 public static final String FILEPATHFILEOA = "uploadFiles/uploadFile/"; //文件上传路径(oa管理) public static final String FILEPATHTWODIMENSIONCODE = "uploadFiles/twoDimensionCode/"; //二维码存放路径 - public static final String NO_INTERCEPTOR_PATH = ".*/((login)|(logout)|(code)|(app)|(weixin)|(static)|(afterService)|(main)|(api)|(websocket)|(uploadImgs)).*"; //不对匹配该值的访问路径拦截（正则） + public static final String NO_INTERCEPTOR_PATH = ".*/((login)|(logout)|(code)|(app)|(weixin)|(static)|(images)|(afterService)|(main)|(api)|(websocket)|(uploadImgs)).*"; //不对匹配该值的访问路径拦截（正则） public static ApplicationContext WEB_APP_CONTEXT = null; //该值会在web容器启动时由WebAppContextListener初始化 /** -- libgit2 0.21.4