From 9d839a0ecee04b35730a16a1c50b9774e8414063 Mon Sep 17 00:00:00 2001 From: sam Date: Sat, 25 Apr 2020 23:12:12 +0800 Subject: [PATCH 1/6] init jenkinsfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit up1 fix up up notes u fix containerTemplate(name: 'git', image: 'alpine/git' fix up up u checkout scm dir("/opt/ws") { fix1 jk_ws up dir judge fix 帝 fix fix2 clone-src mvn install git config --global up -s ./mvn-setting.xml init jenkinsfile up1 fix up up notes u fix containerTemplate(name: 'git', image: 'alpine/git' fix up up u checkout scm dir("/opt/ws") { fix1 jk_ws up dir judge fix 帝 fix fix2 clone-src mvn install git config --global up ./mvn-settings.xml central mirror aliyun lib: onemall testParam: onemall("$MODULE") --- Jenkinsfile | 3 ++ mvn-settings.xml | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 Jenkinsfile create mode 100644 mvn-settings.xml 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/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 + + + + + + + + + From 6f73b27e5c5d8acfa8091c8326693987f7c99ef5 Mon Sep 17 00:00:00 2001 From: "sam@tpad-win10" Date: Sat, 4 Jan 2020 17:58:15 +0800 Subject: [PATCH 2/6] assembly x9 --- .../src/main/assembly/assembly.xml | 31 +++++++++++++++++++ .../src/main/assembly/scripts/run.bat | 17 ++++++++++ .../src/main/assembly/scripts/run.sh | 10 ++++++ ops/src/main/assembly/assembly.xml | 31 +++++++++++++++++++ ops/src/main/assembly/scripts/run.bat | 17 ++++++++++ ops/src/main/assembly/scripts/run.sh | 10 ++++++ .../src/main/assembly/assembly.xml | 31 +++++++++++++++++++ .../src/main/assembly/scripts/run.bat | 17 ++++++++++ .../src/main/assembly/scripts/run.sh | 10 ++++++ .../src/main/assembly/assembly.xml | 31 +++++++++++++++++++ .../src/main/assembly/scripts/run.bat | 17 ++++++++++ .../src/main/assembly/scripts/run.sh | 10 ++++++ .../src/main/assembly/assembly.xml | 31 +++++++++++++++++++ .../src/main/assembly/scripts/run.bat | 17 ++++++++++ .../src/main/assembly/scripts/run.sh | 10 ++++++ .../src/main/assembly/assembly.xml | 31 +++++++++++++++++++ .../src/main/assembly/scripts/run.bat | 17 ++++++++++ .../src/main/assembly/scripts/run.sh | 10 ++++++ .../src/main/assembly/assembly.xml | 31 +++++++++++++++++++ .../src/main/assembly/scripts/run.bat | 17 ++++++++++ .../src/main/assembly/scripts/run.sh | 10 ++++++ .../src/main/assembly/assembly.xml | 31 +++++++++++++++++++ .../src/main/assembly/scripts/run.bat | 17 ++++++++++ .../src/main/assembly/scripts/run.sh | 10 ++++++ .../src/main/assembly/assembly.xml | 31 +++++++++++++++++++ .../src/main/assembly/scripts/run.bat | 17 ++++++++++ .../src/main/assembly/scripts/run.sh | 10 ++++++ 27 files changed, 522 insertions(+) create mode 100644 demo/demo-application/src/main/assembly/assembly.xml create mode 100644 demo/demo-application/src/main/assembly/scripts/run.bat create mode 100644 demo/demo-application/src/main/assembly/scripts/run.sh create mode 100644 ops/src/main/assembly/assembly.xml create mode 100644 ops/src/main/assembly/scripts/run.bat create mode 100644 ops/src/main/assembly/scripts/run.sh create mode 100644 order/order-application/src/main/assembly/assembly.xml create mode 100644 order/order-application/src/main/assembly/scripts/run.bat create mode 100644 order/order-application/src/main/assembly/scripts/run.sh create mode 100644 pay/pay-application/src/main/assembly/assembly.xml create mode 100644 pay/pay-application/src/main/assembly/scripts/run.bat create mode 100644 pay/pay-application/src/main/assembly/scripts/run.sh create mode 100644 product/product-application/src/main/assembly/assembly.xml create mode 100644 product/product-application/src/main/assembly/scripts/run.bat create mode 100644 product/product-application/src/main/assembly/scripts/run.sh create mode 100644 promotion/promotion-application/src/main/assembly/assembly.xml create mode 100644 promotion/promotion-application/src/main/assembly/scripts/run.bat create mode 100644 promotion/promotion-application/src/main/assembly/scripts/run.sh create mode 100644 search/search-application/src/main/assembly/assembly.xml create mode 100644 search/search-application/src/main/assembly/scripts/run.bat create mode 100644 search/search-application/src/main/assembly/scripts/run.sh create mode 100644 system/system-application/src/main/assembly/assembly.xml create mode 100644 system/system-application/src/main/assembly/scripts/run.bat create mode 100644 system/system-application/src/main/assembly/scripts/run.sh create mode 100644 user/user-application/src/main/assembly/assembly.xml create mode 100644 user/user-application/src/main/assembly/scripts/run.bat create mode 100644 user/user-application/src/main/assembly/scripts/run.sh 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/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/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..813105d00 --- /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=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/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..78f5e3ef7 --- /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=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-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/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/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/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/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/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} From 86694d1867fdd2e394d8a08c1288697b83043e9d Mon Sep 17 00:00:00 2001 From: sam Date: Sun, 2 Feb 2020 09:19:49 +0800 Subject: [PATCH 3/6] repo https --- pay/pay-service-impl/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 790c6905c901cf0a99f1d1a55a83c2b6aa284b34 Mon Sep 17 00:00:00 2001 From: "sam@pincun-win10" Date: Tue, 2 Jun 2020 21:42:05 +0800 Subject: [PATCH 4/6] APP_MAIN=cn.iocoder.mall.order.application.OrderApplication --- order/order-application/src/main/assembly/scripts/run.bat | 2 +- order/order-application/src/main/assembly/scripts/run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/order/order-application/src/main/assembly/scripts/run.bat b/order/order-application/src/main/assembly/scripts/run.bat index 813105d00..d30b675d8 100644 --- a/order/order-application/src/main/assembly/scripts/run.bat +++ b/order/order-application/src/main/assembly/scripts/run.bat @@ -3,7 +3,7 @@ set BIN_DIR=%~dp0 ::cnf set APP_OPS="" -set APP_MAIN=com.dvp.ci.web.Main +set APP_MAIN=cn.iocoder.mall.order.application.OrderApplication ::run 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 index 78f5e3ef7..315cbf84c 100644 --- a/order/order-application/src/main/assembly/scripts/run.sh +++ b/order/order-application/src/main/assembly/scripts/run.sh @@ -1,7 +1,7 @@ #!/bin/sh ##cnf APP_OPS="-Xms256m -Xmx512m" -APP_MAIN=com.dvp.ci.web.Main +APP_MAIN=cn.iocoder.mall.order.application.OrderApplication ##run cur=$(dirname $(readlink -f "$0")) && cd $cur/.. From 368a13339fadb408aa4bedba41c3cd2dc5b5f9b1 Mon Sep 17 00:00:00 2001 From: "sam@tpad-win10" Date: Sat, 4 Jan 2020 17:58:27 +0800 Subject: [PATCH 5/6] pom x9 +1 up2 fix pom ok # Conflicts: # order/order-application/pom.xml # product/product-application/pom.xml # promotion/promotion-application/pom.xml # search/search-application/pom.xml --- demo/demo-application/pom.xml | 20 +++++-- ops/pom.xml | 18 ++++++- order/order-application/pom.xml | 14 +++++ package.bat | 3 ++ pay/pay-application/pom.xml | 20 +++++-- pom.xml | 71 +++++++++++++++++++++---- product/product-application/pom.xml | 14 +++++ promotion/promotion-application/pom.xml | 18 ++++++- search/search-application/pom.xml | 13 +++++ system/system-application/pom.xml | 16 ++++++ user/user-application/pom.xml | 14 +++++ 11 files changed, 202 insertions(+), 19 deletions(-) create mode 100644 package.bat 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/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/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/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/pom.xml b/pom.xml index bb39a0a29..3d8d913ac 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,16 @@ 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 @@ -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/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/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/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/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/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 + + + From bb2a8d700eefd96c79ee2c3812493a478a89bb3a Mon Sep 17 00:00:00 2001 From: "sam@pincun-win10" Date: Wed, 10 Jun 2020 16:05:26 +0800 Subject: [PATCH 6/6] fix pom build --- order/order-biz-api/pom.xml | 2 +- pom.xml | 6 +++--- product/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) 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/pom.xml b/pom.xml index 3d8d913ac..4f99ca860 100644 --- a/pom.xml +++ b/pom.xml @@ -19,18 +19,18 @@ onemall 1.0-SNAPSHOT + common + system product order user - common - system promotion mall-dependencies - mall-spring-boot-starter-cache + pom 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 +