gemercheung 3 lat temu
rodzic
commit
c271208c33

+ 1 - 0
config.dev.yaml

@@ -2,6 +2,7 @@
 app:
   prefix: /mnt/metaverse/scene
   startPoint: 29
+  appId: "0000000005"
 
 log:
   logFolder: /var/log/metaverse

+ 1 - 0
config.production.yaml

@@ -1,6 +1,7 @@
 app:
   prefix: /mnt/metaverse/scene
   startPoint: 29
+  appId: "0000000005"
 
 queueConfig:
   move: 80

+ 1 - 0
config.production1.yaml

@@ -1,6 +1,7 @@
 app:
   prefix: /mnt/metaverse/scene
   startPoint: 29
+  appId: "0000000005"
 
 log:
   logFolder: /var/log/metaverse

+ 8 - 4
src/get-router/get-router.service.ts

@@ -1,18 +1,22 @@
 import { Injectable, Logger, OnModuleInit } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
 import { readFileSync } from 'fs';
 import { join } from 'path';
 import { CacheService } from 'src/cache/cache.service';
 
 @Injectable()
 export class GetRouterService implements OnModuleInit {
-  constructor(private cacheService: CacheService) {}
+  constructor(private cacheService: CacheService) { }
   private breakPointInfo: any;
   private logger: Logger = new Logger('GetRouterService');
+  private configService: ConfigService;
 
   // eslint-disable-next-line @typescript-eslint/no-empty-function
   async onModuleInit() {
-    const app_id = '0000000003';
-    const prefix = '/mnt/metaverse/scene';
+    const app_id = this.configService.get('app.appId');
+    const prefix = this.configService.get('app.prefix');
+    console.log('app_id', app_id);
+    console.log('prefix', prefix);
     let path;
     // let path: string;
     if (process.env.NODE_ENV === 'development') {
@@ -230,7 +234,7 @@ export class GetRouterService implements OnModuleInit {
   getDistance(position1, position2) {
     return Math.sqrt(
       (position1.x - position2.x) * (position1.x - position2.x) +
-        (position1.y - position2.y) * (position1.y - position2.y),
+      (position1.y - position2.y) * (position1.y - position2.y),
     );
   }
 }

+ 15 - 13
src/move/move.service.ts

@@ -32,7 +32,7 @@ export class MoveService implements OnModuleInit {
     private cacheService: CacheService,
     private rotateService: RotateService,
     private configService: ConfigService,
-  ) {}
+  ) { }
   private logger: Logger = new Logger('MoveService');
   private Actions = {
     Clicking: 1,
@@ -130,8 +130,10 @@ export class MoveService implements OnModuleInit {
 
   // eslint-disable-next-line @typescript-eslint/no-empty-function
   async onModuleInit() {
-    const app_id = '0000000003';
-    const prefix = '/mnt/metaverse/scene';
+    const app_id = this.configService.get('app.appId');
+    const prefix = this.configService.get('app.prefix');
+    console.log('app_id', app_id);
+    console.log('prefix', prefix);
     let path;
     // let path: string;
     if (process.env.NODE_ENV === 'development') {
@@ -747,15 +749,15 @@ export class MoveService implements OnModuleInit {
         // } else if (
         console.log(
           'joystick-breakPointId:' +
-            _angle +
-            ',' +
-            neighPoints[0].angle +
-            ',' +
-            neighPoints[0].breakPointId +
-            ',' +
-            neighPoints[1].angle +
-            ',' +
-            neighPoints[1].breakPointId,
+          _angle +
+          ',' +
+          neighPoints[0].angle +
+          ',' +
+          neighPoints[0].breakPointId +
+          ',' +
+          neighPoints[1].angle +
+          ',' +
+          neighPoints[1].breakPointId,
         );
         let offsetAngle1 = Math.abs(_angle - neighPoints[0].angle);
         if (neighPoints[0].angle == 0) {
@@ -968,7 +970,7 @@ export class MoveService implements OnModuleInit {
   getDistance(position1, position2) {
     return Math.sqrt(
       (position1.x - position2.x) * (position1.x - position2.x) +
-        (position1.y - position2.y) * (position1.y - position2.y),
+      (position1.y - position2.y) * (position1.y - position2.y),
     );
   }