lyhzzz 11 ماه پیش
والد
کامیت
2129d1eee6
3فایلهای تغییر یافته به همراه42 افزوده شده و 1 حذف شده
  1. 12 0
      pom.xml
  2. 1 1
      src/main/java/com/fdkankan/tk/service/impl/RoomServiceImpl.java
  3. 29 0
      src/main/resources/bootstrap-xj.yml

+ 12 - 0
pom.xml

@@ -29,6 +29,12 @@
             <version>2.2.7.RELEASE</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-fyun-parent</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+
 
         <dependency>
             <groupId>com.fdkankan</groupId>
@@ -44,6 +50,12 @@
 
         <dependency>
             <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-fyun-local</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-redis</artifactId>
             <version>2.0.0-SNAPSHOT</version>
         </dependency>

+ 1 - 1
src/main/java/com/fdkankan/tk/service/impl/RoomServiceImpl.java

@@ -565,7 +565,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
         if(room == null){
             throw new BusinessException(ResultCode.ROOM_MISS);
         }
-        if(!room.getPlatform().equals("fd") && !room.getPlatform().equals("ucenter")){
+        if(!room.getPlatform().equals("fd") && !room.getPlatform().equals("ucenter") && !room.getPlatform().equals("4dkz")){
             throw new BusinessException(ResultCode.ROOM_DISSOLVE_ERROR);
         }
         LambdaUpdateWrapper<Room> wrapper = new LambdaUpdateWrapper<>();

+ 29 - 0
src/main/resources/bootstrap-xj.yml

@@ -0,0 +1,29 @@
+spring:
+  application:
+    name: 4dkankan-center-takelook
+  cloud:
+    nacos:
+      username: nacos
+      password: Nacos4Dage.
+      config:
+        server-addr: 127.0.0.1:8848
+        file-extension: yaml
+        namespace: xinjiang
+        extension-configs:
+          - data-id: 4dkankan-center-takelook.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+        shared-configs:
+          - data-id: common-redis-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: forest-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: common-fyun-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+      discovery:
+        server-addr: ${spring.cloud.nacos.config.server-addr}
+        namespace: ${spring.cloud.nacos.config.namespace}