Merge remote-tracking branch 'origin/master'

# Conflicts:
#	audio-analysis/src/main/resources/bootstrap-dev.yml
#	cooleshow-auth/auth-server/src/main/resources/bootstrap-dev.yml
#	cooleshow-bbs/src/main/resources/bootstrap-dev.yml
#	cooleshow-mall/mall-admin/src/main/resources/bootstrap-dev.yml
#	cooleshow-mall/mall-portal/src/main/resources/bootstrap-dev.yml
#	cooleshow-task/src/main/resources/bootstrap-dev.yml
#	cooleshow-user/user-admin/src/main/resources/bootstrap-dev.yml
#	cooleshow-user/user-classroom/src/main/resources/bootstrap-dev.yml
#	cooleshow-user/user-student/src/main/resources/bootstrap-dev.yml
#	cooleshow-user/user-teacher/src/main/resources/bootstrap-dev.yml
#	cooleshow-user/user-website/src/main/resources/bootstrap-dev.yml
#	cooleshow-websocket/src/main/resources/bootstrap-dev.yml

Jenkinsfile

@@ -4,10 +4,10 @@ pipeline {
     environment {
 
        BUILD_USER = ""
-       REMOTE_PATH = "/mnt/datadisk/dev/jenkins"
+       REMOTE_PATH = "/mdata/cooleshow-test/jenkins"
        BUILD_FILE = "libs.tar.gz"
        ROBOT_ID = "a346e21b-706e-4881-8e3b-6c48d16d0c3b"
-       SSH_AUTH = "ECS-CooleShow-47.114.1.200-dev"
+       SSH_AUTH = "WH-COOLESHOW-TEST"
     }
 
     stages {

cooleshow-cms/src/main/resources/bootstrap-dev.properties

@@ -1,6 +1,6 @@
 
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.114.1.200:8848
+spring.cloud.nacos.config.server-addr=43.137.4.92:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 spring.cloud.nacos.config.namespace=6f8374a9-598f-4889-bb17-476070ffb8de
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

cooleshow-gateway/gateway-web/src/main/resources/bootstrap-dev.properties

@@ -1,7 +1,7 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.114.1.200:8848
+spring.cloud.nacos.config.server-addr=43.137.4.92:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 spring.cloud.nacos.config.namespace=6f8374a9-598f-4889-bb17-476070ffb8de
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

pom.xml

@@ -22,6 +22,7 @@
 		<zipkin.version>2.12.2</zipkin.version>
 		<google.zxing.version>3.4.0</google.zxing.version>
 		<redisson.version>3.16.4</redisson.version>
+		<maven.test.skip>true</maven.test.skip>
 	</properties>
 
 

service.md

@@ -1,6 +1,6 @@
 - [ ] gateway-server
 - [ ] auth-server
-- [ ] admin-server
+- [x] admin-server
 - [ ] auth-server
 - [ ] admin-server
 - [ ] teacher-server