From 08467b41d3e88688de2e19e2eceb17ea2ce30ea5 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 10 Mar 2020 23:22:19 +0800
Subject: [PATCH] =?UTF-8?q?js/css=E5=8E=8B=E7=BC=A9=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BAcom.jeesite.maven/compressor-maven-p?=
 =?UTF-8?q?lugin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/pom.xml                                | 33 -------------------
 .../jeesite/common/reflect/ReflectUtils.java  |  2 +-
 modules/core/pom.xml                          |  9 +++--
 .../core/src/main/resources/jta.properties    |  1 +
 parent/pom.xml                                | 17 ++++++----
 web/pom.xml                                   | 28 ++++++++++++++++
 6 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index 55f52b60..4f7549b4 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -295,39 +295,6 @@
 		<plugins>
 			
 		</plugins>
-		<pluginManagement>
-			<plugins>
-				<!-- JavaScript CSS Compress -->
-				<plugin>
-					<groupId>net.alchim31.maven</groupId>
-					<artifactId>yuicompressor-maven-plugin</artifactId>
-					<executions>
-						<execution>
-							<phase>prepare-package</phase>
-							<goals>
-								<goal>compress</goal>
-							</goals>
-						</execution>
-					</executions>
-					<configuration>
-						<encoding>UTF-8</encoding>
-						<jswarn>false</jswarn>
-						<nosuffix>true</nosuffix>
-						<linebreakpos>30000</linebreakpos>
-						<force>true</force>
-						<includes>
-							<include>**/*.js</include>
-							<include>**/*.css</include>
-						</includes>
-						<excludes>
-							<exclude>**/*.min.js</exclude>
-							<exclude>**/*.min.css</exclude>
-							<exclude>**/jquery-*.js</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 	</build>
 	
 	<developers>  
diff --git a/common/src/main/java/com/jeesite/common/reflect/ReflectUtils.java b/common/src/main/java/com/jeesite/common/reflect/ReflectUtils.java
index 40666582..eba64bc2 100644
--- a/common/src/main/java/com/jeesite/common/reflect/ReflectUtils.java
+++ b/common/src/main/java/com/jeesite/common/reflect/ReflectUtils.java
@@ -104,7 +104,7 @@ public class ReflectUtils {
 		try {
 			result = (E)field.get(obj);
 		} catch (IllegalAccessException e) {
-			logger.error("不可能抛出的异常{}", e.getMessage());
+			logger.error("不可能抛出的异常: {}", e.getMessage());
 		}
 		return result;
 	}
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 2992dee2..c22138b6 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -25,14 +25,13 @@
 		
 		<!-- JDBC device begin -->
 		<dependency>
-			<groupId>com.oracle</groupId>
-			<artifactId>ojdbc6</artifactId>
-			<version>11.2.0.3</version>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
+			<groupId>com.oracle.ojdbc</groupId>
+			<artifactId>ojdbc8</artifactId>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
diff --git a/modules/core/src/main/resources/jta.properties b/modules/core/src/main/resources/jta.properties
index e9ba07d0..f33df176 100644
--- a/modules/core/src/main/resources/jta.properties
+++ b/modules/core/src/main/resources/jta.properties
@@ -1,5 +1,6 @@
 # transactions.properties not found - looking for jta.properties in classpath...
 com.atomikos.icatch.service=com.atomikos.icatch.standalone.UserTransactionServiceFactory
+#com.atomikos.icatch.log_base_dir=./transaction-logs/
 com.atomikos.icatch.max_timeout=-1
 com.atomikos.icatch.max_actives=-1
 com.atomikos.icatch.enable_logging=false
diff --git a/parent/pom.xml b/parent/pom.xml
index caa78779..ae1e1ac7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -53,6 +53,9 @@
 		<beetl.version>3.0.19-SNAPSHOT</beetl.version>
 		<swagger.version>1.6.0</swagger.version>
 		
+		<!-- jdbc setting -->
+		<mysql.version>8.0.11</mysql.version>
+		
 		<!-- environment setting -->
 		<java.version>1.8</java.version>
 		<!-- <tomcat.version>9.0.31</tomcat.version> -->
@@ -227,9 +230,9 @@
 				
 				<!-- JavaScript CSS Compress -->
 				<plugin>
-					<groupId>net.alchim31.maven</groupId>
-					<artifactId>yuicompressor-maven-plugin</artifactId>
-					<version>1.5.1</version>
+					<groupId>com.jeesite.maven</groupId>
+					<artifactId>compressor-maven-plugin</artifactId>
+					<version>1.0.0-SNAPSHOT</version>
 					<executions>
 						<execution>
 							<phase>prepare-package</phase>
@@ -356,8 +359,8 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>net.alchim31.maven</groupId>
-						<artifactId>yuicompressor-maven-plugin</artifactId>
+						<groupId>com.jeesite.maven</groupId>
+						<artifactId>compressor-maven-plugin</artifactId>
 					</plugin>
 				</plugins>
 			</build>
@@ -369,8 +372,8 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>net.alchim31.maven</groupId>
-						<artifactId>yuicompressor-maven-plugin</artifactId>
+						<groupId>com.jeesite.maven</groupId>
+						<artifactId>compressor-maven-plugin</artifactId>
 					</plugin>
 				</plugins>
 			</build>
diff --git a/web/pom.xml b/web/pom.xml
index af877f4a..2f757de3 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -41,6 +41,34 @@
 			<version>${project.parent.version}</version>
 		</dependency>
 		
+		<!-- 在线API文档 -->
+		<dependency>
+			<groupId>com.jeesite</groupId>
+			<artifactId>jeesite-module-swagger</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
+		
+		<!-- Office在线预览 -->
+		<dependency>
+			<groupId>com.jeesite</groupId>
+			<artifactId>jeesite-module-weboffice</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
+		
+		<!-- 文件管理 -->
+		<dependency>
+			<groupId>com.jeesite</groupId>
+			<artifactId>jeesite-module-filemanager</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
+		
+		<!-- 业务流程管理 -->
+		<dependency>
+			<groupId>com.jeesite</groupId>
+			<artifactId>jeesite-module-bpm</artifactId>
+			<version>${project.parent.version}</version>
+		</dependency>
+		
 		<!-- Spring Boot -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>