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 "后台服务启动成功!"'
}
}
}
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 bc55521..b712762 100644
--- a/superManagement/src/views/test.vue
+++ b/superManagement/src/views/test.vue
@@ -1,10 +1,18 @@
123123
+
+
+