manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

js/css压缩插件替换为com.jeesite.maven/compressor-maven-plugin

Browse Source
This commit is contained in:
thinkgem
2020-03-10 23:22:19 +08:00
parent a3ee442f74
commit 08467b41d3
6 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
common/pom.xml
View File

@@ -295,39 +295,6 @@
<plugins> <plugins>
</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> </build>
<developers> <developers>

2
common/src/main/java/com/jeesite/common/reflect/ReflectUtils.java
View File

@@ -104,7 +104,7 @@ public class ReflectUtils {
try { try {
result = (E)field.get(obj); result = (E)field.get(obj);
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
logger.error("不可能抛出的异常{}", e.getMessage()); logger.error("不可能抛出的异常: {}", e.getMessage());
} }
return result; return result;
} }

9
modules/core/pom.xml
View File

@@ -25,14 +25,13 @@
<!-- JDBC device begin --> <!-- JDBC device begin -->
<dependency> <dependency>
<groupId>com.oracle</groupId> <groupId>mysql</groupId>
<artifactId>ojdbc6</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>11.2.0.3</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>com.oracle.ojdbc</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>ojdbc8</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>

1
modules/core/src/main/resources/jta.properties
View File

@@ -1,5 +1,6 @@
# transactions.properties not found - looking for jta.properties in classpath... # transactions.properties not found - looking for jta.properties in classpath...
com.atomikos.icatch.service=com.atomikos.icatch.standalone.UserTransactionServiceFactory 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_timeout=-1
com.atomikos.icatch.max_actives=-1 com.atomikos.icatch.max_actives=-1
com.atomikos.icatch.enable_logging=false com.atomikos.icatch.enable_logging=false

17
parent/pom.xml
View File

@@ -53,6 +53,9 @@
<beetl.version>3.0.19-SNAPSHOT</beetl.version> <beetl.version>3.0.19-SNAPSHOT</beetl.version>
<swagger.version>1.6.0</swagger.version> <swagger.version>1.6.0</swagger.version>
<!-- jdbc setting -->
<mysql.version>8.0.11</mysql.version>
<!-- environment setting --> <!-- environment setting -->
<java.version>1.8</java.version> <java.version>1.8</java.version>
<!-- <tomcat.version>9.0.31</tomcat.version> --> <!-- <tomcat.version>9.0.31</tomcat.version> -->
@@ -227,9 +230,9 @@
<!-- JavaScript CSS Compress --> <!-- JavaScript CSS Compress -->
<plugin> <plugin>
<groupId>net.alchim31.maven</groupId> <groupId>com.jeesite.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId> <artifactId>compressor-maven-plugin</artifactId>
<version>1.5.1</version> <version>1.0.0-SNAPSHOT</version>
<executions> <executions>
<execution> <execution>
<phase>prepare-package</phase> <phase>prepare-package</phase>
@@ -356,8 +359,8 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>net.alchim31.maven</groupId> <groupId>com.jeesite.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId> <artifactId>compressor-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@@ -369,8 +372,8 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>net.alchim31.maven</groupId> <groupId>com.jeesite.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId> <artifactId>compressor-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

28
web/pom.xml
View File

@@ -41,6 +41,34 @@
<version>${project.parent.version}</version> <version>${project.parent.version}</version>
</dependency> </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 --> <!-- Spring Boot -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>