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

update pom.xml

Browse Source
This commit is contained in:
thinkgem
2018-06-11 20:21:04 +08:00
parent 56941e07b5
commit 94c38ee018
11 changed files with 91 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/bin/javadoc.bat
View File

@@ -12,6 +12,6 @@ echo.
cd %~dp0 cd %~dp0
cd .. cd ..
call mvn clean javadoc:jar call mvn clean package -Pjavadoc
pause pause

14
common/pom.xml
View File

@@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.jeesite</groupId> <groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId> <artifactId>jeesite-parent</artifactId>
<version>4.0.4-SNAPSHOT</version> <version>4.0.4-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath> <relativePath>../parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>jeesite-common</artifactId> <artifactId>jeesite-common</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
@@ -161,8 +161,8 @@
<!-- Apache HTTP --> <!-- Apache HTTP -->
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
</dependency> </dependency>
<!-- Jsoup HTTP --> <!-- Jsoup HTTP -->

2
modules/core/bin/javadoc.bat
View File

@@ -12,6 +12,6 @@ echo.
cd %~dp0 cd %~dp0
cd .. cd ..
call mvn clean javadoc:jar call mvn clean package -Pjavadoc
pause pause

12
modules/core/pom.xml
View File

@@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.jeesite</groupId> <groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId> <artifactId>jeesite-parent</artifactId>
<version>4.0.4-SNAPSHOT</version> <version>4.0.4-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath> <relativePath>../../parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>jeesite-module-core</artifactId> <artifactId>jeesite-module-core</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
@@ -75,7 +75,7 @@
<snapshots><enabled>false</enabled></snapshots> <snapshots><enabled>false</enabled></snapshots>
</repository> </repository>
<repository> <repository>
<id>sonatype-repos-s</id> <id>sonatype-repos-s</id>
<name>Sonatype Repository</name> <name>Sonatype Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url> <url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases><enabled>false</enabled></releases> <releases><enabled>false</enabled></releases>

11
modules/core/src/main/resources/config/jeesite-core.yml
View File

@@ -44,7 +44,7 @@ jdbc:
# minIdle: 3 # minIdle: 3
# maxActive: 20 # maxActive: 20
# JTA 分布式事务 # JTA 分布式事务（v4.0.4+）
jta: jta:
enabled: false enabled: false
@@ -73,7 +73,7 @@ redis:
maxIdle: 3 maxIdle: 3
maxTotal: 20 maxTotal: 20
# 是否启用Redis系统缓存及会话 # 是否启用Redis系统缓存及会话（专业版）
cacheAndSession: false cacheAndSession: false
# 定义Key的前缀标识 # 定义Key的前缀标识
@@ -152,10 +152,10 @@ user:
remarks: "" remarks: ""
}] }]
# 多租户模式（SAAS模式） # 多租户模式（SAAS模式）（专业版）
useCorpModel: false useCorpModel: false
# 任务调度 # 任务调度（个人版+）
job: job:
# 是否自动启动任务调度（可关闭） # 是否自动启动任务调度（可关闭）
@@ -372,7 +372,7 @@ error:
file: file:
# 文件上传跟路径，设置路径中不允许包含“userfiles”，在指定目录中系统会自动创建userfiles目录，如果不设置默认为contextPath路径 # 文件上传根路径，设置路径中不允许包含“userfiles”，在指定目录中系统会自动创建userfiles目录，如果不设置默认为contextPath路径
# baseDir: D:/jeesite # baseDir: D:/jeesite
# 上传文件的相对路径（支持：yyyy, MM, dd, HH, mm, ss, E） # 上传文件的相对路径（支持：yyyy, MM, dd, HH, mm, ss, E）
@@ -396,6 +396,7 @@ file:
#===== Message settings =====# #===== Message settings =====#
#============================# #============================#
# 消息提醒中心（专业版）
msg: msg:
# 是否开启实时发送消息（保存消息后立即检查未读消息并发送），分布式部署下请单独配置消息发送服务，不建议开启此选项。 # 是否开启实时发送消息（保存消息后立即检查未读消息并发送），分布式部署下请单独配置消息发送服务，不建议开启此选项。

2
modules/template/bin/javadoc.bat
View File

@@ -12,6 +12,6 @@ echo.
cd %~dp0 cd %~dp0
cd .. cd ..
call mvn clean javadoc:jar call mvn clean package -Pjavadoc
pause pause

16
modules/template/pom.xml
View File

@@ -4,19 +4,19 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.jeesite</groupId> <groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId> <artifactId>jeesite-parent</artifactId>
<version>4.0.4-SNAPSHOT</version> <version>4.0.4-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath> <relativePath>../../parent/pom.xml</relativePath>
<!-- ====== 这是一个新增模块示例项目，你可以拷贝此项目，修改 artifactId 为您的模块即可 ====== --> <!-- ====== 这是一个新增模块示例项目，你可以拷贝此项目，修改 artifactId 为您的模块即可 ====== -->
<!-- <relativePath>../parent/pom.xml</relativePath> /jeesite --> <!-- <relativePath>../parent/pom.xml</relativePath> /jeesite -->
<!-- <relativePath>../../parent/pom.xml</relativePath> /jeesite/modules --> <!-- <relativePath>../../parent/pom.xml</relativePath> /jeesite/modules -->
<!-- <relativePath>../../jeesite/parent/pom.xml</relativePath> /jeesite-xxx --> <!-- <relativePath>../../jeesite/parent/pom.xml</relativePath> /jeesite-xxx -->
<!-- <relativePath>../../../jeesite/parent/pom.xml</relativePath> /jeesite-xxx/modules --> <!-- <relativePath>../../../jeesite/parent/pom.xml</relativePath> /jeesite-xxx/modules -->
</parent> </parent>
<artifactId>jeesite-module-template</artifactId> <artifactId>jeesite-module-template</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>

44
parent/pom.xml
View File

@@ -41,6 +41,7 @@
<!-- environment setting --> <!-- environment setting -->
<java.version>1.7</java.version> <java.version>1.7</java.version>
<maven.test.skip>true</maven.test.skip>
<eclipse-plugin-download-sources>false</eclipse-plugin-download-sources> <eclipse-plugin-download-sources>false</eclipse-plugin-download-sources>
<eclipse-plugin-download-javadocs>false</eclipse-plugin-download-javadocs> <eclipse-plugin-download-javadocs>false</eclipse-plugin-download-javadocs>
@@ -96,8 +97,8 @@
<finalName>jeesite</finalName> <finalName>jeesite</finalName>
<outputDirectory>${project.build.directory}/${project.artifactId}/WEB-INF/lib</outputDirectory> <outputDirectory>${project.build.directory}/${project.artifactId}/WEB-INF/lib</outputDirectory>
<includes> <includes>
<include>com/thinkgem/jeesite/**</include> <include>com/thinkgem/jeesite/**</include>
</includes> --> </includes> -->
<archive> <archive>
<manifest> <manifest>
<!-- Add directory entries --> <!-- Add directory entries -->
@@ -198,6 +199,9 @@
<goals> <goals>
<goal>jar</goal> <goal>jar</goal>
</goals> </goals>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@@ -297,7 +301,7 @@
<snapshots><enabled>false</enabled></snapshots> <snapshots><enabled>false</enabled></snapshots>
</repository> </repository>
<repository> <repository>
<id>sonatype-repos-s</id> <id>sonatype-repos-s</id>
<name>Sonatype Repository</name> <name>Sonatype Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url> <url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases><enabled>false</enabled></releases> <releases><enabled>false</enabled></releases>
@@ -322,40 +326,44 @@
<!-- 打包项目 --> <!-- 打包项目 -->
<profile> <profile>
<id>package</id> <id>javadoc</id>
<build> <build>
<plugins> <plugins>
<!-- Java Document Generate <!-- Java Document Generate -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
</plugin> --> </plugin>
</plugins>
</build>
</profile>
<!-- 打包项目 -->
<profile>
<id>package</id>
<build>
<plugins>
<!-- YUI Compressor (CSS/JS压缩) --> <!-- YUI Compressor (CSS/JS压缩) -->
<plugin> <plugin>
<groupId>net.alchim31.maven</groupId> <groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId> <artifactId>yuicompressor-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
<!-- 部署项目 --> <!-- 部署项目 -->
<profile> <profile>
<id>deploy</id> <id>deploy</id>
<build> <build>
<plugins> <plugins>
<!-- Java Document Generate
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin> -->
<!-- YUI Compressor (CSS/JS压缩) --> <!-- YUI Compressor (CSS/JS压缩) -->
<plugin> <plugin>
<groupId>net.alchim31.maven</groupId> <groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId> <artifactId>yuicompressor-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>sonatype-repos</id> <id>sonatype-repos</id>

4
web/.settings/org.eclipse.wst.common.component
View File

@@ -11,10 +11,10 @@
</dependent-module> </dependent-module>
<property name="component.exclusion.patterns"/> <property name="component.exclusion.patterns"/>
<property name="java-output-path" value="/src/main/webapp/WEB-INF/classes"/> <property name="java-output-path" value="/src/main/webapp/WEB-INF/classes"/>
<property name="context-root" value="js"/> <property name="context-root" value="jeesite-web"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
</wb-module> </wb-module>
</project-modules> </project-modules>

12
web/pom.xml
View File

@@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.jeesite</groupId> <groupId>com.jeesite</groupId>
<artifactId>jeesite-parent</artifactId> <artifactId>jeesite-parent</artifactId>
<version>4.0.4-SNAPSHOT</version> <version>4.0.4-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath> <relativePath>../parent/pom.xml</relativePath>
</parent> </parent>
<artifactId>jeesite-web</artifactId> <artifactId>jeesite-web</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
@@ -132,7 +132,7 @@
<snapshots><enabled>false</enabled></snapshots> <snapshots><enabled>false</enabled></snapshots>
</repository> </repository>
<repository> <repository>
<id>sonatype-repos-s</id> <id>sonatype-repos-s</id>
<name>Sonatype Repository</name> <name>Sonatype Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url> <url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases><enabled>false</enabled></releases> <releases><enabled>false</enabled></releases>

41
web/src/main/resources/config/jeesite.yml
View File

@@ -28,7 +28,7 @@ jdbc:
username: root username: root
password: 123456 password: 123456
testSql: SELECT 1 testSql: SELECT 1
#
# # Oracle 数据库配置 # # Oracle 数据库配置
# type: oracle # type: oracle
# driver: oracle.jdbc.driver.OracleDriver # driver: oracle.jdbc.driver.OracleDriver
@@ -36,7 +36,7 @@ jdbc:
# username: jeesite # username: jeesite
# password: jeesite # password: jeesite
# testSql: SELECT 1 FROM DUAL # testSql: SELECT 1 FROM DUAL
#
# # Sql Server 数据库配置 # # Sql Server 数据库配置
# type: mssql # type: mssql
# driver: net.sourceforge.jtds.jdbc.Driver # driver: net.sourceforge.jtds.jdbc.Driver
@@ -44,7 +44,7 @@ jdbc:
# username: jeesite # username: jeesite
# password: jeesite # password: jeesite
# testSql: SELECT 1 # testSql: SELECT 1
#
# # PostgreSql 数据库配置（注意：一定要创建的schema与username相同，否则将找不到数据表字典信息） # # PostgreSql 数据库配置（注意：一定要创建的schema与username相同，否则将找不到数据表字典信息）
# type: postgresql # type: postgresql
# driver: org.postgresql.Driver # driver: org.postgresql.Driver
@@ -52,7 +52,7 @@ jdbc:
# username: jeesite # username: jeesite
# password: jeesite # password: jeesite
# testSql: SELECT 1 # testSql: SELECT 1
#
# # 连接信息加密 # # 连接信息加密
# encrypt: # encrypt:
# #
@@ -70,7 +70,7 @@ jdbc:
# minIdle: 3 # minIdle: 3
# # 最大连接数 # # 最大连接数
# maxActive: 20 # maxActive: 20
#
# # 多数据源名称列表，启用方式：@MyBatisDao(dataSourceName="ds2") # # 多数据源名称列表，启用方式：@MyBatisDao(dataSourceName="ds2")
# dataSourceNames: ds2 # dataSourceNames: ds2
# #
@@ -89,20 +89,20 @@ jdbc:
# init: 1 # init: 1
# minIdle: 3 # minIdle: 3
# maxActive: 20 # maxActive: 20
#
# # JTA 分布式事务 # # JTA 分布式事务（v4.0.4+）
# jta: # jta:
# enabled: false # enabled: false
#
# # 表名前缀 # # 表名前缀
# tablePrefix: js_ # tablePrefix: js_
#
# # Druid连接池监控 # # Druid连接池监控
# druid: # druid:
# stat: # stat:
# enabled: true # enabled: true
#
## Redis 配置 # Redis 配置
#redis: #redis:
# #
# # Redis 连接参数 # # Redis 连接参数
@@ -119,7 +119,7 @@ jdbc:
# maxIdle: 3 # maxIdle: 3
# maxTotal: 20 # maxTotal: 20
# #
# # 是否启用Redis系统缓存及会话 # # 是否启用Redis系统缓存及会话（专业版）
# cacheAndSession: false # cacheAndSession: false
# #
# # 定义Key的前缀标识 # # 定义Key的前缀标识
@@ -140,8 +140,8 @@ jdbc:
# #
# # 分页默认大小 # # 分页默认大小
# pageSize: 20 # pageSize: 20
#
## 用户相关参数 # 用户相关参数
#user: #user:
# #
# # 指定超级管理员编号（研发团队使用的账号） # # 指定超级管理员编号（研发团队使用的账号）
@@ -197,11 +197,11 @@ jdbc:
# expandLevel: -1, # expandLevel: -1,
# remarks: "" # remarks: ""
# }] # }]
#
# # 多租户模式（SAAS模式） # # 多租户模式（SAAS模式）（专业版）
# useCorpModel: true # useCorpModel: false
#
## 任务调度 # 任务调度（个人版+）
#job: #job:
# #
# # 是否自动启动任务调度（可关闭） # # 是否自动启动任务调度（可关闭）
@@ -379,7 +379,7 @@ jdbc:
#file: #file:
# #
# # 文件上传跟路径，设置路径中不允许包含“userfiles”，在指定目录中系统会自动创建userfiles目录，如果不设置默认为contextPath路径 # # 文件上传根路径，设置路径中不允许包含“userfiles”，在指定目录中系统会自动创建userfiles目录，如果不设置默认为contextPath路径
## baseDir: D:/jeesite ## baseDir: D:/jeesite
# #
# # 上传文件的相对路径（支持：yyyy, MM, dd, HH, mm, ss, E） # # 上传文件的相对路径（支持：yyyy, MM, dd, HH, mm, ss, E）
@@ -403,6 +403,7 @@ jdbc:
#===== Message settings =====# #===== Message settings =====#
#============================# #============================#
# 消息提醒中心（专业版）
#msg: #msg:
# #
# # 是否开启实时发送消息（保存消息后立即检查未读消息并发送），分布式部署下请单独配置消息发送服务，不建议开启此选项。 # # 是否开启实时发送消息（保存消息后立即检查未读消息并发送），分布式部署下请单独配置消息发送服务，不建议开启此选项。