Merge remote-tracking branch 'origin/master'

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetController.java

@@ -31,7 +31,7 @@ public class MusicSheetController extends BaseController {
         }
 
         musicSheet.setCreateBy(0L);
-        //musicSheetService.insert(musicSheet);
+        musicSheetService.save(musicSheet);
         return succeed();
     }
 }

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

@@ -1,28 +1,12 @@
-#spring:
-#  cloud:
-#    nacos:
-#      config:
-#        server-addr: 47.114.1.200:8848
-#        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
-#        group: DEFAULT_GROUP
-#        prefix: student
-#        file-extension: yaml
-#        refresh:
-#          enabled: true
-#        enabled: true
-
 spring:
   cloud:
     nacos:
-      discovery:
-        server-addr: localhost:8848 #ÅäÖÃNacosµØÖ·
-        namespace: dev
       config:
-        server-addr: localhost:8848
-        namespace: dev
+        server-addr: 47.114.1.200:8848
+        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
         group: DEFAULT_GROUP
-        #prefix: admin
+        prefix: admin
         file-extension: yaml
         refresh:
           enabled: true
-        enabled: true
+        enabled: true

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

@@ -5,7 +5,7 @@ spring:
         server-addr: 47.114.1.200:8848
         namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
         group: DEFAULT_GROUP
-        prefix: student
+        prefix: admin
         file-extension: yaml
         refresh:
           enabled: true

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/AlbumFavorite.java

@@ -22,7 +22,7 @@ public class AlbumFavorite implements Serializable {
     * 主键 
     */
     @ApiModelProperty("主键 ")
-    @TableId(value = "id_", type = IdType.UUID)
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
     /** 
     * 用户ID(目前只是学生ID) 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/AlbumMusicRelate.java

@@ -22,7 +22,7 @@ public class AlbumMusicRelate implements Serializable {
     * 主键 
     */
     @ApiModelProperty("主键 ")
-    @TableId(value = "id_", type = IdType.UUID)
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
     /** 
     * 专辑ID 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicAlbum.java

@@ -22,7 +22,7 @@ public class MusicAlbum implements Serializable {
     * 主键 
     */
     @ApiModelProperty("主键 ")
-    @TableId(value = "id_", type = IdType.UUID)
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
     /** 
     * 专辑名称 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicFavorite.java

@@ -22,7 +22,7 @@ public class MusicFavorite implements Serializable {
     * 主键 
     */
     @ApiModelProperty("主键 ")
-    @TableId(value = "id_", type = IdType.UUID)
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
     /** 
     * 用户ID(目前只是学生ID) 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -23,7 +23,7 @@ public class MusicSheet implements Serializable {
     * 主键 
     */
     @ApiModelProperty("主键 ")
-    @TableId(value = "id_", type = IdType.UUID)
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
     /** 
     * 曲谱名称 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheetAccompaniment.java

@@ -22,7 +22,7 @@ public class MusicSheetAccompaniment implements Serializable {
     * 主键 
     */
     @ApiModelProperty("主键 ")
-    @TableId(value = "id_", type = IdType.UUID)
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
     /** 
     * 曲谱ID 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheetPurchaseRecord.java

@@ -23,7 +23,7 @@ public class MusicSheetPurchaseRecord implements Serializable {
     * 主键 
     */
     @ApiModelProperty("主键 ")
-    @TableId(value = "id_", type = IdType.UUID)
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
     /** 
     * 曲谱ID 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonEvaluate.java

@@ -22,7 +22,7 @@ public class VideoLessonEvaluate implements Serializable {
     * 主键 
     */
     @ApiModelProperty("主键 ")
-    @TableId(value = "id_", type = IdType.UUID)
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
     /** 
     * 视频ID 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonGroup.java

@@ -22,7 +22,7 @@ public class VideoLessonGroup implements Serializable {
     * 主键 
     */
     @ApiModelProperty("主键 ")
-    @TableId(value = "id_", type = IdType.UUID)
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
     /** 
     * 课程名称 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonGroupDetail.java

@@ -22,7 +22,7 @@ public class VideoLessonGroupDetail implements Serializable {
     * 主键 
     */
     @ApiModelProperty("主键 ")
-    @TableId(value = "id_", type = IdType.UUID)
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
     /** 
     * 课程组ID 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonPurchaseRecord.java

@@ -23,7 +23,7 @@ public class VideoLessonPurchaseRecord implements Serializable {
     * 主键 
     */
     @ApiModelProperty("主键 ")
-    @TableId(value = "id_", type = IdType.UUID)
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
     /** 
     * 视频课组ID 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VideoLessonStudyRecord.java

@@ -22,7 +22,7 @@ public class VideoLessonStudyRecord implements Serializable {
     * 主键 
     */
     @ApiModelProperty("主键 ")
-    @TableId(value = "id_", type = IdType.UUID)
+    @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
     /** 
     * 视频课组ID