Explorar o código

部署生产环境

wuweihao %!s(int64=3) %!d(string=hai) anos
pai
achega
674964fc42

+ 32 - 0
README.md

@@ -35,6 +35,38 @@ https://blog.csdn.net/zhj_1121/article/details/108230827
     
     user: 4dage 
      pwd: 4Dade168%.
+     
+     
+# 部署注意事项
+        pro-2021-11-29
+         sys_user   系统用户表 (写死)
+         t_configs   配置信息, 包含初始视角 
+         t_control_point   控制点表
+         t_cut_model  模型剪切表(las文件剪切信息)
+         t_data_set   数据集的位置和旋转角度 
+         t_filter   漫游点表
+         t_group      (写死的,登录区分)
+         t_health      (写死的,登录区分)
+         t_init   初始场景表(四维看看场景-> 激光场景)
+         t_license   (写死的,登录区分)
+         t_map    小地图 (可能弃用,之前洪果上传切图) :暂时弃用
+         t_map_small  小地图(编辑端,提供志彬接口) :暂时弃用
+         t_measurement  测量表
+         t_poi  热点表
+         t_poi_type_groups  热点分组表
+         t_poi_type  热点分类表
+         t_recount_info  重算记录表
+         t_route  路径规划信息表
+         t_site_model  数据集的分类信息
+         t_special_point 特殊点
+         t_tiled_map  地图 (展示端)
+         t_user  (写死的,登录区分)
+         t_users   (写死的,不区分)   
+         
+    1. 将写死的表数据从sit 复制到 pro  
+    2. 两套算法: 平面图、模型剪切
+    3. 静态资源模版数据
+    4. ossUtil sh脚本放到jar包同级目录   
     
 #API
     https://testlaser.4dkankan.com/indoor/test1/api/site_model/within?location=120.58629809780416&location=29.991469096442984&location=2.050019474815037&type=FLOOR    

+ 7 - 0
laser/src/main/java/com/fdkankan/indoor/core/controller/TestController.java

@@ -256,4 +256,11 @@ public class TestController {
     public Result ossExist(){
         return owenService.ossExist();
     }
+
+
+//    @ApiOperation("batch-批量修改index.html文件oss域名")
+//    @GetMapping("batch/indexHtml")
+//    public Result batchIndexHtml(){
+//        return owenService.batchIndexHtml();
+//    }
 }

+ 2 - 0
laser/src/main/java/com/fdkankan/indoor/core/service/OwenService.java

@@ -37,4 +37,6 @@ public interface OwenService {
     Result ossExist();
 
     Result testQuadTree();
+
+    Result batchIndexHtml();
 }

+ 43 - 0
laser/src/main/java/com/fdkankan/indoor/core/service/impl/OwenServiceImpl.java

@@ -20,6 +20,7 @@ import com.fdkankan.indoor.core.service.MergeInfoService;
 import com.fdkankan.indoor.core.service.OwenService;
 import com.fdkankan.indoor.core.service.PoiTypeGroupService;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -245,6 +246,48 @@ public class OwenServiceImpl implements OwenService {
         return Result.success(quadTree);
     }
 
+    @Override
+    public Result batchIndexHtml() {
+        String sDir = "/var/www/html/laser/maxkk/";
+        digui(sDir);
+        log.info("执行完成");
+        return Result.success("执行完成");
+    }
+
+    @Test
+    public void testbatch(){
+
+        digui("F:\\work\\四维-激光相机\\sit");
+    }
+
+
+    private static void digui(String sDir){
+
+        File[] faFiles = new File(sDir).listFiles();
+        for(File file: faFiles){
+            if(file.isFile()){
+                String path = file.getAbsolutePath();
+                if (path.contains("t-") && path.endsWith("index.html") ){
+                    if (!path.contains("api")){
+                        log.info("index文件路径: {}", path);
+
+                        // 读取文件
+                        String s = FileUtil.readUtf8String(path);
+                        String newStr = s.replaceAll("https://laser.4dkankan.com", "https://laser-oss.4dkankan.com");
+                        FileUtil.writeUtf8String(newStr, path);
+
+                        continue;
+                    }
+
+                }
+            }else {
+                digui(file.getAbsolutePath());
+            }
+
+        }
+
+    }
+
 
     private String redisPath(String sceneCode) {
         String initKey = TypeConstant.REDIS_INIT_PATH + sceneCode;

+ 3 - 3
laser/src/main/resources/application-pro.properties

@@ -1,6 +1,6 @@
 spring.data.mongodb.uri=mongodb://127.0.0.1:27017/json_data
 spring.data.mongodb.username=4dage
-spring.data.mongodb.password=1234
+spring.data.mongodb.password=4Dade168%.
 
 
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
@@ -20,7 +20,7 @@ spring.redis.jedis.pool.max-active=8
 spring.redis.jedis.pool.max-wait=-1ms
 
 # \uFFFD\uFFFD\uFFFD\uFFFD\u0328sql\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD
-logging.level.org.springframework.data.mongodb.core= DEBUG
+logging.level.org.springframework.data.mongodb.core= info
 
 logging.file.path=/root/user/log/${project.en}_log
 
@@ -50,7 +50,7 @@ oss.bucket=laser-data
 # \u524D\u7F00\u76EE\u5F55
 oss.file.path=data
 #oss.domain=https://oss-xiaoan.oss-cn-shenzhen.aliyuncs.com/
-oss.domain=https://laser.4dkankan.com/
+oss.domain=https://laser-oss.4dkankan.com/
 
 # \u573A\u666F\u94FE\u63A5
 web.site=https://laser.4dkankan.com/maxkk/

+ 4 - 2
laser/src/main/resources/application-sit.properties

@@ -22,7 +22,7 @@ spring.redis.jedis.pool.max-wait=-1ms
 # \uFFFD\uFFFD\uFFFD\uFFFD\u0328sql\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD
 logging.level.org.springframework.data.mongodb.core= DEBUG
 
-logging.file.path=/root/user/log/${project.en}_log
+logging.file.path=/root/log/${project.en}_log
 
 swagger.package=com.fdkankan.indoor.core.controller
 swagger.title=${project.sc}-sit
@@ -45,7 +45,9 @@ oss.bucket=laser-data
 # \u524D\u7F00\u76EE\u5F55
 oss.file.path=data
 #oss.domain=https://oss-xiaoan.oss-cn-shenzhen.aliyuncs.com/
-oss.domain=https://laser.4dkankan.com/
+#oss.domain=https://laser.4dkankan.com/
+oss.domain=https://laser-oss.4dkankan.com/
+
 
 # \u573A\u666F\u94FE\u63A5
 web.site=https://testlaser.4dkankan.com/maxkk/

+ 4 - 2
laser/src/main/resources/sh/startup.sh

@@ -1,9 +1,11 @@
 #!/bin/sh
 RESOURCE_NAME=indoor.jar
+APP_DEBUG=5005
+APP_PORT=9294
+APP_ACTIVE=pro
 rm -f tpid
-nohup java -jar ./$RESOURCE_NAME --spring.profiles.active=sit & echo $! > tpid
+nohup java -jar -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=${APP_DEBUG} $RESOURCE_NAME --spring.profiles.active=${APP_ACTIVE} --server.port=${APP_PORT} & echo $! > tpid
 echo Start Success!
-echo