Merge branch 'online' of http://git.dayaedu.com/yonge/cooleshow

 Conflicts:

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

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

audio-analysis/src/main/resources/bootstrap-dev.yml

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 10.206.0.7:8848
+        server-addr: 10.206.0.17:8848
         namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
         group: DEFAULT_GROUP
         prefix: audio-analysis

cooleshow-auth/auth-server/src/main/resources/bootstrap-dev.yml

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 10.206.0.7:8848
+        server-addr: 10.206.0.17:8848
         namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
         group: DEFAULT_GROUP
         prefix: auth

cooleshow-bbs/src/main/resources/bootstrap-dev.yml

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 10.206.0.7:8848
+        server-addr: 10.206.0.17:8848
         namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
         group: DEFAULT_GROUP
         prefix: bbs

cooleshow-mall/mall-admin/src/main/resources/bootstrap-dev.yml

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 10.206.0.7:8848
+        server-addr: 10.206.0.17:8848
         namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
         group: DEFAULT_GROUP
         prefix: mall-admin

cooleshow-mall/mall-portal/src/main/resources/bootstrap-dev.yml

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 10.206.0.7:8848
+        server-addr: 10.206.0.17:8848
         namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
         group: DEFAULT_GROUP
         prefix: mall-portal

cooleshow-task/src/main/resources/bootstrap-dev.yml

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 10.206.0.7:8848
+        server-addr: 10.206.0.17:8848
         namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
         group: DEFAULT_GROUP
         prefix: task

cooleshow-user/user-admin/src/main/resources/bootstrap-dev.yml

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 10.206.0.7:8848
+        server-addr: 10.206.0.17:8848
         namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
         group: DEFAULT_GROUP
         prefix: admin

cooleshow-user/user-classroom/src/main/resources/bootstrap-dev.yml

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 10.206.0.7:8848
+        server-addr: 10.206.0.17:8848
         namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
         group: DEFAULT_GROUP
         prefix: classroom

cooleshow-user/user-student/src/main/resources/bootstrap-dev.yml

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 10.206.0.7:8848
+        server-addr: 10.206.0.17:8848
         namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
         group: DEFAULT_GROUP
         prefix: student

cooleshow-user/user-teacher/src/main/resources/bootstrap-dev.yml

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 10.206.0.7:8848
+        server-addr: 10.206.0.17:8848
         namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
         group: DEFAULT_GROUP
         prefix: teacher

cooleshow-user/user-website/src/main/resources/bootstrap-dev.yml

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 10.206.0.7:8848
+        server-addr: 10.206.0.17:8848
         namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
         group: DEFAULT_GROUP
         prefix: website

cooleshow-websocket/src/main/resources/bootstrap-dev.yml

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 10.206.0.7:8848
+        server-addr: 10.206.0.17:8848
         namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
         group: DEFAULT_GROUP
         prefix: websocket