From 94e687f5b4e95b081a1e32c670705cf2568591f0 Mon Sep 17 00:00:00 2001
From: luozhun <2025254074@qq.com>
Date: Thu, 31 Oct 2024 14:25:35 +0800
Subject: [PATCH 1/3] success!

---
 superManagement/src/views/test.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/superManagement/src/views/test.vue b/superManagement/src/views/test.vue
index bc55521..170ad7c 100644
--- a/superManagement/src/views/test.vue
+++ b/superManagement/src/views/test.vue
@@ -1,6 +1,7 @@
 <template>
   <administrative-division-tree/>
   123123
+  <a-image src="http://118.253.177.137:9000/police-security/2024/10/30/55f99091b88c4c80ab90036d2b4914c6.jpg"/>
 </template>
 
 <script setup lang="ts">

From 8a32c77f4c13e1dbfa7ff529201702fc71a9da89 Mon Sep 17 00:00:00 2001
From: luozhun <2025254074@qq.com>
Date: Thu, 31 Oct 2024 15:20:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?minio=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/env/dev/application.yml           | 2 +-
 .../src/main/resources/env/prod/application.yml          | 2 +-
 superManagement/src/views/test.vue                       | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/policeSecurityServer/src/main/resources/env/dev/application.yml b/policeSecurityServer/src/main/resources/env/dev/application.yml
index ac28684..b638e99 100644
--- a/policeSecurityServer/src/main/resources/env/dev/application.yml
+++ b/policeSecurityServer/src/main/resources/env/dev/application.yml
@@ -116,7 +116,7 @@ logging:
   config: classpath:conf/log4j2.xml
 
 minio:
-  url: https://www.hnjinglian.cn:9000
+  url: http://118.253.177.137:9000
   accessKey: admin
   secretKey: lonsung301
   bucketName: police-security-dev
diff --git a/policeSecurityServer/src/main/resources/env/prod/application.yml b/policeSecurityServer/src/main/resources/env/prod/application.yml
index 81ebf76..ea1f45f 100644
--- a/policeSecurityServer/src/main/resources/env/prod/application.yml
+++ b/policeSecurityServer/src/main/resources/env/prod/application.yml
@@ -116,7 +116,7 @@ logging:
   config: classpath:conf/log4j2.xml
 
 minio:
-  url: https://www.hnjinglian.cn:9000
+  url: https://www.hnjinglian.cn:9002
   accessKey: admin
   secretKey: lonsung301
   bucketName: police-security
diff --git a/superManagement/src/views/test.vue b/superManagement/src/views/test.vue
index 170ad7c..b712762 100644
--- a/superManagement/src/views/test.vue
+++ b/superManagement/src/views/test.vue
@@ -1,11 +1,18 @@
 <template>
   <administrative-division-tree/>
   123123
-  <a-image src="http://118.253.177.137:9000/police-security/2024/10/30/55f99091b88c4c80ab90036d2b4914c6.jpg"/>
+  <a-image width="100" height="100"
+           :src="'https://www.hnjinglian.cn:9002'+objUrl"/>
+  <a-image width="100" height="100"
+           :src="'https://www.hnjinglian.cn:2563/minio_9000'+objUrl"/>
+  <a-image width="100" height="100"
+           :src="'http://118.253.177.137:9000'+objUrl"/>
 </template>
 
 <script setup lang="ts">
 import AdministrativeDivisionTree from "@/components/tree/AdministrativeDivisionTree.vue";
+
+const objUrl = "/police-security/2024/10/30/55f99091b88c4c80ab90036d2b4914c6.jpg";
 </script>
 
 <style scoped lang="scss">

From 10bcd21888d09ad1b46de8381ecd01eb14a5c9e4 Mon Sep 17 00:00:00 2001
From: luozhun <2025254074@qq.com>
Date: Thu, 31 Oct 2024 15:23:30 +0800
Subject: [PATCH 3/3] server Jenkinsfile

---
 policeSecurityServer/Jenkinsfile | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/policeSecurityServer/Jenkinsfile b/policeSecurityServer/Jenkinsfile
index 6104fe9..040cad9 100644
--- a/policeSecurityServer/Jenkinsfile
+++ b/policeSecurityServer/Jenkinsfile
@@ -34,9 +34,21 @@ pipeline {
                     }
                     sshCommand remote: remote, command: 'pwd=$(pwd) echo "ssh连接成功！当前工作目录：$(pwd)"'
 
+                    sshCommand remote: remote, command: 'echo "停止后台服务..."'
+                    sshCommand remote: remote, command: '''docker stop policeSecurityServer'''
+                    sshCommand remote: remote, command: 'echo "后台服务已停止..."'
+
+                    sshCommand remote: remote, command: 'echo "删除原来的server.jar..."'
+                    sshRemove remote: remote, path: '/home/javaProject/policeSecurity/policeSecurityServer.jar'
+                    sshCommand remote: remote, command: 'echo "server.jar删除成功!"'
+
                     sshCommand remote: remote, command: 'echo "将构建的server.jar发送到服务器..."'
-                    sshPut remote: remote, from: '/var/jenkins_home/workspace/警保联动后端服务/policeSecurityServer/target/policeSecurityServer.jar', into: '/home/javaProject/policeSecurity/logs'
+                    sshPut remote: remote, from: '/var/jenkins_home/workspace/警保联动后端服务/policeSecurityServer/target/policeSecurityServer.jar', into: '/home/javaProject/policeSecurity'
                     sshCommand remote: remote, command: 'echo "server.jar发送成功!"'
+
+                    sshCommand remote: remote, command: 'echo "启动后台服务..."'
+                    sshCommand remote: remote, command: '''docker start policeSecurityServer'''
+                    sshCommand remote: remote, command: 'echo "后台服务启动成功!"'
                 }
             }
         }