关闭日志sit日志, 打包跳过测试类， 合并tour.xml

720yun_fd_manage/gis_application/pom.xml

@@ -38,6 +38,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+
         </plugins>
         <finalName>720yun_fd_manage</finalName>
     </build>

720yun_fd_manage/gis_application/src/main/resources/application-sit.properties

@@ -85,9 +85,9 @@ swagger.description=${swagger.title}
 swagger.version=1.0
 
 #log
-logging.path=/root/data/${project.name}_log
+logging.path=/root/log/${project.name}_log
 logging.config=classpath:logback-spring.xml
-logging.level.com.gis=debug
+logging.level.com.gis=info
 
 
 # \uFFFD\u03F4\uFFFD\uFFFD\u013C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
@@ -101,5 +101,9 @@ domain.4dkk=https://test.4dkankan.com
 spring.servlet.multipart.location=/mnt
 
 
+# 2021-3-9 POST\u8BF7\u6C42\u9ED8\u8BA4\u6700\u59272M\uFF0C -1\uFF1A\u4E0D\u9650\u5236
+server.tomcat.max-http-post-size=20
+
+
 
 

720yun_fd_manage/gis_application/src/main/resources/application.properties

@@ -1,6 +1,8 @@
 server.port=8001
+
 spring.profiles.active=loc
 
+
 # \uFFFD\uFFFD\u013F\uFFFD\uFFFD\uFFFD\uFFFD
 project.name=720yun_fd_manage
 # redis token \u524D\u7F00; \u56DB\u7EF4\u770B\u770Btoken\u524D\u7F00\uFF1Atoken#

720yun_fd_manage/gis_web/src/main/java/com/gis/web/aop/WebLogAspect.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -33,6 +34,13 @@ public class WebLogAspect {
 
     private long endTime;
 
+    // 不打印日志
+    private static List<String> filterUrl;
+    static {
+        filterUrl = new ArrayList<>();
+        filterUrl.add("/manage/work/edit");
+    }
+
 
     @Pointcut("execution(* com.gis.web.controller.*.*(..))")//切入点描述 这个是controller包的切入点
 //    @Pointcut("@annotation(com.gis.web.aop.WebControllerLog)")//切入点描述 这个是controller包的切入点
@@ -46,9 +54,12 @@ public class WebLogAspect {
         MDC.put("TRACE_ID", startTime+"");
 
         // 记录下请求内容
-        log.warn("start : {}, {}, uuid: {}" , request.getMethod(), request.getRequestURI(), startTime);
+        String requestURI = request.getRequestURI();
+        log.warn("start : {}, {}, uuid: {}" , request.getMethod(), requestURI, startTime);
         log.info("request IP:{}" , request.getRemoteAddr());
-        log.info("request Args : {}" , Arrays.toString(joinPoint.getArgs()));
+        if (!filterUrl.contains(requestURI)){
+            log.info("request Args : {}" , Arrays.toString(joinPoint.getArgs()));
+        }
 
         // 获取token
         String token = request.getHeader("token");

720yun_fd_manage/gis_web/src/test/java/demo/SceneTest.java

@@ -0,0 +1,200 @@
+package demo;
+
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.junit.Test;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * Created by owen on 2022/3/9 0009 9:09
+ * 测试类
+ */
+@Slf4j
+public class SceneTest {
+
+    /**
+     * scenes.json: 是数据库tb_work.scenes, 包含该作品下的所有场景
+     * 获取该作品下的所有场景
+     */
+    @Test
+    public void getSceneCode(){
+        String filePath = "E:\\data\\720yun_fd_manage_data\\test\\scenes.json";
+        String s = FileUtil.readString(filePath, "UTF-8");
+        JSONArray array = JSONArray.parseArray(s);
+        JSONArray jsonArray = new JSONArray();
+        for (Object o : array) {
+            JSONObject parse = JSON.parseObject(o.toString());
+            String sceneCode = parse.getString("sceneCode");
+            jsonArray.add(sceneCode);
+        }
+        log.warn("场景数量：{}", jsonArray.size());
+        log.warn("场景： {}", jsonArray);
+    }
+
+    /**
+     * 合并tour.xml
+     * 以第一个场景码为主， 将其他场景的tour.xml里的<scene></scene>标签负责到第一个的tour.xml里去
+     */
+    @Test
+    public void mergeTourXml(){
+
+        String firstScene = "fd720_8SFg0cwFI";
+        // 主文件路径
+        String firstPath = null;
+
+        // 路径结果集
+        List<String> paths = new ArrayList<>();
+        // 文件目录
+        String dir = "E:\\data\\720yun_fd_manage_data\\720yun_20220309_104456896";
+        // 执行目录递归
+        getLoopPath(dir, paths);
+        log.info("路径数量： {}", paths.size());
+
+        // 获取scene标签集合
+        StringBuffer sceneLabels = new StringBuffer();
+        int i = 0;
+        for (String path : paths) {
+            if (path.contains(firstScene)){
+                firstPath = path;
+            }
+            String scene = getSceneLabel(path);
+            sceneLabels.append(scene).append("\r\n");
+            i++;
+        }
+        log.info("标签数量： {}", i );
+
+        // 合并
+        String firstXml = handleFirstXml(firstPath);
+        StringBuffer buffer = new StringBuffer();
+        buffer.append(firstXml).append(" ");
+        buffer.append(sceneLabels).append(" ");
+        buffer.append("</krpano>");
+        // 保存路径
+        String savePath = dir + "/tour.xml";
+        FileUtil.writeUtf8String(buffer.toString(), savePath);
+        log.info("合并完成，保存路径： {}", savePath);
+
+
+    }
+
+    /**
+     * 递归目录获取文件地址
+     * @path dir 目录：E:\data\720yun_fd_manage_data\fd720
+     * @result 结果集
+     * @return
+     */
+    private static void getLoopPath(String dir, List<String> result){
+        File[] faFiles = new File(dir).listFiles();
+        for (File file : faFiles) {
+            if (file.isFile()){
+                String path = file.getAbsolutePath();
+                if (path.endsWith("tour.xml")){
+                    result.add(path);
+                    continue; // 结束本次循环
+                }
+
+            } else {
+                getLoopPath(file.getAbsolutePath(), result);
+            }
+        }
+
+    }
+
+    /**
+     * 移动目录到指定目录
+     * @param dir 输入目录
+     * @param outDir 输出目录
+     */
+    private static void moveLoop(String dir, String outDir){
+        File[] faFiles = new File(dir).listFiles();
+        for (File file : faFiles) {
+            if (file.isDirectory()){
+                String path = file.getAbsolutePath();
+                if (path.endsWith(".tiles")){
+                    // 负责目录到指定目录
+                    FileUtil.copy(new File(path), new File(outDir), true);
+                    continue; // 结束本次循环
+                } else {
+                    moveLoop(path, outDir);
+                }
+
+            }
+        }
+    }
+
+    /**
+     * 获取Scene标签值
+     * @param filePath tour.xml路径
+     * @return
+     */
+    private static String getSceneLabel(String filePath){
+        String s = FileUtil.readString(filePath, "UTF-8");
+        // 截取</action>之后的
+        s = StrUtil.subAfter(s, "</action>", true);
+        // 截取</krpano>之前的
+        s = StrUtil.subBefore(s, "</krpano>", true);
+        return s;
+
+    }
+
+    /**
+     * 处理第一个xml
+     * @param filePath
+     * @return
+     */
+    private static String handleFirstXml(String filePath){
+
+        String s = FileUtil.readString(filePath, "UTF-8");
+
+        // 截取</krpano>之前的
+        s = StrUtil.subBefore(s, "<scene name=", false);
+        return s;
+
+    }
+
+    @Test
+    public void readTourXml(){
+        String filePath = "E:\\data\\720yun_fd_manage_data\\fd720\\fd720_ae0kVy9Gr\\vtour\\tour.xml";
+        String s = handleFirstXml(filePath);
+        System.out.println(s);
+    }
+
+    @Test
+    public void moveDir(){
+        String dir = "E:\\data\\720yun_fd_manage_data\\720yun_20220309_104456896";
+        String outDir = "E:\\data\\720yun_fd_manage_data\\out\\";
+        moveLoop(dir, outDir);
+        log.info("移动完成");
+    }
+
+    @Test
+    public void urlTest(){
+        List<String> list = new ArrayList<>();
+//        list.add("/manage/work/edit");
+        list.add("/manage/work/add");
+        if (list.contains("/manage/work/edit")){
+            System.out.println("包含edit");
+        }
+    }
+
+    @Test
+    public void readJson(){
+        String path = "E:\\data\\720yun_fd_manage_data\\log\\2\\873.json";
+//        String str = FileUtil.readString(path, "utf-8");
+        String str="{\"MsgId\":1,\"TotalCount\":10,\"FilterCount\":8,\"SentCount\":7,\"ErrorCount\":1}";
+        log.info("1: {}", str);
+        String s = StringEscapeUtils.unescapeJava(str);
+        log.info("2: {}", s);
+
+    }
+
+}

720yun_fd_manage/pom.xml

@@ -53,6 +53,9 @@
 
         <nacos-discovery-spring-boot.version>0.2.1</nacos-discovery-spring-boot.version>
 
+        <!-- 打包跳过测试用例 -->
+        <skipTests>true</skipTests>
+
     </properties>