diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..1339bace4 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,3 @@ +@Library('gitee.com/infrastlabs/fk-jenkins-shared-library@sam-custom') _ +// onemall() +onemall("$MODULE") diff --git a/demo/demo-application/pom.xml b/demo/demo-application/pom.xml index e6e3d67fe..8f4476b9d 100644 --- a/demo/demo-application/pom.xml +++ b/demo/demo-application/pom.xml @@ -11,6 +11,12 @@ demo-application + + false + true + true + + @@ -112,21 +118,29 @@ - + + <!– 提供给 mapstruct 使用 –> org.apache.maven.plugins maven-compiler-plugin - + <!– 打包 –> org.springframework.boot spring-boot-maven-plugin + --> + + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + diff --git a/demo/demo-application/src/main/assembly/assembly.xml b/demo/demo-application/src/main/assembly/assembly.xml new file mode 100644 index 000000000..dca60d3fc --- /dev/null +++ b/demo/demo-application/src/main/assembly/assembly.xml @@ -0,0 +1,31 @@ + + assembly + + dir + tar.gz + + false + + + + src/main/assembly/scripts + bin + 0755 + + + + src/main/resources + runtime + + + + + + ${project.build.directory}/lib + lib + + + \ No newline at end of file diff --git a/demo/demo-application/src/main/assembly/scripts/run.bat b/demo/demo-application/src/main/assembly/scripts/run.bat new file mode 100644 index 000000000..813105d00 --- /dev/null +++ b/demo/demo-application/src/main/assembly/scripts/run.bat @@ -0,0 +1,17 @@ +@echo off & setlocal enabledelayedexpansion +set BIN_DIR=%~dp0 + +::cnf +set APP_OPS="" +set APP_MAIN=com.dvp.ci.web.Main + +::run +cd %BIN_DIR%\.. + set APP_CP="" + for %%f in (lib\*.jar) do set APP_CP=!APP_CP!;%%f + ::echo libs: %APP_CP% + + ::java %APP_OPS% -cp "conf:%APP_CP%" %APP_MAIN% + java -Dfile.encoding=UTF-8 -Xms256m -Xmx512m -cp ".\runtime;%APP_CP%" %APP_MAIN% +cd %BIN_DIR% + diff --git a/demo/demo-application/src/main/assembly/scripts/run.sh b/demo/demo-application/src/main/assembly/scripts/run.sh new file mode 100644 index 000000000..78f5e3ef7 --- /dev/null +++ b/demo/demo-application/src/main/assembly/scripts/run.sh @@ -0,0 +1,10 @@ +#!/bin/sh +##cnf +APP_OPS="-Xms256m -Xmx512m" +APP_MAIN=com.dvp.ci.web.Main + +##run +cur=$(dirname $(readlink -f "$0")) && cd $cur/.. + +APP_CP=$(echo lib/*.jar |tr ' ' ':') +exec java -Dfile.encoding=UTF-8 ${APP_OPS} -server -cp "runtime:${APP_CP}" ${APP_MAIN} diff --git a/mvn-settings.xml b/mvn-settings.xml new file mode 100644 index 000000000..da35596c2 --- /dev/null +++ b/mvn-settings.xml @@ -0,0 +1,88 @@ + + + + /opt/jk_ws/repository + + + org.mortbay.jetty + + + + + releases + demo_deploy + xxx + + + + snapshots + demo_deploy + xxx + + + + + + + codehaus-bypass + Codehaus bypass mirror + http://repo1.maven.org/maven2 + codehaus + + + + nexus-aliyun + central + Nexus aliyun + http://maven.aliyun.com/nexus/content/groups/public + + + + + + true + + + nexus + http://47.98.177.156:8082/nexus/content/groups/public + + true + + + true + always + + + + + + nexus + http://47.98.177.156:8082/nexus/content/groups/public + + true + + + true + always + + + + + + + + + diff --git a/ops/pom.xml b/ops/pom.xml index 4ea6e71bb..7f9b77c02 100644 --- a/ops/pom.xml +++ b/ops/pom.xml @@ -11,6 +11,12 @@ ops + + false + true + true + + @@ -32,10 +38,10 @@ - + + <!– 打包 –> org.springframework.boot spring-boot-maven-plugin @@ -45,6 +51,14 @@ + --> + + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + diff --git a/ops/src/main/assembly/assembly.xml b/ops/src/main/assembly/assembly.xml new file mode 100644 index 000000000..dca60d3fc --- /dev/null +++ b/ops/src/main/assembly/assembly.xml @@ -0,0 +1,31 @@ + + assembly + + dir + tar.gz + + false + + + + src/main/assembly/scripts + bin + 0755 + + + + src/main/resources + runtime + + + + + + ${project.build.directory}/lib + lib + + + \ No newline at end of file diff --git a/ops/src/main/assembly/scripts/run.bat b/ops/src/main/assembly/scripts/run.bat new file mode 100644 index 000000000..813105d00 --- /dev/null +++ b/ops/src/main/assembly/scripts/run.bat @@ -0,0 +1,17 @@ +@echo off & setlocal enabledelayedexpansion +set BIN_DIR=%~dp0 + +::cnf +set APP_OPS="" +set APP_MAIN=com.dvp.ci.web.Main + +::run +cd %BIN_DIR%\.. + set APP_CP="" + for %%f in (lib\*.jar) do set APP_CP=!APP_CP!;%%f + ::echo libs: %APP_CP% + + ::java %APP_OPS% -cp "conf:%APP_CP%" %APP_MAIN% + java -Dfile.encoding=UTF-8 -Xms256m -Xmx512m -cp ".\runtime;%APP_CP%" %APP_MAIN% +cd %BIN_DIR% + diff --git a/ops/src/main/assembly/scripts/run.sh b/ops/src/main/assembly/scripts/run.sh new file mode 100644 index 000000000..78f5e3ef7 --- /dev/null +++ b/ops/src/main/assembly/scripts/run.sh @@ -0,0 +1,10 @@ +#!/bin/sh +##cnf +APP_OPS="-Xms256m -Xmx512m" +APP_MAIN=com.dvp.ci.web.Main + +##run +cur=$(dirname $(readlink -f "$0")) && cd $cur/.. + +APP_CP=$(echo lib/*.jar |tr ' ' ':') +exec java -Dfile.encoding=UTF-8 ${APP_OPS} -server -cp "runtime:${APP_CP}" ${APP_MAIN} diff --git a/order/order-application/pom.xml b/order/order-application/pom.xml index 2f80d4ffb..fe0758635 100644 --- a/order/order-application/pom.xml +++ b/order/order-application/pom.xml @@ -11,6 +11,13 @@ order-application + + false + true + true + + + @@ -26,5 +33,12 @@ + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + + diff --git a/order/order-application/src/main/assembly/assembly.xml b/order/order-application/src/main/assembly/assembly.xml new file mode 100644 index 000000000..dca60d3fc --- /dev/null +++ b/order/order-application/src/main/assembly/assembly.xml @@ -0,0 +1,31 @@ + + assembly + + dir + tar.gz + + false + + + + src/main/assembly/scripts + bin + 0755 + + + + src/main/resources + runtime + + + + + + ${project.build.directory}/lib + lib + + + \ No newline at end of file diff --git a/order/order-application/src/main/assembly/scripts/run.bat b/order/order-application/src/main/assembly/scripts/run.bat new file mode 100644 index 000000000..d30b675d8 --- /dev/null +++ b/order/order-application/src/main/assembly/scripts/run.bat @@ -0,0 +1,17 @@ +@echo off & setlocal enabledelayedexpansion +set BIN_DIR=%~dp0 + +::cnf +set APP_OPS="" +set APP_MAIN=cn.iocoder.mall.order.application.OrderApplication + +::run +cd %BIN_DIR%\.. + set APP_CP="" + for %%f in (lib\*.jar) do set APP_CP=!APP_CP!;%%f + ::echo libs: %APP_CP% + + ::java %APP_OPS% -cp "conf:%APP_CP%" %APP_MAIN% + java -Dfile.encoding=UTF-8 -Xms256m -Xmx512m -cp ".\runtime;%APP_CP%" %APP_MAIN% +cd %BIN_DIR% + diff --git a/order/order-application/src/main/assembly/scripts/run.sh b/order/order-application/src/main/assembly/scripts/run.sh new file mode 100644 index 000000000..315cbf84c --- /dev/null +++ b/order/order-application/src/main/assembly/scripts/run.sh @@ -0,0 +1,10 @@ +#!/bin/sh +##cnf +APP_OPS="-Xms256m -Xmx512m" +APP_MAIN=cn.iocoder.mall.order.application.OrderApplication + +##run +cur=$(dirname $(readlink -f "$0")) && cd $cur/.. + +APP_CP=$(echo lib/*.jar |tr ' ' ':') +exec java -Dfile.encoding=UTF-8 ${APP_OPS} -server -cp "runtime:${APP_CP}" ${APP_MAIN} diff --git a/order/order-biz-api/pom.xml b/order/order-biz-api/pom.xml index 0987a0c06..c5af79467 100644 --- a/order/order-biz-api/pom.xml +++ b/order/order-biz-api/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - product + order cn.iocoder.mall 1.0-SNAPSHOT diff --git a/package.bat b/package.bat new file mode 100644 index 000000000..badffdb66 --- /dev/null +++ b/package.bat @@ -0,0 +1,3 @@ +call mvn package -Pjenkins + +pause \ No newline at end of file diff --git a/pay/pay-application/pom.xml b/pay/pay-application/pom.xml index f7b70d7b4..7604451fa 100644 --- a/pay/pay-application/pom.xml +++ b/pay/pay-application/pom.xml @@ -11,6 +11,12 @@ pay-application + + false + true + true + + @@ -85,21 +91,29 @@ - + + <!– 提供给 mapstruct 使用 –> org.apache.maven.plugins maven-compiler-plugin - + <!– 打包 –> org.springframework.boot spring-boot-maven-plugin + --> + + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + diff --git a/pay/pay-application/src/main/assembly/assembly.xml b/pay/pay-application/src/main/assembly/assembly.xml new file mode 100644 index 000000000..dca60d3fc --- /dev/null +++ b/pay/pay-application/src/main/assembly/assembly.xml @@ -0,0 +1,31 @@ + + assembly + + dir + tar.gz + + false + + + + src/main/assembly/scripts + bin + 0755 + + + + src/main/resources + runtime + + + + + + ${project.build.directory}/lib + lib + + + \ No newline at end of file diff --git a/pay/pay-application/src/main/assembly/scripts/run.bat b/pay/pay-application/src/main/assembly/scripts/run.bat new file mode 100644 index 000000000..813105d00 --- /dev/null +++ b/pay/pay-application/src/main/assembly/scripts/run.bat @@ -0,0 +1,17 @@ +@echo off & setlocal enabledelayedexpansion +set BIN_DIR=%~dp0 + +::cnf +set APP_OPS="" +set APP_MAIN=com.dvp.ci.web.Main + +::run +cd %BIN_DIR%\.. + set APP_CP="" + for %%f in (lib\*.jar) do set APP_CP=!APP_CP!;%%f + ::echo libs: %APP_CP% + + ::java %APP_OPS% -cp "conf:%APP_CP%" %APP_MAIN% + java -Dfile.encoding=UTF-8 -Xms256m -Xmx512m -cp ".\runtime;%APP_CP%" %APP_MAIN% +cd %BIN_DIR% + diff --git a/pay/pay-application/src/main/assembly/scripts/run.sh b/pay/pay-application/src/main/assembly/scripts/run.sh new file mode 100644 index 000000000..78f5e3ef7 --- /dev/null +++ b/pay/pay-application/src/main/assembly/scripts/run.sh @@ -0,0 +1,10 @@ +#!/bin/sh +##cnf +APP_OPS="-Xms256m -Xmx512m" +APP_MAIN=com.dvp.ci.web.Main + +##run +cur=$(dirname $(readlink -f "$0")) && cd $cur/.. + +APP_CP=$(echo lib/*.jar |tr ' ' ':') +exec java -Dfile.encoding=UTF-8 ${APP_OPS} -server -cp "runtime:${APP_CP}" ${APP_MAIN} diff --git a/pay/pay-service-impl/pom.xml b/pay/pay-service-impl/pom.xml index b54c9aae6..8558dd0c2 100644 --- a/pay/pay-service-impl/pom.xml +++ b/pay/pay-service-impl/pom.xml @@ -129,7 +129,7 @@ central bintray - http://jcenter.bintray.com + https://jcenter.bintray.com diff --git a/pom.xml b/pom.xml index bb39a0a29..4f99ca860 100644 --- a/pom.xml +++ b/pom.xml @@ -3,29 +3,34 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - + + <!– lookup parent from repository –> + --> + + com.demo1.pom + pom-rpc + 1.1.0-SNAPSHOT cn.iocoder.mall onemall 1.0-SNAPSHOT + common + system product order user - common - system promotion mall-dependencies - mall-spring-boot-starter-cache + pom @@ -63,6 +68,25 @@ + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + + pom + import + + + + + + org.springframework.boot @@ -197,12 +221,12 @@ - - - - - - + @@ -231,15 +255,42 @@ - + + + maven-resources-plugin + maven-source-plugin + + + + + nexus-devcn + http://nexus.ali.devcn.fun:81/nexus/content/groups/public + + true + + + true + always + + + + + + aliyun + http://maven.aliyun.com/nexus/content/groups/public + + diff --git a/product/pom.xml b/product/pom.xml index eaf283845..2675d9594 100644 --- a/product/pom.xml +++ b/product/pom.xml @@ -20,7 +20,7 @@ product-rest product-biz product-biz-api - product-mq + diff --git a/product/product-application/pom.xml b/product/product-application/pom.xml index 3dec4c1e0..0df67a76c 100644 --- a/product/product-application/pom.xml +++ b/product/product-application/pom.xml @@ -11,6 +11,12 @@ product-application + + false + true + true + + @@ -26,4 +32,12 @@ + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + + + diff --git a/product/product-application/src/main/assembly/assembly.xml b/product/product-application/src/main/assembly/assembly.xml new file mode 100644 index 000000000..dca60d3fc --- /dev/null +++ b/product/product-application/src/main/assembly/assembly.xml @@ -0,0 +1,31 @@ + + assembly + + dir + tar.gz + + false + + + + src/main/assembly/scripts + bin + 0755 + + + + src/main/resources + runtime + + + + + + ${project.build.directory}/lib + lib + + + \ No newline at end of file diff --git a/product/product-application/src/main/assembly/scripts/run.bat b/product/product-application/src/main/assembly/scripts/run.bat new file mode 100644 index 000000000..813105d00 --- /dev/null +++ b/product/product-application/src/main/assembly/scripts/run.bat @@ -0,0 +1,17 @@ +@echo off & setlocal enabledelayedexpansion +set BIN_DIR=%~dp0 + +::cnf +set APP_OPS="" +set APP_MAIN=com.dvp.ci.web.Main + +::run +cd %BIN_DIR%\.. + set APP_CP="" + for %%f in (lib\*.jar) do set APP_CP=!APP_CP!;%%f + ::echo libs: %APP_CP% + + ::java %APP_OPS% -cp "conf:%APP_CP%" %APP_MAIN% + java -Dfile.encoding=UTF-8 -Xms256m -Xmx512m -cp ".\runtime;%APP_CP%" %APP_MAIN% +cd %BIN_DIR% + diff --git a/product/product-application/src/main/assembly/scripts/run.sh b/product/product-application/src/main/assembly/scripts/run.sh new file mode 100644 index 000000000..78f5e3ef7 --- /dev/null +++ b/product/product-application/src/main/assembly/scripts/run.sh @@ -0,0 +1,10 @@ +#!/bin/sh +##cnf +APP_OPS="-Xms256m -Xmx512m" +APP_MAIN=com.dvp.ci.web.Main + +##run +cur=$(dirname $(readlink -f "$0")) && cd $cur/.. + +APP_CP=$(echo lib/*.jar |tr ' ' ':') +exec java -Dfile.encoding=UTF-8 ${APP_OPS} -server -cp "runtime:${APP_CP}" ${APP_MAIN} diff --git a/promotion/promotion-application/pom.xml b/promotion/promotion-application/pom.xml index bec1721a7..c92e50db9 100644 --- a/promotion/promotion-application/pom.xml +++ b/promotion/promotion-application/pom.xml @@ -11,6 +11,12 @@ promotion-application + + false + true + true + + cn.iocoder.mall @@ -23,4 +29,14 @@ 1.0-SNAPSHOT - \ No newline at end of file + + + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + + + + diff --git a/promotion/promotion-application/src/main/assembly/assembly.xml b/promotion/promotion-application/src/main/assembly/assembly.xml new file mode 100644 index 000000000..dca60d3fc --- /dev/null +++ b/promotion/promotion-application/src/main/assembly/assembly.xml @@ -0,0 +1,31 @@ + + assembly + + dir + tar.gz + + false + + + + src/main/assembly/scripts + bin + 0755 + + + + src/main/resources + runtime + + + + + + ${project.build.directory}/lib + lib + + + \ No newline at end of file diff --git a/promotion/promotion-application/src/main/assembly/scripts/run.bat b/promotion/promotion-application/src/main/assembly/scripts/run.bat new file mode 100644 index 000000000..813105d00 --- /dev/null +++ b/promotion/promotion-application/src/main/assembly/scripts/run.bat @@ -0,0 +1,17 @@ +@echo off & setlocal enabledelayedexpansion +set BIN_DIR=%~dp0 + +::cnf +set APP_OPS="" +set APP_MAIN=com.dvp.ci.web.Main + +::run +cd %BIN_DIR%\.. + set APP_CP="" + for %%f in (lib\*.jar) do set APP_CP=!APP_CP!;%%f + ::echo libs: %APP_CP% + + ::java %APP_OPS% -cp "conf:%APP_CP%" %APP_MAIN% + java -Dfile.encoding=UTF-8 -Xms256m -Xmx512m -cp ".\runtime;%APP_CP%" %APP_MAIN% +cd %BIN_DIR% + diff --git a/promotion/promotion-application/src/main/assembly/scripts/run.sh b/promotion/promotion-application/src/main/assembly/scripts/run.sh new file mode 100644 index 000000000..78f5e3ef7 --- /dev/null +++ b/promotion/promotion-application/src/main/assembly/scripts/run.sh @@ -0,0 +1,10 @@ +#!/bin/sh +##cnf +APP_OPS="-Xms256m -Xmx512m" +APP_MAIN=com.dvp.ci.web.Main + +##run +cur=$(dirname $(readlink -f "$0")) && cd $cur/.. + +APP_CP=$(echo lib/*.jar |tr ' ' ':') +exec java -Dfile.encoding=UTF-8 ${APP_OPS} -server -cp "runtime:${APP_CP}" ${APP_MAIN} diff --git a/search/search-application/pom.xml b/search/search-application/pom.xml index 0e839c136..760b45d57 100644 --- a/search/search-application/pom.xml +++ b/search/search-application/pom.xml @@ -10,6 +10,11 @@ 4.0.0 search-application + + false + true + true + @@ -26,4 +31,12 @@ + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + + + diff --git a/search/search-application/src/main/assembly/assembly.xml b/search/search-application/src/main/assembly/assembly.xml new file mode 100644 index 000000000..dca60d3fc --- /dev/null +++ b/search/search-application/src/main/assembly/assembly.xml @@ -0,0 +1,31 @@ + + assembly + + dir + tar.gz + + false + + + + src/main/assembly/scripts + bin + 0755 + + + + src/main/resources + runtime + + + + + + ${project.build.directory}/lib + lib + + + \ No newline at end of file diff --git a/search/search-application/src/main/assembly/scripts/run.bat b/search/search-application/src/main/assembly/scripts/run.bat new file mode 100644 index 000000000..813105d00 --- /dev/null +++ b/search/search-application/src/main/assembly/scripts/run.bat @@ -0,0 +1,17 @@ +@echo off & setlocal enabledelayedexpansion +set BIN_DIR=%~dp0 + +::cnf +set APP_OPS="" +set APP_MAIN=com.dvp.ci.web.Main + +::run +cd %BIN_DIR%\.. + set APP_CP="" + for %%f in (lib\*.jar) do set APP_CP=!APP_CP!;%%f + ::echo libs: %APP_CP% + + ::java %APP_OPS% -cp "conf:%APP_CP%" %APP_MAIN% + java -Dfile.encoding=UTF-8 -Xms256m -Xmx512m -cp ".\runtime;%APP_CP%" %APP_MAIN% +cd %BIN_DIR% + diff --git a/search/search-application/src/main/assembly/scripts/run.sh b/search/search-application/src/main/assembly/scripts/run.sh new file mode 100644 index 000000000..78f5e3ef7 --- /dev/null +++ b/search/search-application/src/main/assembly/scripts/run.sh @@ -0,0 +1,10 @@ +#!/bin/sh +##cnf +APP_OPS="-Xms256m -Xmx512m" +APP_MAIN=com.dvp.ci.web.Main + +##run +cur=$(dirname $(readlink -f "$0")) && cd $cur/.. + +APP_CP=$(echo lib/*.jar |tr ' ' ':') +exec java -Dfile.encoding=UTF-8 ${APP_OPS} -server -cp "runtime:${APP_CP}" ${APP_MAIN} diff --git a/system/system-application/pom.xml b/system/system-application/pom.xml index f46f0ed7d..9903024f9 100644 --- a/system/system-application/pom.xml +++ b/system/system-application/pom.xml @@ -11,6 +11,12 @@ system-application + + false + true + true + + @@ -26,4 +32,14 @@ + + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + + + + diff --git a/system/system-application/src/main/assembly/assembly.xml b/system/system-application/src/main/assembly/assembly.xml new file mode 100644 index 000000000..dca60d3fc --- /dev/null +++ b/system/system-application/src/main/assembly/assembly.xml @@ -0,0 +1,31 @@ + + assembly + + dir + tar.gz + + false + + + + src/main/assembly/scripts + bin + 0755 + + + + src/main/resources + runtime + + + + + + ${project.build.directory}/lib + lib + + + \ No newline at end of file diff --git a/system/system-application/src/main/assembly/scripts/run.bat b/system/system-application/src/main/assembly/scripts/run.bat new file mode 100644 index 000000000..813105d00 --- /dev/null +++ b/system/system-application/src/main/assembly/scripts/run.bat @@ -0,0 +1,17 @@ +@echo off & setlocal enabledelayedexpansion +set BIN_DIR=%~dp0 + +::cnf +set APP_OPS="" +set APP_MAIN=com.dvp.ci.web.Main + +::run +cd %BIN_DIR%\.. + set APP_CP="" + for %%f in (lib\*.jar) do set APP_CP=!APP_CP!;%%f + ::echo libs: %APP_CP% + + ::java %APP_OPS% -cp "conf:%APP_CP%" %APP_MAIN% + java -Dfile.encoding=UTF-8 -Xms256m -Xmx512m -cp ".\runtime;%APP_CP%" %APP_MAIN% +cd %BIN_DIR% + diff --git a/system/system-application/src/main/assembly/scripts/run.sh b/system/system-application/src/main/assembly/scripts/run.sh new file mode 100644 index 000000000..78f5e3ef7 --- /dev/null +++ b/system/system-application/src/main/assembly/scripts/run.sh @@ -0,0 +1,10 @@ +#!/bin/sh +##cnf +APP_OPS="-Xms256m -Xmx512m" +APP_MAIN=com.dvp.ci.web.Main + +##run +cur=$(dirname $(readlink -f "$0")) && cd $cur/.. + +APP_CP=$(echo lib/*.jar |tr ' ' ':') +exec java -Dfile.encoding=UTF-8 ${APP_OPS} -server -cp "runtime:${APP_CP}" ${APP_MAIN} diff --git a/user/user-application/pom.xml b/user/user-application/pom.xml index 2ad3fbe84..6bb51d23d 100644 --- a/user/user-application/pom.xml +++ b/user/user-application/pom.xml @@ -11,6 +11,11 @@ user-application + + false + true + true + @@ -27,4 +32,13 @@ + + + + maven-surefire-plugin + maven-dependency-plugin + maven-assembly-plugin + + + diff --git a/user/user-application/src/main/assembly/assembly.xml b/user/user-application/src/main/assembly/assembly.xml new file mode 100644 index 000000000..dca60d3fc --- /dev/null +++ b/user/user-application/src/main/assembly/assembly.xml @@ -0,0 +1,31 @@ + + assembly + + dir + tar.gz + + false + + + + src/main/assembly/scripts + bin + 0755 + + + + src/main/resources + runtime + + + + + + ${project.build.directory}/lib + lib + + + \ No newline at end of file diff --git a/user/user-application/src/main/assembly/scripts/run.bat b/user/user-application/src/main/assembly/scripts/run.bat new file mode 100644 index 000000000..813105d00 --- /dev/null +++ b/user/user-application/src/main/assembly/scripts/run.bat @@ -0,0 +1,17 @@ +@echo off & setlocal enabledelayedexpansion +set BIN_DIR=%~dp0 + +::cnf +set APP_OPS="" +set APP_MAIN=com.dvp.ci.web.Main + +::run +cd %BIN_DIR%\.. + set APP_CP="" + for %%f in (lib\*.jar) do set APP_CP=!APP_CP!;%%f + ::echo libs: %APP_CP% + + ::java %APP_OPS% -cp "conf:%APP_CP%" %APP_MAIN% + java -Dfile.encoding=UTF-8 -Xms256m -Xmx512m -cp ".\runtime;%APP_CP%" %APP_MAIN% +cd %BIN_DIR% + diff --git a/user/user-application/src/main/assembly/scripts/run.sh b/user/user-application/src/main/assembly/scripts/run.sh new file mode 100644 index 000000000..78f5e3ef7 --- /dev/null +++ b/user/user-application/src/main/assembly/scripts/run.sh @@ -0,0 +1,10 @@ +#!/bin/sh +##cnf +APP_OPS="-Xms256m -Xmx512m" +APP_MAIN=com.dvp.ci.web.Main + +##run +cur=$(dirname $(readlink -f "$0")) && cd $cur/.. + +APP_CP=$(echo lib/*.jar |tr ' ' ':') +exec java -Dfile.encoding=UTF-8 ${APP_OPS} -server -cp "runtime:${APP_CP}" ${APP_MAIN}