From e6fe7b5420c6bc4e0deeec55ba7b86726a772106 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Tue, 20 Nov 2018 21:25:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jeesite/test/CodeStatistic.java | 6 ---- .../java/com/jeesite/test/ExcelPoiTest.java | 33 ------------------- common/src/test/java/logback.xml | 16 +++++++++ .../org.eclipse.core.resources.prefs | 1 - .../main/resources/config/jeesite-core.yml | 7 ++-- .../java/com/jeesite/test/MobileAppTest.java | 2 +- .../config/application.yml | 3 ++ .../config/j2cache.properties | 0 .../logback-spring.xml => java/logback.xml} | 0 web/src/main/resources/config/application.yml | 9 +++-- web/src/test/java/logback.xml | 19 +++++++++++ 11 files changed, 50 insertions(+), 46 deletions(-) delete mode 100644 common/src/test/java/com/jeesite/test/ExcelPoiTest.java create mode 100644 common/src/test/java/logback.xml rename modules/core/src/test/{resources => java}/config/application.yml (85%) rename modules/core/src/test/{resources => java}/config/j2cache.properties (100%) rename modules/core/src/test/{resources/config/logback-spring.xml => java/logback.xml} (100%) create mode 100644 web/src/test/java/logback.xml diff --git a/common/src/test/java/com/jeesite/test/CodeStatistic.java b/common/src/test/java/com/jeesite/test/CodeStatistic.java index 61ff9925..958bbd54 100644 --- a/common/src/test/java/com/jeesite/test/CodeStatistic.java +++ b/common/src/test/java/com/jeesite/test/CodeStatistic.java @@ -26,12 +26,6 @@ public class CodeStatistic { System.out.println("Path: " + path); ArrayList al = getFile(new File(path)); for (File f : al) { - if (!(f.getPath().contains("4.0\\jeesite\\") - || f.getPath().contains("\\devtools\\") - || f.getPath().contains("\\framework\\")) - || f.getPath().contains("\\target\\")){ - continue; - } if (f.getName().matches(".*\\.java$") || f.getName().matches(".*\\.html$") || f.getName().matches(".*\\.js$")){ diff --git a/common/src/test/java/com/jeesite/test/ExcelPoiTest.java b/common/src/test/java/com/jeesite/test/ExcelPoiTest.java deleted file mode 100644 index 76e1d75e..00000000 --- a/common/src/test/java/com/jeesite/test/ExcelPoiTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright (c) 2013-Now http://jeesite.com All rights reserved. - */ -package com.jeesite.test; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; - -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; - -/** - * Excel读写测试 - * @author ThinkGem - * @version 2016年8月11日 - */ -public class ExcelPoiTest { - - public static void main(String[] args) throws Exception { - File file = new File("e:\\2016年调查表1.xls"); - HSSFWorkbook wb = new HSSFWorkbook(new FileInputStream(file)); - HSSFSheet sheet = wb.getSheetAt(2); - sheet.getRow(5).getCell(3).setCellValue("山东有限公司"); - sheet.getRow(5).getCell(7).setCellValue("3799991911"); - sheet.getRow(8).getCell(3).setCellValue("174"); - sheet.getRow(8).getCell(7).setCellValue("私营股份有限公司"); - wb.write(new FileOutputStream("e:\\2016年调查表2.xls")); - wb.close(); - System.out.println("success"); - } - -} diff --git a/common/src/test/java/logback.xml b/common/src/test/java/logback.xml new file mode 100644 index 00000000..dbb9e80e --- /dev/null +++ b/common/src/test/java/logback.xml @@ -0,0 +1,16 @@ + + + + + + + %d{HH:mm:ss.SSS} %-5level [%logger{50}] - %msg%n + + + + + + + + + \ No newline at end of file diff --git a/modules/core/.settings/org.eclipse.core.resources.prefs b/modules/core/.settings/org.eclipse.core.resources.prefs index 04cfa2c1..365bbd60 100644 --- a/modules/core/.settings/org.eclipse.core.resources.prefs +++ b/modules/core/.settings/org.eclipse.core.resources.prefs @@ -2,5 +2,4 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 encoding/=UTF-8 diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index 5f85dc99..507e78d7 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -474,17 +474,20 @@ file: # 上传单个文件最大字节（500M），在这之上还有 > Tomcat限制 > Nginx限制，等，此设置会覆盖 spring.http.multipart.maxFileSize 设置 maxFileSize: 500*1024*1024 - #设置允许上传的文件后缀 + # 设置允许上传的文件后缀 imageAllowSuffixes: .gif,.bmp,.jpeg,.jpg,.ico,.png,.tif,.tiff, mediaAllowSuffixes: .flv,.swf,.mkv,webm,.mid,.mov,.mp3,.mp4,.m4v,.mpc,.mpeg,.mpg,.swf,.wav,.wma,.wmv,.avi,.rm,.rmi,.rmvb,.aiff,.asf,.ogg,.ogv, fileAllowSuffixes: .doc,.docx,.rtf,.xls,.xlsx,.csv,.ppt,.pptx,.pdf,.vsd,.txt,.md,.xml,.rar,.zip,7z,.tar,.tgz,.jar,.gz,.gzip,.bz2,.cab,.iso,.ipa,.apk, - #允许上传的文件内容类型（图片、word、excel、ppt）防止修改后缀恶意上传文件（默认不启用验证） + # 允许上传的文件内容类型（图片、word、excel、ppt）防止修改后缀恶意上传文件（默认不启用验证） # allowContentTypes: image/jpeg,image/gif,image/bmp,image/png,image/x-png, # application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document, # application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, # application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation + # 是否已文件流方式下载 + isFileStreamDown: false + #======================================# #========== Message settings ==========# #======================================# diff --git a/modules/core/src/test/java/com/jeesite/test/MobileAppTest.java b/modules/core/src/test/java/com/jeesite/test/MobileAppTest.java index 8a74b7a1..44509991 100644 --- a/modules/core/src/test/java/com/jeesite/test/MobileAppTest.java +++ b/modules/core/src/test/java/com/jeesite/test/MobileAppTest.java @@ -45,7 +45,7 @@ public class MobileAppTest { private static String loginUrl = "/login" + "?username=" + DesUtils.encode("system", "thinkgem,jeesite,com") + "&password=" + DesUtils.encode("admin", "thinkgem,jeesite,com") - + "¶m_deviceType=mobileApp&__sid="; + + "¶m_deviceType=mobileApp¶m_lang=zh_CN&__sid="; /** * 存储的会话编号，则通过getSid()获取。 diff --git a/modules/core/src/test/resources/config/application.yml b/modules/core/src/test/java/config/application.yml similarity index 85% rename from modules/core/src/test/resources/config/application.yml rename to modules/core/src/test/java/config/application.yml index 4736956c..c5e7a5cd 100644 --- a/modules/core/src/test/resources/config/application.yml +++ b/modules/core/src/test/java/config/application.yml @@ -18,3 +18,6 @@ jdbc: password: 123456 testSql: SELECT 1 +# 日志配置 +logging: + config: classpath:logback.xml diff --git a/modules/core/src/test/resources/config/j2cache.properties b/modules/core/src/test/java/config/j2cache.properties similarity index 100% rename from modules/core/src/test/resources/config/j2cache.properties rename to modules/core/src/test/java/config/j2cache.properties diff --git a/modules/core/src/test/resources/config/logback-spring.xml b/modules/core/src/test/java/logback.xml similarity index 100% rename from modules/core/src/test/resources/config/logback-spring.xml rename to modules/core/src/test/java/logback.xml diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml index ff7ebb69..22e5ca72 100644 --- a/web/src/main/resources/config/application.yml +++ b/web/src/main/resources/config/application.yml @@ -486,17 +486,20 @@ logging: # # 上传单个文件最大字节（500M），在这之上还有 > Tomcat限制 > Nginx限制，等。 # maxFileSize: 500*1024*1024 # -# #设置允许上传的文件后缀 +# # 设置允许上传的文件后缀 # imageAllowSuffixes: .gif,.bmp,.jpeg,.jpg,.ico,.png,.tif,.tiff, # mediaAllowSuffixes: .flv,.swf,.mkv,webm,.mid,.mov,.mp3,.mp4,.m4v,.mpc,.mpeg,.mpg,.swf,.wav,.wma,.wmv,.avi,.rm,.rmi,.rmvb,.aiff,.asf,.ogg,.ogv, # fileAllowSuffixes: .doc,.docx,.rtf,.xls,.xlsx,.csv,.ppt,.pptx,.pdf,.vsd,.txt,.md,.xml,.rar,.zip,7z,.tar,.tgz,.jar,.gz,.gzip,.bz2,.cab,.iso,.ipa,.apk, # -# #允许上传的文件内容类型（图片、word、excel、ppt）防止修改后缀恶意上传文件（默认不启用验证） +# # 允许上传的文件内容类型（图片、word、excel、ppt）防止修改后缀恶意上传文件（默认不启用验证） ## allowContentTypes: image/jpeg,image/gif,image/bmp,image/png,image/x-png, ## application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document, ## application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, ## application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation - +# +# # 是否已文件流方式下载 +# isFileStreamDown: true + #======================================# #========== Message settings ==========# #======================================# diff --git a/web/src/test/java/logback.xml b/web/src/test/java/logback.xml new file mode 100644 index 00000000..ee2d81ac --- /dev/null +++ b/web/src/test/java/logback.xml @@ -0,0 +1,19 @@ + + + + + + + %d{HH:mm:ss.SSS} %-5level [%logger{50}] - %msg%n + + + + + + + + + + + + \ No newline at end of file