From 5294f42df1fbe9f1b3660a025845b03360463917 Mon Sep 17 00:00:00 2001 From: chenjinsong Date: Tue, 6 Mar 2018 14:10:03 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=85=8D=E7=BD=AE=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A8=E4=B8=AD=E7=9A=84label=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=A4=AA=E9=95=BF=E6=97=B6=EF=BC=88=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E3=80=81=E4=BF=84=E6=96=87=EF=BC=89=E6=A0=B7=E5=BC=8F=E9=94=99?= =?UTF-8?q?=E4=B9=B1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/systemService/form.jsp | 32 +++++++++---------- .../webapp/static/pages/css/systemService.css | 4 +++ 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/systemService/form.jsp b/src/main/webapp/WEB-INF/views/systemService/form.jsp index 8b098b37c..6e2156f90 100644 --- a/src/main/webapp/WEB-INF/views/systemService/form.jsp +++ b/src/main/webapp/WEB-INF/views/systemService/form.jsp @@ -154,14 +154,14 @@ function addDatatable() { $("#datatables").append( '
' + - '
' + + '
' + '' + '' + - '*'+''+': ' + + '*'+''+': ' + ' ' + '
' + - '
' + - '*'+''+': ' + + '
' + + '*'+''+': ' + ' ' + '' + ' ' + '
' + - '
' + - '*MAAT '+''+': ' + + '
' + + '*MAAT '+''+': ' + '' + '
' + - '
' + - '*'+''+': ' + + '
' + + '*'+''+': ' + '' + '' + '
' + @@ -273,15 +273,15 @@
-
+
- *: + *:
-
- *: +
+ *:
-
- *MAAT : +
+ *MAAT :
-
- *: +
+ *: diff --git a/src/main/webapp/static/pages/css/systemService.css b/src/main/webapp/static/pages/css/systemService.css index c11781ad7..88d4a09ca 100644 --- a/src/main/webapp/static/pages/css/systemService.css +++ b/src/main/webapp/static/pages/css/systemService.css @@ -49,4 +49,8 @@ select, input { margin-top: 15px; margin-bottom: 15px; background-color: #F8F8FF; +} +.table-item { + margin-top: 5px; + margin-bottom: 5px; } \ No newline at end of file From d9bcc2f1c7866f673607afdcbf0c9c91d8081b8f Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Tue, 6 Mar 2018 14:15:06 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=A4=B1=E8=B4=A5=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=A4=B1=E8=B4=A5=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 4 ++++ src/main/resources/messages/message_ru.properties | 4 ++++ src/main/resources/messages/message_zh_CN.properties | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index e88811496..8595d995d 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -142,6 +142,10 @@ date_list=Date List confirm_message=Are you sure? fill_loginName=Please fill in the loginName fill_loginPassWord=Please fill in the passWord +save_success=save success +save_failed=save failed +delete_success=delete success +delete_failed=delete failed #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index e706d890d..62fd50af2 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -142,6 +142,10 @@ date_list=Date List confirm_message=Are you sure? fill_loginName=Please fill in the loginName fill_loginPassWord=Please fill in the passWord +save_success=save success +save_failed=save failed +delete_success=delete success +delete_failed=delete failed #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index e8cb48922..621805127 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -140,7 +140,11 @@ date_list=\u6570\u636e\u5217\u8868 confirm_message=\u786e\u5b9a\u5417\uff1f fill_loginName=\u8bf7\u586b\u5199\u767b\u5f55\u8d26\u53f7 fill_loginPassWord=\u8bf7\u586b\u5199\u767b\u5f55\u5bc6\u7801 - +loginName_error=\u7528\u6237\u6216\u5bc6\u7801\u9519\u8bef, \u8bf7\u91cd\u8bd5. +save_success=\u4fdd\u5b58\u6210\u529f +save_failed=\u4fdd\u5b58\u5931\u8d25 +delete_success=\u5220\u9664\u6210\u529f +delete_failed=\u5220\u9664\u5931\u8d25 #==========message end===================== #==========yewuliexingguanli begin===================== From e1c6e8fd92a7459d65600cfacedc36867e1a3739 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Tue, 6 Mar 2018 14:24:39 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 1 + src/main/resources/messages/message_ru.properties | 1 + src/main/resources/messages/message_zh_CN.properties | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 8595d995d..15f8935b9 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -146,6 +146,7 @@ save_success=save success save_failed=save failed delete_success=delete success delete_failed=delete failed +turning_page=It is turning to the page #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 62fd50af2..deae46fb2 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -146,6 +146,7 @@ save_success=save success save_failed=save failed delete_success=delete success delete_failed=delete failed +turning_page=It is turning to the page #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 621805127..27ecad3b5 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -145,6 +145,7 @@ save_success=\u4fdd\u5b58\u6210\u529f save_failed=\u4fdd\u5b58\u5931\u8d25 delete_success=\u5220\u9664\u6210\u529f delete_failed=\u5220\u9664\u5931\u8d25 +turning_page=\u6b63\u5728\u4e3a\u60a8\u8df3\u8f6c\u9875\u9762 #==========message end===================== #==========yewuliexingguanli begin===================== From 7ff672d46764cc086f76717b3e8aeb64905e5d63 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Tue, 6 Mar 2018 14:44:34 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/domain/Page.java | 219 ++++++------------------- 1 file changed, 49 insertions(+), 170 deletions(-) diff --git a/src/main/java/com/nis/domain/Page.java b/src/main/java/com/nis/domain/Page.java index a3ad883d3..0586434ac 100644 --- a/src/main/java/com/nis/domain/Page.java +++ b/src/main/java/com/nis/domain/Page.java @@ -4,7 +4,7 @@ package com.nis.domain; import java.util.ArrayList; -import java.util.HashMap; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.regex.Pattern; @@ -13,16 +13,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.mapping.ResultMap; -import org.apache.ibatis.mapping.ResultMapping; -import org.apache.ibatis.session.SqlSessionFactory; import com.fasterxml.jackson.annotation.JsonIgnore; import com.nis.util.Configurations; -import com.nis.util.Constants; import com.nis.util.CookieUtil; import com.nis.util.StringUtil; -import com.nis.web.service.SpringContextHolder; /** * 分页类 @@ -52,7 +47,7 @@ public class Page { private String orderBy = ""; // 标准查询有效， 实例： updatedate desc, name asc - private String fields ="";//制定资源的字段 + private String fields;//制定资源的字段 private String where; @@ -63,10 +58,9 @@ public class Page { private String message = ""; // 设置提示消息，显示在“共n条”之后 public Page() { - this.pageSize = pageSize; + this.pageSize = -1; } - /** * 构造方法 * @param request 传递 repage 参数，来记住页码 @@ -74,27 +68,11 @@ public class Page { */ public Page(HttpServletRequest request, HttpServletResponse response){ - this(request, response,Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30))); - - } - /** - * 构造方法 - * @param request 传递 repage 参数，来记住页码 - * @param response 用于设置 Cookie，记住页码 - * - */ - public Page(HttpServletRequest request, HttpServletResponse response,Class clazz){ - - this(request, response,clazz.getSimpleName(),Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30))); - - } - public Page(HttpServletRequest request, HttpServletResponse response,int defaultPageSize){ - - this(request, response,"",Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30))); + this(request, response, Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30))); } - public Page(HttpServletRequest request, HttpServletResponse response,String className, int defaultPageSize){ + public Page(HttpServletRequest request, HttpServletResponse response, int defaultPageSize){ try { // 设置页码参数（传递repage参数，来记住页码） String no = request.getParameter("pageNo"); @@ -111,7 +89,13 @@ public class Page { } // 设置页面大小参数（传递repage参数，来记住页码大小） - String size = request.getParameter("pageSize"); + String size = ""; + if(defaultPageSize==-1){ + size = "-1"; + }else{ + size = request.getParameter("pageSize"); + + } if (StringUtils.isNotBlank(size)) { if (StringUtils.isNumeric(size) || size.equals("-1")){ @@ -126,24 +110,20 @@ public class Page { } else { this.pageSize = defaultPageSize; } - //超出每页最大显示条数，取限制的最大条数 - if(this.pageSize > Constants.MAX_PAGE_SIZE){ - this.pageSize = Constants.MAX_PAGE_SIZE; - } String fields = request.getParameter("fields"); if (StringUtils.isNotBlank(fields)){ - fields=getFiledsSql(className, fields); this.setFields(fields); } // 设置排序参数 String orderBy = request.getParameter("orderBy"); if (StringUtils.isNotBlank(orderBy)){ - orderBy=getOrderBySql(className, orderBy); this.setOrderBy(orderBy); } - this.count=Integer.valueOf(Configurations.getIntProperty("page.count", -1)); + + this.setWhere(getWhere(request)); + } catch (Exception e) { e.printStackTrace(); @@ -334,8 +314,8 @@ public class Page { sb.append("
  • 当前 "); sb.append(" / "); - sb.append(" 条，"); + sb.append(" 页，"); sb.append("共 " + count + " 条"+(message!=null?message:"")+"
    • \n"); sb.insert(0,"
      \n").append("
    \n"); @@ -643,138 +623,37 @@ public class Page { public int getMaxResults(){ return getPageSize(); } - /** - * @Title: getFiledsSql - * @Description: 将fields的属性名称替换为字段名称 - * @param @param mapName - * @param @param fileds - * @param @return - * @param @throws Exception - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @JsonIgnore - public String getFiledsSql(String mapName,String fileds) throws Exception{ - String[] fieldsColoumn=null; - String orderByStr=""; - //所有字段名 - List columnList=new ArrayList(); - //所有属性名 - List propertyList=new ArrayList(); - //属性名称为key，字段名称为value - Map columnMap=new HashMap(); - - if(!StringUtil.isBlank(fileds)){ - //解析Fileds的字段/属性名称 - fieldsColoumn=fileds.split(","); - - //从resultMap中获取字段名称和属性名称 - if(fieldsColoumn != null){ - SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class); - ResultMap map= sqlSessionFactory.getConfiguration().getResultMap(mapName+"Map"); - List mapping= map.getResultMappings(); - for(ResultMapping mapp:mapping){ - columnList.add(mapp.getColumn().toLowerCase()); - propertyList.add(mapp.getProperty()); - columnMap.put(mapp.getProperty(), mapp.getColumn()); - } - } - if(fieldsColoumn != null){ - fileds=""; - for (String column : fieldsColoumn) { - if(!StringUtil.isBlank(column)){ - column=column.trim(); - if(columnList.contains(column.toLowerCase())){ - fileds+=","+column; - }else if(propertyList.contains(column)){ - fileds+=","+columnMap.get(column).toString(); - } - } - } - if(!StringUtil.isBlank(fileds)){ - fileds=fileds.substring(1); - } - - } - - } - return fileds; - } - /** - * @Title: getOrderBySql - * @Description: 将orderBy的属性名称替换为字段名称 - * @param @param mapName - * @param @param orderBy - * @param @return - * @param @throws Exception - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @JsonIgnore - public static String getOrderBySql(String mapName,String orderBy) throws Exception{ - String[] orderByColoumn=null; - //所有字段名 - List columnList=new ArrayList(); - //所有属性名 - List propertyList=new ArrayList(); - Map columnMap=new HashMap(); - - if(!StringUtil.isBlank(orderBy)){ - //解析orderBy的字段/属性名称 - orderByColoumn=orderBy.split(","); - //从resultMap中获取字段名称和属性名称 - if(orderByColoumn != null){ - SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class); - ResultMap map= sqlSessionFactory.getConfiguration().getResultMap(mapName+"Map"); - List mapping= map.getResultMappings(); - for(ResultMapping mapp:mapping){ - columnList.add(mapp.getColumn().toLowerCase()); - propertyList.add(mapp.getProperty()); - columnMap.put(mapp.getProperty(), mapp.getColumn()); - } - } - if(orderByColoumn != null){ - orderBy=""; - for (String column : orderByColoumn) { - if(!StringUtil.isBlank(column)){ - if(columnList.contains(replaceOrderBy(column))){ - orderBy+=","+column; - }else if(propertyList.contains(replaceOrderBy(column))){ - //如果是实体类名字则获取对应数据库名字+排序方式 - orderBy+=","+columnMap.get(replaceOrderBy(column)).toString() - +column.replace(replaceOrderBy(column), ""); - } - } - } - if(!StringUtil.isBlank(orderBy)){ - orderBy=orderBy.substring(1); - } - } - - } - return orderBy; - } - /** - * @Title: replaceOrderBy - * @Description: 去掉orderBy中的desc和asc - * @param @param str - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - public static String replaceOrderBy(String str){ - if(!StringUtil.isBlank(str)){ - str=str.trim(); - str=str.replace(" asc",""); - str=str.replace(" ASC",""); - str=str.replace(" DESC",""); - str=str.replace(" desc",""); - str=str.trim(); - } - return str; - } +// /** +// * 获取 Spring data JPA 分页对象 +// */ +// public Pageable getSpringPage(){ +// List orders = new ArrayList(); +// if (orderBy!=null){ +// for (String order : StringUtils.split(orderBy, ",")){ +// String[] o = StringUtils.split(order, " "); +// if (o.length==1){ +// orders.add(new Order(Direction.ASC, o[0])); +// }else if (o.length==2){ +// if ("DESC".equals(o[1].toUpperCase())){ +// orders.add(new Order(Direction.DESC, o[0])); +// }else{ +// orders.add(new Order(Direction.ASC, o[0])); +// } +// } +// } +// } +// return new PageRequest(this.pageNo - 1, this.pageSize, new Sort(orders)); +// } +// +// /** +// * 设置 Spring data JPA 分页对象，转换为本系统分页对象 +// */ +// public void setSpringPage(org.springframework.data.domain.Page page){ +// this.pageNo = page.getNumber(); +// this.pageSize = page.getSize(); +// this.count = page.getTotalElements(); +// this.list = page.getContent(); +// } + } From c2aa0ff7250794d216535318514658a5d5fa5182 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Tue, 6 Mar 2018 16:56:19 +0800 Subject: [PATCH 5/7] =?UTF-8?q?1.=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=EF=BC=8C=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=8B=E9=82=AE=E4=BB=B6=E7=AE=A1=E6=8E=A7?= =?UTF-8?q?=E3=80=8B=E6=94=B6=E4=BB=B6=E4=BA=BA=E7=AE=A1=E6=8E=A7=20?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/FormAuthenticationFilter.java | 4 +- .../resources/messages/message_en.properties | 35 ++++++- .../messages/message_zh_CN.properties | 34 ++++++- .../WEB-INF/views/cfg/complexCfgForm.jsp | 6 +- .../WEB-INF/views/cfg/complexCfgList.jsp | 94 +++++++++---------- src/main/webapp/WEB-INF/views/login.jsp | 2 +- 6 files changed, 120 insertions(+), 55 deletions(-) diff --git a/src/main/java/com/nis/web/security/FormAuthenticationFilter.java b/src/main/java/com/nis/web/security/FormAuthenticationFilter.java index cbe2f0d8d..b6f2c326f 100644 --- a/src/main/java/com/nis/web/security/FormAuthenticationFilter.java +++ b/src/main/java/com/nis/web/security/FormAuthenticationFilter.java @@ -74,14 +74,14 @@ public class FormAuthenticationFilter extends org.apache.shiro.web.filter.authc. String className = e.getClass().getName(), message = ""; if (IncorrectCredentialsException.class.getName().equals(className) || UnknownAccountException.class.getName().equals(className)){ - message = "用户或密码错误, 请重试."; + message = "loginName_error"; } else if (e.getMessage() != null && StringUtils.startsWith(e.getMessage(), "msg:")){ message = StringUtils.replace(e.getMessage(), "msg:", ""); } else{ - message = "系统出现点问题，请稍后再试！"; + message = "system_error"; e.printStackTrace(); // 输出到控制台 } request.setAttribute(getFailureKeyAttribute(), className); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 15f8935b9..4d6ce538f 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -142,6 +142,8 @@ date_list=Date List confirm_message=Are you sure? fill_loginName=Please fill in the loginName fill_loginPassWord=Please fill in the passWord +loginName_error=loginName and password error,please try again. +system_error=system error,please try again later! save_success=save success save_failed=save failed delete_success=delete success @@ -178,4 +180,35 @@ datebase_table=datebase table fill_all=fill in all describe=describe back=back -#==========yewuliexingguanli end===================== \ No newline at end of file +#==========yewuliexingguanli end===================== + +#==========youjianguankong begin===================== +sort=sort +createTime_asc=order by createTime asc +createTime_desc=order by createTime desc +editTime_asc=order by editTime asc +editTime_desc=order by editTime desc +auditTime_asc=order by auditTime asc +auditTime_desc=order by auditTime desc +config_describe=configuration description +match_area=matching area +key_word=key word +block_type=block type +letter=letter +whether_area_block=whether area block +label=label +property=property +valid_identifier=valid identifier +is_audit=whether audit +creator=creator +config_time=configuration time +editor=editor +edit_time=edit time +auditor=auditor +audit_time=audit time +yes=yes +no=no +deleted=deleted +cancel_approved=cancel approved + +#==========youjianguankong end===================== \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 27ecad3b5..d0023c77d 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -141,6 +141,7 @@ confirm_message=\u786e\u5b9a\u5417\uff1f fill_loginName=\u8bf7\u586b\u5199\u767b\u5f55\u8d26\u53f7 fill_loginPassWord=\u8bf7\u586b\u5199\u767b\u5f55\u5bc6\u7801 loginName_error=\u7528\u6237\u6216\u5bc6\u7801\u9519\u8bef, \u8bf7\u91cd\u8bd5. +system_error=\u7cfb\u7edf\u51fa\u73b0\u70b9\u95ee\u9898\uff0c\u8bf7\u7a0d\u540e\u518d\u8bd5\uff01 save_success=\u4fdd\u5b58\u6210\u529f save_failed=\u4fdd\u5b58\u5931\u8d25 delete_success=\u5220\u9664\u6210\u529f @@ -177,4 +178,35 @@ datebase_table=\u6570\u636e\u5e93\u8868 fill_all=\u8bf7\u586b\u5199\u6240\u6709\u5b57\u6bb5 describe=\u63cf\u8ff0 back=\u8fd4\u56de -#==========yewuliexingguanli end===================== \ No newline at end of file +#==========yewuliexingguanli end===================== + +#==========youjianguankong begin===================== +sort=\u6392\u5e8f +createTime_asc=\u6309\u521b\u5efa\u65f6\u95f4\u987a\u5e8f +createTime_desc=\u6309\u521b\u5efa\u65f6\u95f4\u5012\u5e8f +editTime_asc=\u6309\u4fee\u6539\u65f6\u95f4\u987a\u5e8f +editTime_desc=\u6309\u4fee\u6539\u65f6\u95f4\u5012\u5e8f +auditTime_asc=\u6309\u5ba1\u6838\u65f6\u95f4\u987a\u5e8f +auditTime_desc=\u6309\u5ba1\u6838\u65f6\u95f4\u5012\u5e8f +config_describe=\u914d\u7f6e\u63cf\u8ff0 +match_area=\u5339\u914d\u533a\u57df +key_word=\u5173\u952e\u5b57 +block_type=\u7ba1\u63a7\u7c7b\u578b +letter=\u6765\u51fd +whither_area_block=\u662f\u5426\u533a\u57df\u7ba1\u63a7 +label=\u6807\u7b7e +property=\u6027\u8d28 +valid_identifier=\u6709\u6548\u6807\u8bc6 +is_audit=\u662f\u5426\u5ba1\u6838 +creator=\u521b\u5efa\u4eba\u5458 +config_time=\u914d\u7f6e\u65f6\u95f4 +editor=\u4fee\u6539\u4eba\u5458 +edit_time=\u4fee\u6539\u65f6\u95f4 +auditor=\u5ba1\u6838\u4eba\u5458 +audit_time=\u5ba1\u6838\u65f6\u95f4 +yes=\u662f +no=\u5426 +deleted=\u5df2\u5220\u9664 +cancel_approved=\u53d6\u6d88\u5ba1\u6838\u901a\u8fc7 + +#==========youjianguankong end===================== \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp index eee7dcd4f..123ebd499 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp @@ -31,7 +31,7 @@ $(function(){
    - +
    - 来函 + - 是否区域管控 - 分类 - 性质 - 标签 + + + + - 有效标识 - 是否审核 - 创建人员 - 配置时间 - 修改人员 - 修改时间 - 审核人员 - 审核时间 + + + + + + + + @@ -120,19 +120,19 @@ ${cfg.district } ${cfg.keywords } - 阻断 - 监测 - 封堵白名单 - 监测白名单 - 封堵监测白名单 - 灰名单 + + + + + + <%-- ${cfg.serviceId } --%> ${cfg.requestName } <%-- ${cfg.compileId } --%> - 否 - 是 + + @@ -160,16 +160,16 @@ <%-- ${cfg.areaEffectiveIds } --%> - 否 - 是 - 已删除 + + + - + ${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp index ef0916973..4ed96b8f1 100644 --- a/src/main/webapp/WEB-INF/views/login.jsp +++ b/src/main/webapp/WEB-INF/views/login.jsp @@ -80,7 +80,7 @@

    ERROR:   - +

    From 6d49f64a33b16409bd6a4987b4cc036870cb352c Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Tue, 6 Mar 2018 18:22:50 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=8B=E7=AE=A1=E6=8E=A7=E7=99=BD=E5=90=8D=E5=8D=95=E3=80=8B?= =?UTF-8?q?IP=E7=AE=A1=E6=8E=A7=E7=99=BD=E5=90=8D=E5=8D=95=E3=80=8B?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/messages/message_en.properties | 2 +- .../messages/message_zh_CN.properties | 23 +++- .../WEB-INF/include/form/complexInfo.jsp | 2 +- .../WEB-INF/views/cfg/complexCfgList.jsp | 4 +- .../webapp/WEB-INF/views/cfg/ipCfgForm.jsp | 6 +- .../webapp/WEB-INF/views/cfg/ipCfgList.jsp | 112 +++++++++--------- 6 files changed, 83 insertions(+), 66 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 4d6ce538f..3d36e2dd9 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -197,7 +197,7 @@ block_type=block type letter=letter whether_area_block=whether area block label=label -property=property +attribute=attribute valid_identifier=valid identifier is_audit=whether audit creator=creator diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index d0023c77d..8c7f9df9e 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -193,9 +193,9 @@ match_area=\u5339\u914d\u533a\u57df key_word=\u5173\u952e\u5b57 block_type=\u7ba1\u63a7\u7c7b\u578b letter=\u6765\u51fd -whither_area_block=\u662f\u5426\u533a\u57df\u7ba1\u63a7 +whether_area_block=\u662f\u5426\u533a\u57df\u7ba1\u63a7 label=\u6807\u7b7e -property=\u6027\u8d28 +attribute=\u6027\u8d28 valid_identifier=\u6709\u6548\u6807\u8bc6 is_audit=\u662f\u5426\u5ba1\u6838 creator=\u521b\u5efa\u4eba\u5458 @@ -209,4 +209,21 @@ no=\u5426 deleted=\u5df2\u5220\u9664 cancel_approved=\u53d6\u6d88\u5ba1\u6838\u901a\u8fc7 -#==========youjianguankong end===================== \ No newline at end of file +#==========youjianguankong end===================== + +#==========guankongbaimingdan begin===================== +client_ip=\u6e90IP +server_ip=\u76ee\u7684IP +client_port=\u6e90\u7aef\u53e3 +client_port_mask=\u6e90\u7aef\u53e3\u63a9\u7801 +client_address_mask=\u6e90\u5730\u5740\u63a9\u7801 +server_port=\u76ee\u7684\u7aef\u53e3 +server_port_mask=\u76ee\u7684\u7aef\u53e3\u63a9\u7801 +server_address_mask=\u76ee\u7684\u5730\u5740\u63a9\u7801 +block_addr=\u7ba1\u63a7\u5730\u5740 +block_domain=\u7ba1\u63a7\u57df\u540d +block_url=\u5c01\u5835\u8def\u5f84 +configuration=\u914d\u7f6e +direction=\u65b9\u5411 +protocol=\u534f\u8bae +#==========guankongbaimingdan end===================== \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp index e2dc40770..7ea6a1462 100644 --- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp @@ -70,7 +70,7 @@
    diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp index 654526b5f..1d3c3d663 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp @@ -98,10 +98,10 @@ - + - + diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp index 88da2f167..9fb9d54cb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp @@ -78,7 +78,7 @@ $(function(){
    - +
    - 管控类型 + - 来函 + - 是否区域管控 - 分类 - 性质 - 标签 + + + + - 有效标识 - 是否审核 - 创建人员 - 配置时间 - 修改人员 - 修改时间 - 审核人员 - 审核时间 + + + + + + + + @@ -140,19 +140,19 @@ ${ipCfg.protocol } <%-- ${ipCfg.protocolId } --%> - 阻断 - 监测 - 封堵白名单 - 监测白名单 - 封堵监测白名单 - 灰名单 + + + + + + <%-- ${ipCfg.serviceId } --%> ${ipCfg.requestName } <%-- ${ipCfg.compileId } --%> - 否 - 是 + + @@ -180,16 +180,16 @@ <%-- ${ipCfg.areaEffectiveIds } --%> - 否 - 是 - 已删除 + + + - + ${ipCfg.creatorName } From 173d80f07faa625dbf3695a9a56f28159ff1efdc Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Tue, 6 Mar 2018 18:25:42 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=8B=B1=E6=96=87=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/messages/message_en.properties | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 3d36e2dd9..d680ccac3 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -211,4 +211,21 @@ no=no deleted=deleted cancel_approved=cancel approved -#==========youjianguankong end===================== \ No newline at end of file +#==========youjianguankong end===================== + +#==========guankongbaimingdan begin===================== +client_ip=client ip +server_ip=server ip +client_port=client port +client_port_mask=client port mask +client_address_mask=client address mask +server_port=server port +server_port_mask=server port mask +server_address_mask=server address mask +block_addr=block address +block_domain=block domain +block_url=block url +configuration=configuration +direction=direction +protocol=protocol +#==========guankongbaimingdan end===================== \ No newline at end of file