测试代码优化

common/src/test/java/com/jeesite/test/CodeStatistic.java

@@ -26,12 +26,6 @@ public class CodeStatistic {
 		System.out.println("Path: " + path);
 		ArrayList<File> 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$")){

common/src/test/java/com/jeesite/test/ExcelPoiTest.java

@@ -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");
-	}
-
-}

common/src/test/java/logback.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="false">
+	
+	<!-- Console log output -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} %-5level [%logger{50}] - %msg%n</pattern>
+		</encoder>
+	</appender>
+	
+	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+	<root level="WARN">
+		<appender-ref ref="console" />
+	</root>
+	
+</configuration>

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/<project>=UTF-8

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 ==========#
 #======================================#

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")
-			+ "&param_deviceType=mobileApp&__sid="; 
+			+ "&param_deviceType=mobileApp&param_lang=zh_CN&__sid="; 
 	
 	/**
 	 * 存储的会话编号，则通过getSid()获取。

modules/core/src/test/java/config/application.yml

@@ -18,3 +18,6 @@ jdbc:
   password: 123456
   testSql: SELECT 1
 
+# 日志配置
+logging:
+  config: classpath:logback.xml

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 ==========#
 #======================================#

web/src/test/java/logback.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="false">
+	
+	<!-- Console log output -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} %-5level [%logger{50}] - %msg%n</pattern>
+		</encoder>
+	</appender>
+	
+	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+	<root level="WARN">
+		<appender-ref ref="console" />
+	</root>
+	
+	<!-- Framework level setting -->
+	<include resource="config/logger-core.xml"/>
+	
+</configuration>