From 1faf678a8823b908f6a8835763dfbb800a5e8068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Wed, 19 Jun 2024 16:38:12 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8F=91=E7=89=88?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ Jenkinsfile | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b3156879 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.idea +ui/**/dist \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index e69de29b..d61f238a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -0,0 +1,52 @@ +pipeline { + environment { + PROJECT_NAME='ry-das' + } + agent any + tools { + dockerTool 'local' + } + stages { + stage('拉取源码') { + steps { + checkout scmGit(branches: [[name: '*/main']], extensions: [], userRemoteConfigs: [[credentialsId: 'd62224c5-69cf-474a-8845-c2c2bbe1fc00', url: 'https://git.jsspisoft.com/ry-das.git']]) + } + } + stage('编译UI') { + steps { + nodejs(cacheLocationStrategy: workspace(), configId: '8e356590-2fee-4f1f-b0e9-5cea43299887', nodeJSInstallationName: 'nodejs202122') { + dir("$WORKSPACE/ui/dasadmin") { + sh "npm install" + sh "npm run build" + } + } + } + } + stage('编译后端') { + steps { + withMaven(globalMavenSettingsConfig: 'bab2e7fd-587c-4284-9bd8-6b97dfeb2fab', jdk: 'jdk17', maven: 'maven396', mavenSettingsConfig: '') { + dir("$WORKSPACE") { + sh "mkdir -p das/src/main/resources/static" + sh "rm -rf das/src/main/resources/static/*" + sh "cp -a ui/dasadmin/dist/* das/src/main/resources/static/" + sh "mvn -DskipTests -Pprod -pl das -am clean package" + } + } + } + } + stage('发版'){ + steps { + script { + def remote = [:] + remote.name = "master" + remote.host = "192.168.109.195" + remote.allowAnyHosts = true + remote.user = "root" + remote.password = "84805353" + sshCommand remote: remote, command: 'cd /uspcloud/usp3/ && docker compose pull services-sypower && docker compose down services-sypower && docker compose up -d services-sypower' + } + + } + } + } +} \ No newline at end of file From 4211466670c94d9889e73eff70526f0d9a42863f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Wed, 19 Jun 2024 16:47:38 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=91=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d61f238a..dee2915a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,13 +37,13 @@ pipeline { stage('发版'){ steps { script { - def remote = [:] - remote.name = "master" - remote.host = "192.168.109.195" - remote.allowAnyHosts = true - remote.user = "root" - remote.password = "84805353" - sshCommand remote: remote, command: 'cd /uspcloud/usp3/ && docker compose pull services-sypower && docker compose down services-sypower && docker compose up -d services-sypower' + // def remote = [:] + // remote.name = "master" + // remote.host = "192.168.109.195" + // remote.allowAnyHosts = true + // remote.user = "root" + // remote.password = "84805353" + // sshCommand remote: remote, command: 'cd /uspcloud/usp3/ && docker compose pull services-sypower && docker compose down services-sypower && docker compose up -d services-sypower' } } From 4da6dfe566f7175a355dffd16c4a2ab7a2615815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Wed, 19 Jun 2024 16:48:57 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=91=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dee2915a..6f3fdd74 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,11 +25,11 @@ pipeline { stage('编译后端') { steps { withMaven(globalMavenSettingsConfig: 'bab2e7fd-587c-4284-9bd8-6b97dfeb2fab', jdk: 'jdk17', maven: 'maven396', mavenSettingsConfig: '') { - dir("$WORKSPACE") { - sh "mkdir -p das/src/main/resources/static" - sh "rm -rf das/src/main/resources/static/*" - sh "cp -a ui/dasadmin/dist/* das/src/main/resources/static/" - sh "mvn -DskipTests -Pprod -pl das -am clean package" + dir("$WORKSPACE/das") { + sh "mkdir -p $WORKSPACE/das/src/main/resources/static" + sh "rm -rf $WORKSPACE/das/src/main/resources/static/*" + sh "cp -a $WORKSPACE/ui/dasadmin/dist/* $WORKSPACE/das/src/main/resources/static/" + sh "mvn -DskipTests -am clean package" } } } From d85c6ae083102c5d3ba6981724edad52ff34a382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Wed, 19 Jun 2024 16:51:34 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=91=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6f3fdd74..3108c755 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,19 +34,19 @@ pipeline { } } } - stage('发版'){ - steps { - script { - // def remote = [:] - // remote.name = "master" - // remote.host = "192.168.109.195" - // remote.allowAnyHosts = true - // remote.user = "root" - // remote.password = "84805353" - // sshCommand remote: remote, command: 'cd /uspcloud/usp3/ && docker compose pull services-sypower && docker compose down services-sypower && docker compose up -d services-sypower' - } + // stage('发版'){ + // steps { + // script { + // // def remote = [:] + // // remote.name = "master" + // // remote.host = "192.168.109.195" + // // remote.allowAnyHosts = true + // // remote.user = "root" + // // remote.password = "84805353" + // // sshCommand remote: remote, command: 'cd /uspcloud/usp3/ && docker compose pull services-sypower && docker compose down services-sypower && docker compose up -d services-sypower' + // } - } - } + // } + // } } } \ No newline at end of file From 21ae3867cb15de26a9d08b3db49c700bb2e71505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Wed, 19 Jun 2024 16:55:31 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=91=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3108c755..f8032eb4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,9 +3,6 @@ pipeline { PROJECT_NAME='ry-das' } agent any - tools { - dockerTool 'local' - } stages { stage('拉取源码') { steps { @@ -24,7 +21,7 @@ pipeline { } stage('编译后端') { steps { - withMaven(globalMavenSettingsConfig: 'bab2e7fd-587c-4284-9bd8-6b97dfeb2fab', jdk: 'jdk17', maven: 'maven396', mavenSettingsConfig: '') { + withMaven(globalMavenSettingsConfig: 'bab2e7fd-587c-4284-9bd8-6b97dfeb2fab', jdk: 'jdk17', maven: 'maven396', mavenSettingsConfig: '') { dir("$WORKSPACE/das") { sh "mkdir -p $WORKSPACE/das/src/main/resources/static" sh "rm -rf $WORKSPACE/das/src/main/resources/static/*" From 6f73a898252db18b2f022c343f8ee18d8f7a68c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Wed, 19 Jun 2024 16:59:09 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=91=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f8032eb4..3a208bde 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,4 @@ pipeline { - environment { - PROJECT_NAME='ry-das' - } agent any stages { stage('拉取源码') { @@ -21,7 +18,7 @@ pipeline { } stage('编译后端') { steps { - withMaven(globalMavenSettingsConfig: 'bab2e7fd-587c-4284-9bd8-6b97dfeb2fab', jdk: 'jdk17', maven: 'maven396', mavenSettingsConfig: '') { + withMaven(globalMavenSettingsConfig: 'bab2e7fd-587c-4284-9bd8-6b97dfeb2fab', jdk: 'jdk17', maven: 'maven396') { dir("$WORKSPACE/das") { sh "mkdir -p $WORKSPACE/das/src/main/resources/static" sh "rm -rf $WORKSPACE/das/src/main/resources/static/*" @@ -31,19 +28,5 @@ pipeline { } } } - // stage('发版'){ - // steps { - // script { - // // def remote = [:] - // // remote.name = "master" - // // remote.host = "192.168.109.195" - // // remote.allowAnyHosts = true - // // remote.user = "root" - // // remote.password = "84805353" - // // sshCommand remote: remote, command: 'cd /uspcloud/usp3/ && docker compose pull services-sypower && docker compose down services-sypower && docker compose up -d services-sypower' - // } - - // } - // } } } \ No newline at end of file From 8124b7b65ada023db8a3b308e068730c2045157c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Wed, 19 Jun 2024 17:01:38 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3a208bde..fe0b888d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,9 +20,9 @@ pipeline { steps { withMaven(globalMavenSettingsConfig: 'bab2e7fd-587c-4284-9bd8-6b97dfeb2fab', jdk: 'jdk17', maven: 'maven396') { dir("$WORKSPACE/das") { - sh "mkdir -p $WORKSPACE/das/src/main/resources/static" - sh "rm -rf $WORKSPACE/das/src/main/resources/static/*" - sh "cp -a $WORKSPACE/ui/dasadmin/dist/* $WORKSPACE/das/src/main/resources/static/" + // sh "mkdir -p $WORKSPACE/das/src/main/resources/static" + // sh "rm -rf $WORKSPACE/das/src/main/resources/static/*" + // sh "cp -a $WORKSPACE/ui/dasadmin/dist/* $WORKSPACE/das/src/main/resources/static/" sh "mvn -DskipTests -am clean package" } } From d0210860ae90dbc9e0ddc879a80063d5db33d6c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Wed, 19 Jun 2024 17:08:29 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fe0b888d..405b7332 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,8 +20,8 @@ pipeline { steps { withMaven(globalMavenSettingsConfig: 'bab2e7fd-587c-4284-9bd8-6b97dfeb2fab', jdk: 'jdk17', maven: 'maven396') { dir("$WORKSPACE/das") { - // sh "mkdir -p $WORKSPACE/das/src/main/resources/static" - // sh "rm -rf $WORKSPACE/das/src/main/resources/static/*" + sh "mkdir -p $WORKSPACE/das/src/main/resources/static" + sh "rm -rf $WORKSPACE/das/src/main/resources/static/*" // sh "cp -a $WORKSPACE/ui/dasadmin/dist/* $WORKSPACE/das/src/main/resources/static/" sh "mvn -DskipTests -am clean package" } From 5f408be93bf2fe5da813ea69ef3df7617bc48631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Wed, 19 Jun 2024 17:11:39 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 405b7332..ebc650fd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,7 +21,7 @@ pipeline { withMaven(globalMavenSettingsConfig: 'bab2e7fd-587c-4284-9bd8-6b97dfeb2fab', jdk: 'jdk17', maven: 'maven396') { dir("$WORKSPACE/das") { sh "mkdir -p $WORKSPACE/das/src/main/resources/static" - sh "rm -rf $WORKSPACE/das/src/main/resources/static/*" + // sh "rm -rf $WORKSPACE/das/src/main/resources/static/*" // sh "cp -a $WORKSPACE/ui/dasadmin/dist/* $WORKSPACE/das/src/main/resources/static/" sh "mvn -DskipTests -am clean package" } From 6267c6857bf4d25111f2e8cc3ede0410bfd28648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Wed, 19 Jun 2024 17:26:45 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ebc650fd..f14ebc4f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,10 +20,10 @@ pipeline { steps { withMaven(globalMavenSettingsConfig: 'bab2e7fd-587c-4284-9bd8-6b97dfeb2fab', jdk: 'jdk17', maven: 'maven396') { dir("$WORKSPACE/das") { - sh "mkdir -p $WORKSPACE/das/src/main/resources/static" - // sh "rm -rf $WORKSPACE/das/src/main/resources/static/*" - // sh "cp -a $WORKSPACE/ui/dasadmin/dist/* $WORKSPACE/das/src/main/resources/static/" - sh "mvn -DskipTests -am clean package" + sh 'mkdir -p "$WORKSPACE/das/src/main/resources/static"' + sh 'rm -rf "$WORKSPACE/das/src/main/resources/static/*"' + sh 'cp -a "$WORKSPACE/ui/dasadmin/dist/*" "$WORKSPACE/das/src/main/resources/static/"' + sh 'mvn -DskipTests -am clean package' } } } From 95b2a19522b831f0e2ab3d1e4c6e925799049d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=B7=E6=88=90=E4=BC=9F?= Date: Wed, 19 Jun 2024 17:34:58 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f14ebc4f..3baff653 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,8 +21,7 @@ pipeline { withMaven(globalMavenSettingsConfig: 'bab2e7fd-587c-4284-9bd8-6b97dfeb2fab', jdk: 'jdk17', maven: 'maven396') { dir("$WORKSPACE/das") { sh 'mkdir -p "$WORKSPACE/das/src/main/resources/static"' - sh 'rm -rf "$WORKSPACE/das/src/main/resources/static/*"' - sh 'cp -a "$WORKSPACE/ui/dasadmin/dist/*" "$WORKSPACE/das/src/main/resources/static/"' + sh 'rsync -av --delete "$WORKSPACE/ui/dasadmin/dist/" "$WORKSPACE/das/src/main/resources/static"' sh 'mvn -DskipTests -am clean package' } }