v3music转v4默认

src/main/java/com/fdkankan/repair/service/impl/SceneUpgradeToV4Service.java

@@ -252,6 +252,17 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
                 if(!"noMusic".equals(sceneProEdit.getBgMusic()) && !"0".equals(sceneProEdit.getBgMusic())){
                     music = sceneProEdit.getBgMusic();
                 }
+                if(StrUtil.isNotEmpty(music)){
+                    if(music.equals("无")) music = "";
+                    if(music.equals("欢快")) music = "01";
+                    if(music.equals("空灵")) music = "02";
+                    if(music.equals("节奏")) music = "03";
+                    if(music.equals("怀旧")) music = "04";
+                    if(music.equals("想念")) music = "05";
+                    if(music.equals("复古")) music = "06";
+                    if(music.equals("琴弦")) music = "07";
+                    if(music.equals("愉快")) music = "08";
+                }
                 sceneEditInfo.setMusic(music);
                 //如果bgmusicname 不为空  ，MusicFile = BgMusicName
                 if(StrUtil.isNotEmpty(sceneProEditExt.getBgMusicName())){

src/main/resources/bootstrap-dev-eur.yml

@@ -0,0 +1,39 @@
+spring:
+  application:
+    name: 4dkankan-data-repair
+  cloud:
+    nacos:
+      config:
+        server-addr: 192.168.0.47:8848
+        file-extension: yaml
+        namespace: 4dkankan-dev
+        extension-configs:
+          - data-id: 4dkankan-center-scene.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+        shared-configs:
+          - data-id: common-db-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-redis-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-rabbitmq-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: other-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-upload-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+      discovery:
+        server-addr: 192.168.0.47:8848
+        namespace: 4dkankan-dev
+
+
+

src/main/resources/bootstrap-dev.yml

@@ -1,20 +1,6 @@
 spring:
-#  jackson:
-#    serialization:
-#      #关闭jackson转换 实体属性空值校验
-#      FAIL_ON_EMPTY_BEANS: false
-#    date-format: yyyy-MM-dd HH:mm:ss
-#    time-zone: GMT+8
   application:
     name: 4dkankan-data-repair
-#  servlet:
-#    multipart:
-#      # 设置单个文件大小
-#      max-file-size: 50MB
-#      # 设置单次请求文件的总大小
-#      max-request-size: 50MB
-#  mvc:
-#    throw-exception-if-no-handler-found: true
   cloud:
     nacos:
       config:
@@ -34,10 +20,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-#          - data-id: common-mq-config.yaml
-#            group: DEFAULT_GROUP
-#            refresh: true
-
           - data-id: common-rabbitmq-config.yaml
             group: DEFAULT_GROUP
             refresh: true
@@ -52,44 +34,6 @@ spring:
       discovery:
         server-addr: 192.168.0.47:8848
         namespace: 4dkankan-dev
-    sentinel:
-      transport:
-        dashboard: 192.168.0.47:8888
-#        dashboard: localhost:8888
-        heartbeat-interval-ms: 500
-        port: 8719
-      eager: true #取消sentinel控制台懒加载
-      #sentinel配置持久化nacos
-      datasource:
-        #流控规则
-        flow:
-          nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
-            dataId: ${spring.application.name}-flow-rules
-            groupId: SENTINEL_GROUP
-            namespace: 4dkankan-dev
-            rule-type: flow
-        #熔断规则
-        degrade:
-          nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
-            dataId: ${spring.application.name}-degrade-rules
-            groupId: SENTINEL_GROUP
-            namespace: 4dkankan-dev
-            rule-type: degrade
-#      log:
-#        dir: ./logs # 默认值${home}/logs/csp/
-#        switch-pid: true # 日志带上线程id
-
-#开启feign熔断降级，如果没有开启，feign调用链路不会显示再sentinel控制中
-#feign:
-#  sentinel:
-#    enabled: true
-
-feign:
-  httpclient:
-    connection-timeout: 200000
-
 
 
 

src/main/resources/bootstrap-pro-eur.yml

@@ -0,0 +1,40 @@
+spring:
+  application:
+    name: 4dkankan-center-scene
+  cloud:
+    nacos:
+      config:
+        server-addr: 192.168.0.47:8848
+        file-extension: yaml
+        namespace: 4dkankan-pro
+        extension-configs:
+          - data-id: 4dkankan-center-scene.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+        shared-configs:
+          - data-id: common-db-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-redis-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-rabbitmq-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: other-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-upload-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+      discovery:
+        server-addr: 192.168.0.47:8848
+        namespace: 4dkankan-pro
+
+
+
+

src/main/resources/bootstrap-pro.yml

@@ -1,20 +1,6 @@
 spring:
-#  jackson:
-#    serialization:
-#      #关闭jackson转换 实体属性空值校验
-#      FAIL_ON_EMPTY_BEANS: false
-#    date-format: yyyy-MM-dd HH:mm:ss
-#    time-zone: GMT+8
   application:
     name: 4dkankan-center-scene
-#  servlet:
-#    multipart:
-#      # 设置单个文件大小
-#      max-file-size: 50MB
-#      # 设置单次请求文件的总大小
-#      max-request-size: 50MB
-#  mvc:
-#    throw-exception-if-no-handler-found: true
   cloud:
     nacos:
       config:
@@ -34,10 +20,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-#          - data-id: common-mq-config.yaml
-#            group: DEFAULT_GROUP
-#            refresh: true
-
           - data-id: common-rabbitmq-config.yaml
             group: DEFAULT_GROUP
             refresh: true
@@ -52,46 +34,6 @@ spring:
       discovery:
         server-addr: 192.168.0.47:8848
         namespace: 4dkankan-pro
-    sentinel:
-      transport:
-        dashboard: 192.168.0.47:8888
-#        dashboard: localhost:8888
-        heartbeat-interval-ms: 500
-        port: 8719
-      eager: true #取消sentinel控制台懒加载
-      #sentinel配置持久化nacos
-      datasource:
-        #流控规则
-        flow:
-          nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
-            dataId: ${spring.application.name}-flow-rules
-            groupId: SENTINEL_GROUP
-            namespace: 4dkankan-pro
-            rule-type: flow
-        #熔断规则
-        degrade:
-          nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
-            dataId: ${spring.application.name}-degrade-rules
-            groupId: SENTINEL_GROUP
-            namespace: 4dkankan-pro
-            rule-type: degrade
-#      log:
-#        dir: ./logs # 默认值${home}/logs/csp/
-#        switch-pid: true # 日志带上线程id
-
-#开启feign熔断降级，如果没有开启，feign调用链路不会显示再sentinel控制中
-#feign:
-#  sentinel:
-#    enabled: true
-
-feign:
-  httpclient:
-    connection-timeout: 200000
-
-tlog:
-  enable-invoke-time-print: true
 
 
 

src/main/resources/bootstrap-test-eur.yml

@@ -0,0 +1,42 @@
+spring:
+  application:
+    name: 4dkankan-data-repair
+  cloud:
+    nacos:
+      config:
+        server-addr: 120.24.144.164:8848
+        file-extension: yaml
+        namespace: 4dkankan-test
+        extension-configs:
+          - data-id: 4dkankan-data-repair.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+        shared-configs:
+          - data-id: common-db-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-redis-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-rabbitmq-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: other-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-upload-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+      discovery:
+        server-addr: 120.24.144.164:8848
+        namespace: 4dkankan-test
+
+
+
+
+
+