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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source 
Conflicts:
	src/main/java/com/nis/util/Constants.java
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	src/main/resources/nis.properties
This commit is contained in:
duandongmei
2018-07-06 17:20:23 +08:00
parent 7c6251e859 6776899bac
commit c748b7eabd
57 changed files with 2030 additions and 280 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

4
src/main/resources/messages/message_en.properties
View File

@@ -728,11 +728,11 @@ userregion1=user region 1
userregion2=user region 2
userregion3=user region 3
userregion4=user region 4
userregion5=user region 5
userregion5=user region 5
#=============userregions===============
#=============multipart upload error info=================
single_file_upload_size_error=The size of the file %s is %s,allowing the maximum value of a single file to be %s !
total_file_upload_size_error=The total size of uploaded files is %s,allowing the total size of uploaded to be %s !
file_upload_type_error=%s file type of error,allowing uploaded file type with %s!
file_upload_error=File upload failure !
#=============multipart upload error info=================
#=============multipart upload error info=================

4
src/main/resources/messages/message_ru.properties
View File

@@ -712,11 +712,11 @@ userregion1=user region 1
userregion2=user region 2
userregion3=user region 3
userregion4=user region 4
userregion5=user region 5
userregion5=user region 5
#=============userregions===============
#=============multipart upload error info=================
single_file_upload_size_error=The size of the file %s is %s,allowing the maximum value of a single file to be %s !
total_file_upload_size_error=The total size of uploaded files is %s,allowing the total size of uploaded to be %s !
file_upload_type_error=%s file type of error,allowing uploaded file type with %s!
file_upload_error=File upload failure !
#=============multipart upload error info=================
#=============multipart upload error info=================

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

@@ -829,7 +829,7 @@ userregion1=\u81EA\u5B9A\u4E49\u57DF1
userregion2=\u81EA\u5B9A\u4E49\u57DF2
userregion3=\u81EA\u5B9A\u4E49\u57DF3
userregion4=\u81EA\u5B9A\u4E49\u57DF4
userregion5=\u81EA\u5B9A\u4E49\u57DF5
userregion5=\u81EA\u5B9A\u4E49\u57DF5
#=============userregions===============
#=============multipart upload error info=================
single_file_upload_size_error=\u6587\u4EF6%s\u7684\u5927\u5C0F\u4E3A%s\uFF0C\u5141\u8BB8\u5355\u4E2A\u6587\u4EF6\u7684\u6700\u5927\u503C\u4E3A%s\uFF01

2
src/main/resources/nis.properties
View File

@@ -313,7 +313,7 @@ ipv6_ip_regexp=^\\s*((([0-9A-Fa-f]{1,4}\:){7}(([0-9A-Fa-f]{1,4})|\:))|(([0-9A-Fa
redirect_response_code_key=code
redirect_url_key=url
redirect_content_key=content
redirect_response_code_startwith=30
redirect_response_code_startwith=30
#样例文件上传的uri关键词
sample_upload_url_keyword=/av
#样例和摘要文件大小类型设置