merge

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

@@ -9,5 +9,6 @@ spring:
         file-extension: yaml
         enabled: true
         refresh-enabled: true
-logging:
-  config: classpath:logback-spring.xml
+        shared-configs:
+          - data-id: base.yaml
+            refresh: true

audio-analysis/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mnt/datadisk/logs/audio-analysis-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="${LOG_HOME}/audio-analysis-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/UserMusicController.java

@@ -77,7 +77,7 @@ public class UserMusicController {
 
     @ApiOperation(value = "保存草稿/发布作品", notes = "用户曲目作品- 传入 UserMusicWrapper.UserMusic")
     @PostMapping("/save")
-    public HttpResponseResult<JSONObject> add(@Validated @RequestBody UserMusicWrapper.AddUserMusic userMusic) {
+    public HttpResponseResult<Long> add(@Validated @RequestBody UserMusicWrapper.AddUserMusic userMusic) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
@@ -85,9 +85,9 @@ public class UserMusicController {
         userMusic.setUserId(user.getId());
         userMusic.setClientType(ClientEnum.STUDENT);
         // 新增数据
-        userMusicService.save(userMusic);
+        ;
 
-        return HttpResponseResult.succeed();
+        return HttpResponseResult.succeed(userMusicService.save(userMusic));
     }
 
     @ApiOperation(value = "删除", notes = "用户曲目作品- 传入id")

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/UserMusicController.java

@@ -74,7 +74,7 @@ public class UserMusicController {
 
     @ApiOperation(value = "保存草稿/发布作品", notes = "用户曲目作品- 传入 UserMusicWrapper.UserMusic")
     @PostMapping("/save")
-    public HttpResponseResult<JSONObject> add(@Validated @RequestBody UserMusicWrapper.AddUserMusic userMusic) {
+    public HttpResponseResult<Long> add(@Validated @RequestBody UserMusicWrapper.AddUserMusic userMusic) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
@@ -82,9 +82,9 @@ public class UserMusicController {
         userMusic.setUserId(user.getId());
         userMusic.setClientType(ClientEnum.TEACHER);
         // 新增数据
-        userMusicService.save(userMusic);
+        ;
 
-        return HttpResponseResult.succeed();
+        return HttpResponseResult.succeed(userMusicService.save(userMusic));
     }
 
     @ApiOperation(value = "删除", notes = "用户曲目作品- 传入id")

cooleshow-app/src/main/resources/bootstrap-prod.yml

@@ -7,11 +7,8 @@ spring:
         group: DEFAULT_GROUP
         prefix: app
         file-extension: yaml
-        refresh:
-          enabled: true
         enabled: true
         shared-configs:
           - data-id: base.yaml
             refresh: true
-logging:
-  config: classpath:logback-spring.xml
+        refresh-enabled: true

cooleshow-app/src/main/resources/logback-spring.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mnt/datadisk/logs/app-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 
@@ -13,7 +12,7 @@
 
 	<appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<FileNamePattern>${LOG_HOME}</FileNamePattern>
+			<FileNamePattern>${LOG_HOME}/app-%d{yyyy-MM-dd_HH}-%i.log</FileNamePattern>
 			<MaxHistory>90</MaxHistory>
 			<TimeBasedFileNamingAndTriggeringPolicy
 				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">

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

@@ -9,3 +9,5 @@ spring:
         file-extension: yaml
         refresh-enabled: true
         enabled: true
+logging:
+  config: classpath:logback-spring.xml

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

@@ -7,8 +7,7 @@ spring:
         group: DEFAULT_GROUP
         prefix: auth
         file-extension: yaml
-        refresh:
-          enabled: true
+        refresh-enabled: true
         enabled: true
 logging:
   config: classpath:logback-spring.xml

cooleshow-auth/auth-server/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mnt/datadisk/logs/auth-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="${LOG_HOME}/auth-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 

cooleshow-bbs/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mnt/datadisk/logs/bbs-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="${LOG_HOME}/bbs-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 

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

@@ -1,15 +0,0 @@
-
-#\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=10.206.0.16:8848
-#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=e456599c-bef6-453d-927f-0e4a321259ed
-#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
-spring.cloud.nacos.config.group=DEFAULT_GROUP
-#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
-spring.cloud.nacos.config.prefix=cms
-#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
-spring.cloud.nacos.config.file-extension=yaml
-#\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
-#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
-spring.cloud.nacos.config.enabled=true

cooleshow-cms/src/main/resources/bootstrap-pre.yml

@@ -0,0 +1,15 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 10.206.0.16:8848
+        namespace: e456599c-bef6-453d-927f-0e4a321259ed
+        group: DEFAULT_GROUP
+        prefix: cms
+        file-extension: yaml
+        enabled: true
+        refresh-enabled: true
+        shared-configs:
+          - data-id: base.yaml
+          - data-id: base-pre.yaml
+            refresh: true

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

@@ -1,16 +0,0 @@
-
-#\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=10.206.0.16:8848
-#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=dba505ee-020c-4c2b-bab2-e91d89cf248e
-#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
-spring.cloud.nacos.config.group=DEFAULT_GROUP
-#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
-spring.cloud.nacos.config.prefix=cms
-#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
-spring.cloud.nacos.config.file-extension=yaml
-#\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
-#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
-spring.cloud.nacos.config.enabled=true
-logging.config=classpath:logback-spring.xml

cooleshow-cms/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,15 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 10.206.0.16:8848
+        namespace: dba505ee-020c-4c2b-bab2-e91d89cf248e
+        group: DEFAULT_GROUP
+        prefix: cms
+        file-extension: yaml
+        enabled: true
+        refresh-enabled: true
+        shared-configs:
+          - data-id: base.yaml
+          - data-id: base-prod.yaml
+            refresh: true

cooleshow-cms/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mnt/datadisk/logs/cms-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="${LOG_HOME}/cms-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 

cooleshow-gateway/gateway-web/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mnt/datadisk/logs/gateway-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="${LOG_HOME}/gateway-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 

cooleshow-mall/mall-admin/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mnt/datadisk/logs/mall-admin-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="${LOG_HOME}/mall-admin-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 			  value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 

cooleshow-mall/mall-portal/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mnt/datadisk/logs/mall-portal-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="${LOG_HOME}/mall-portal-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 			  value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 

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

@@ -7,9 +7,11 @@ spring:
         group: DEFAULT_GROUP
         prefix: task
         file-extension: yaml
-        refresh:
-          enabled: true
+        refresh-enabled: true
         enabled: true
+        shared-configs:
+          - data-id: base.yaml
+            refresh: true
 
 logging:
   config: classpath:logback-spring.xml

cooleshow-task/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mnt/datadisk/logs/task-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="${LOG_HOME}/task-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 			  value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 

cooleshow-user/user-admin/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mnt/datadisk/logs/admin-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="${LOG_HOME}/admin-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/UserMusicService.java

@@ -56,7 +56,7 @@ public interface UserMusicService extends IService<UserMusic>  {
      * 保存草稿/发布作品
      *
      */
-    void save(UserMusicWrapper.AddUserMusic userMusic);
+    Long save(UserMusicWrapper.AddUserMusic userMusic);
 
     /**
      * 分页

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserMusicServiceImpl.java

@@ -139,7 +139,7 @@ public class UserMusicServiceImpl extends ServiceImpl<UserMusicMapper, UserMusic
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(UserMusicWrapper.AddUserMusic userMusic) {
+    public Long save(UserMusicWrapper.AddUserMusic userMusic) {
 
         // 设置曲目ID
         if (userMusic.getMusicPracticeRecordId() != null) {
@@ -189,6 +189,7 @@ public class UserMusicServiceImpl extends ServiceImpl<UserMusicMapper, UserMusic
             entity.setSubmitTime(new Date());
         }
         userMusicService.saveOrUpdate(entity);
+        return entity.getId();
     }
 
     /**

cooleshow-user/user-classroom/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mnt/datadisk/logs/classroom-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="${LOG_HOME}/classroom-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 

cooleshow-user/user-student/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mnt/datadisk/logs/student-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="${LOG_HOME}/student-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 

cooleshow-user/user-teacher/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mnt/datadisk/logs/teacher-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="${LOG_HOME}/teacher-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 

cooleshow-user/user-tenant/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mnt/datadisk/logs/tenant-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="${LOG_HOME}/tenant-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 

cooleshow-user/user-website/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mnt/datadisk/logs/website-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="${LOG_HOME}/website-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 

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

@@ -0,0 +1,14 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 10.206.0.16:8848
+        namespace: e456599c-bef6-453d-927f-0e4a321259ed
+        group: DEFAULT_GROUP
+        prefix: websocket
+        file-extension: yaml
+        enabled: true
+        shared-configs:
+          - data-id: base.yaml
+            refresh: true
+        refresh-enabled: true

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

@@ -7,8 +7,8 @@ spring:
         group: DEFAULT_GROUP
         prefix: websocket
         file-extension: yaml
-        refresh:
-          enabled: true
         enabled: true
-logging:
-  config: classpath:logback-spring.xml
+        shared-configs:
+          - data-id: base.yaml
+            refresh: true
+        refresh-enabled: true

cooleshow-websocket/src/main/resources/logback-spring.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mnt/datadisk/logs/websocket-%d{yyyy-MM-dd_HH}-%i.log" />
+	<property name="LOG_HOME" value="${LOG_HOME}/websocket-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />