Przeglądaj źródła

fix bug,edit yml

xiewenjie 3 lat temu
rodzic
commit
a6f5966026

+ 11 - 7
src/main/java/com/fdkk/fdkkmeta/grpcService/SceneGrpcServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fdkk.fdkkmeta.grpcService;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkk.fdkkmeta.domain.entity.mysql.BreakpointsEntity;
@@ -19,13 +20,16 @@ public class SceneGrpcServiceImpl implements SceneGrpcService {
 
     @Override
     public UserState createUserState(String user_id, State state, RenderInfo renderInfo, Event event) {
-        UserState userState = UserState.newBuilder()
-                .setUserId(user_id)
-                .setPlayerState(state)
-                .setRenderInfo(renderInfo)
-                .setEvent(event)
-                .setRelation(1)
-                .build();
+        UserState.Builder builder = UserState.newBuilder();
+
+        builder.setUserId(user_id);
+        builder.setPlayerState(state);
+        builder.setRenderInfo(renderInfo);
+        builder.setRelation(1);
+        if (ObjectUtil.isNotNull(event)){
+            builder.setEvent(event);
+        }
+        UserState userState = builder.build();
         return userState;
     }
 

+ 16 - 6
src/main/resources/application-uat.yml

@@ -10,9 +10,19 @@ socketio:
   upgradeTimeout: 1000000
   workCount: 100
 fdkk:
-  freespacePath: H:\workfile
+  freespacePath: /home/meta/map
+  videoFramePath: /mnt/oss/metaverse/scene
+# 日志配置
+logging:
+  level:
+    com.fdkk: debug
+  config: classpath:logback-spring.xml
+  pattern:
+  console: "%d - %msg%n"
+tlog:
+  enable-invoke-time-print: true
 server:
-  port: 9011
+  port: 9010
   servlet:
     context-path: /
   tomcat:
@@ -21,10 +31,10 @@ server:
     min-spare-threads: 30
 spring:
   redis:
-    host: 127.0.0.1
+    host: 192.168.0.47
     port: 6379
-    database: 4
-    password: 1234
+    database: 9
+    password:
     timeout: 60s
     lettuce:
       pool:
@@ -38,7 +48,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://127.0.0.1:3306/fdkk_meta?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://120.24.252.95:3306/fdkk_meta?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: 4dyjkz%
       # 从库数据源