gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、APP策略配置增加IP配置；2、修改IP转换时，IPV4的IP/MASK格式时，MASK为0异常的错误。

Browse Source 
Signed-off-by: zhangwei <zhangwei@intranet.com>
This commit is contained in:
zhangwei
2018-07-04 16:03:07 +08:00
parent d3ed5f993a
commit 2fbfedabc4
13 changed files with 588 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/resources/jdbc.properties
View File

@@ -6,14 +6,11 @@ jdbc.devlop.username=root
jdbc.devlop.key=pR3JFt5dsGCW0nZO3TLF7Q==
jdbc.devlop.password=JgW5tsiGBNAtcqCgSQIP0g==
jdbc.product.driver=oracle.jdbc.driver.OracleDriver
#jdbc.product.url=jdbc:oracle:thin:@(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.10.17)(PORT = 1521))(LOAD_BALANCE = yes)(CONNECT_DATA =(SERVICE_NAME = ORCL)(FAILOVER_MODE =(TYPE = select)(METHOD = basic)(RETRIES = 180)(DELAY = 180))))
jdbc.product.url=jdbc:oracle:thin:@10.0.6.212:1523:app
#jdbc.product.url=jdbc:oracle:thin:@10.174.196.20:1521:orcl
jdbc.product.username=gk_pz
#jdbc.product.username=z2_5x9pz
jdbc.product.key=3X3ZBejyxS7lkVsHVm9KTw==
jdbc.product.password=sHqDBZIUS0hYZCbC+1xN3A==
jdbc.product.driver=com.mysql.jdbc.Driver
jdbc.product.url=jdbc:mysql://10.0.6.249:3306/gwall?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
jdbc.product.username=root
jdbc.product.key=pR3JFt5dsGCW0nZO3TLF7Q==
jdbc.product.password=JgW5tsiGBNAtcqCgSQIP0g==
#jdbc.log.driver=oracle.jdbc.driver.OracleDriver
#jdbc.log.url=jdbc:oracle:thin:@10.0.6.212:1523:app

3
src/main/resources/messages/message_zh_CN.properties
View File

@@ -605,7 +605,7 @@ action=\u52A8\u4F5C
has_prohibit_delete=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u5220\u9664
has_prohibit_nopass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u672A\u901A\u8FC7\u5BA1\u6838
has_prohibit_pass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u4EE5\u5BA1\u6838\u901A\u8FC7
multiple_keywords_tip=\u53EF\u540C\u65F6\u8F93\u5165\u591A\u6761\u5173\u952E\u5B57\uFF0C\u8BF7\u4EE5\u82F1\u6587\u9017\u53F7\u6216\u8005\u56DE\u8F66\u952E\u9694\u5F00\u3002
multiple_keywords_tip=\u53EF\u540C\u65F6\u8F93\u5165\u591A\u6761\u5173\u952E\u5B57\uFF0C\u8BF7\u4EE5\u56DE\u8F66\u952E\u9694\u5F00\u3002
action_drop=\u4E22\u5F03
action_reject=\u963B\u65AD
action_redirect=\u91CD\u5B9A\u5411
@@ -814,4 +814,5 @@ FTP_CONTENT=\u5185\u5BB9\u5173\u952E\u5B57\u914D\u7F6E
id_not_exists=id\u4E3A%s\u7684%s\u4E0D\u5B58\u5728
id_not_valid=id\u4E3A%s\u7684%s\u65E0\u6548
num_split_by_comma=%s\u4E3A\u9017\u53F7\u5206\u9694\u7684\u6570\u5B57
no_data=\u65E0\u76F8\u5173\u6570\u636E
#=============region_value,config form title=================

16
src/main/resources/spring-mvc.xml
View File

@@ -172,29 +172,29 @@
</mvc:interceptor>
<!-- 数据源拦截器，该拦截路径下使用数据源B -->
<mvc:interceptor>
<!-- <mvc:interceptor>
<mvc:mapping path="/service/cfg/**" />
<bean class="com.nis.interceptor.DataSourceBInterceptor"></bean>
</mvc:interceptor>
</mvc:interceptor> -->
<!-- 数据源拦截器，该拦截路径下使用数据源C -->
<mvc:interceptor>
<!-- <mvc:interceptor>
<mvc:mapping path="/service/log/**" />
<bean class="com.nis.interceptor.DataSourceCInterceptor"></bean>
</mvc:interceptor>
</mvc:interceptor> -->
<!-- 数据源拦截器，该拦截路径下使用数据源D,后期会删除 -->
<mvc:interceptor>
<!-- <mvc:interceptor>
<mvc:mapping path="/service/test/**" />
<bean class="com.nis.interceptor.DataSourceDInterceptor"></bean>
</mvc:interceptor>
</mvc:interceptor> -->
<!-- 数据源拦截器，该拦截路径下使用数据源E -->
<mvc:interceptor>
<!-- <mvc:interceptor>
<mvc:mapping path="/service/jk/**" />
<bean class="com.nis.interceptor.DataSourceEInterceptor"></bean>
</mvc:interceptor>
</mvc:interceptor> -->
</mvc:interceptors>