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

Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

Browse Source
This commit is contained in:
zhangwei
2019-01-05 12:44:27 +06:00
parent 8948bf1025 ad0a04872c
commit 22a36746eb
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -384,15 +384,15 @@ sample_upload_url_keyword=/av
digest_upload_url_keyword=/filetransfer digest_upload_url_keyword=/filetransfer
cert_upload_url_keyword=/intercept/strateagy cert_upload_url_keyword=/intercept/strateagy
#sample File Size 12M 12582912 #sample File Size 100M
sample_total_file_max_size=12582912 sample_total_file_max_size=104857600
#audio File Types #audio File Types
audio_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,wav,mp3, audio_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,wav,mp3,
#audio File Size 10M 10485760\uff08single\uff09 #audio File Size 100M 10485760\uff08single\uff09
audio_single_file_max_size=0 audio_single_file_max_size=0
#speaker File Types \u8bf4\u8bdd\u4eba\u8bc6\u522b\u6587\u4ef6\u7c7b\u578b #speaker File Types \u8bf4\u8bdd\u4eba\u8bc6\u522b\u6587\u4ef6\u7c7b\u578b
speaker_file_type= speaker_file_type=
#audio File Size 10M 10485760\uff08single\uff09 #audio File Size 100M 10485760\uff08single\uff09
speaker_single_file_max_size=0 speaker_single_file_max_size=0
#video File Types #video File Types
video_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv, video_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,
@@ -404,12 +404,12 @@ face_file_type=
face_single_file_max_size=0 face_single_file_max_size=0
#picture File Types #picture File Types
picture_file_type= picture_file_type=
#picture File Size 10M 10485760\uff08single\uff09 #picture File Size 100M 10485760\uff08single\uff09
picture_single_file_max_size=10485760 picture_single_file_max_size=104857600
#logo File Types \u53f0\u6807\u8bc6\u522b #logo File Types \u53f0\u6807\u8bc6\u522b
logo_file_type= logo_file_type=
#logo File Size 10M 10485760\uff08single\uff09 #logo File Size 100M 10485760\uff08single\uff09
logo_single_file_max_size=10485760 logo_single_file_max_size=104857600
#voip File Types #voip File Types
voip_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,wav,mp3, voip_file_type=,mp4,flv,asf,wmv,avi,mpeg,mov,dat,m4v,m4p,m4b,webm,ogv,wav,mp3,
#voip File Size 10M 10485760\uff08single\uff09 #voip File Size 10M 10485760\uff08single\uff09
@@ -417,20 +417,20 @@ voip_single_file_max_size=0
#digest File Types #digest File Types
digest_file_type= digest_file_type=
#digest File Size 10M 10485760\uff08single\uff09 #digest File Size 100M 10485760\uff08single\uff09
digest_single_file_max_size=10485760 digest_single_file_max_size=104857600
#digest File Size 12M 12582912\uff08total\uff09 #digest File Size 100M 12582912\uff08total\uff09
digest_total_file_max_size=12582912 digest_total_file_max_size=104857600
#cert File Size 12M 12582912\uff08total\uff09 #cert File Size 100M 12582912\uff08total\uff09
cert_total_file_max_size=12582912 cert_total_file_max_size=104857600
#public File Types #public File Types
public_file_type= public_file_type=
#public File Size 10M 10485760\uff08single\uff09 #public File Size 100M 10485760\uff08single\uff09
public_single_file_max_size=10485760 public_single_file_max_size=104857600
#private File Types #private File Types
private_file_type= private_file_type=
#private File Size 10M 10485760\uff08single\uff09 #private File Size 100M 10485760\uff08single\uff09
private_single_file_max_size=10485760 private_single_file_max_size=104857600
#YSP\u6587\u4ef6\u4fdd\u5b58\u8def\u5f84 #YSP\u6587\u4ef6\u4fdd\u5b58\u8def\u5f84
av_file_path=/home/ysp/ av_file_path=/home/ysp/
#av_file_path=D\:\\ysp\\ #av_file_path=D\:\\ysp\\
@@ -599,7 +599,7 @@ trafficWebsiteListNoTime=v1/trafficWebsiteListNoTime
trafficTopicList=v1/trafficTopicList trafficTopicList=v1/trafficTopicList
trafficDomainTrans=v1/trafficDomainTrans trafficDomainTrans=v1/trafficDomainTrans
#maximum number to import #maximum number to import
import_limit=10 import_limit=10000
trafficPortActiveFiveMinute=v1/trafficPortActiveFiveMinute trafficPortActiveFiveMinute=v1/trafficPortActiveFiveMinute
trendTotalReport=v1/trendTotalReport trendTotalReport=v1/trendTotalReport
#\u4e8b\u4ef6\u76d1\u6d4b/\u5c01\u5835 #\u4e8b\u4ef6\u76d1\u6d4b/\u5c01\u5835

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

@@ -247,7 +247,7 @@
<bean id="multipartResolver" <bean id="multipartResolver"
class="com.nis.interceptor.MultipartFileIntercepter" > class="com.nis.interceptor.MultipartFileIntercepter" >
<property name="defaultEncoding" value="utf-8"></property> <property name="defaultEncoding" value="utf-8"></property>
<property name="maxUploadSize" value="20917520"></property><!-- 5*1024*1024 --> <property name="maxUploadSize" value="104857600"></property><!-- 100M*1024*1024 -->
</bean> </bean>
<bean <bean