修改生产环境配置

README.md

@@ -21,6 +21,21 @@ https://blog.csdn.net/zhj_1121/article/details/108230827
     221.4.210.172:9294/indoor/aa/api/images/1288    
     
     
+    
+# pro
+  激光生产环境资源
+    1. 四维看看激光功能代码 （罗小行）    
+    2. 算法代码 （刘强）
+    3. 激光编辑功能 （伟浩）
+    
+    
+    服务器：
+        8.129.209.131(四维看看生产环境服务器)
+    
+    
+    user: 4dage 
+     pwd: 4Dade168%.
+    
 #API
     https://testlaser.4dkankan.com/indoor/test1/api/site_model/within?location=120.58629809780416&location=29.991469096442984&location=2.050019474815037&type=FLOOR    
     https://testlaser.4dkankan.com/indoor/test1/api/site_model/within?location=120.58629809780416&location=29.991469096442984&location=2.050019474815037&type=FLOOR  

laser/pom.xml

@@ -189,12 +189,7 @@
 			<version>1.1.3</version>
 		</dependency>
 
-		<!--&lt;!&ndash;分页插件&ndash;&gt;-->
-		<!--<dependency>-->
-			<!--<groupId>com.github.pagehelper</groupId>-->
-			<!--<artifactId>pagehelper-spring-boot-starter</artifactId>-->
-			<!--<version>${pagehelper.version}</version>-->
-		<!--</dependency>-->
+
 
 		<!--springboot中的redis依赖-->
 		<dependency>
@@ -203,93 +198,6 @@
 		</dependency>
 
 
-		<!-- Java使用GeoTools读取shapefile 文件-->
-		<!--<dependency>-->
-			<!--<groupId>org.geotools</groupId>-->
-			<!--<artifactId>gt-shapefile</artifactId>-->
-			<!--<version>18.4</version>-->
-		<!--</dependency>-->
-
-		<!--
-     		mvn install:install-file -Dfile=gt-shapefile-19.4.jar -DgroupId=org.geotools -DartifactId=gt-shapefile -Dversion=19.4 -Dpackaging=jar
-		-->
-		<!--<dependency>-->
-			<!--<groupId>org.geotools</groupId>-->
-			<!--<artifactId>gt-shapefile</artifactId>-->
-			<!--<version>19.4</version>-->
-		<!--</dependency>-->
-
-
-		<!--
-     		mvn install:install-file -Dfile=gt-api-19.4.jar -DgroupId=org.geotools -DartifactId=gt-api -Dversion=19.4 -Dpackaging=jar
-		-->
-		<!--<dependency>-->
-			<!--<groupId>org.geotools</groupId>-->
-			<!--<artifactId>gt-api</artifactId>-->
-			<!--<version>19.4</version>-->
-		<!--</dependency>-->
-
-
-
-		<!--<dependency>-->
-			<!--<groupId>org.geotools</groupId>-->
-			<!--<artifactId>gt-shapefile</artifactId>-->
-			<!--<version>${geotools.version}</version>-->
-		<!--</dependency>-->
-
-		<!--
-     		mvn install:install-file -Dfile=gt-swing-19.4.jar -DgroupId=org.geotools -DartifactId=gt-swing -Dversion=19.4 -Dpackaging=jar
-		-->
-		<!--<dependency>-->
-			<!--<groupId>org.geotools</groupId>-->
-			<!--<artifactId>gt-swing</artifactId>-->
-			<!--<version>${geotools.version}</version>-->
-		<!--</dependency>-->
-
-
-		<!--
-     mvn install:install-file -Dfile=gt-main-19.4.jar -DgroupId=org.geotools -DartifactId=gt-main -Dversion=19.4 -Dpackaging=jar
--->
-		<!--<dependency>-->
-			<!--<groupId>org.geotools</groupId>-->
-			<!--<artifactId>gt-main</artifactId>-->
-			<!--<version>19.4</version>-->
-		<!--</dependency>-->
-
-		<!--
-mvn install:install-file -Dfile=gt-opengis-19.4.jar -DgroupId=org.geotools -DartifactId=gt-opengis -Dversion=19.4 -Dpackaging=jar
--->
-		<!--<dependency>-->
-		<!--<groupId>org.geotools</groupId>-->
-		<!--<artifactId>gt-opengis</artifactId>-->
-		<!--<version>19.4</version>-->
-		<!--</dependency>-->
-
-
-		<!--<dependency>-->
-			<!--<groupId>com.vividsolutions</groupId>-->
-			<!--<artifactId>jts-core</artifactId>-->
-			<!--<version>1.14.0</version>-->
-		<!--</dependency>-->
-
-
-
-		<!--
-     mvn install:install-file -Dfile=opencv-320.jar -DgroupId=org.opencv -DartifactId=opencv -Dversion=3.2.0 -Dpackaging=jar
--->
-		<!--<dependency>-->
-			<!--<groupId>org.opencv</groupId>-->
-			<!--<artifactId>opencv</artifactId>-->
-			<!--&lt;!&ndash;<version>3.2.0</version>&ndash;&gt;-->
-			<!--<version>4.1.1</version>-->
-		<!--</dependency>-->
-
-		<!-- https://mvnrepository.com/artifact/org.openpnp/opencv -->
-		<!--<dependency>-->
-			<!--<groupId>org.openpnp</groupId>-->
-			<!--<artifactId>opencv</artifactId>-->
-			<!--<version>3.2.0-1</version>-->
-		<!--</dependency>-->
 
 
 	</dependencies>

laser/src/main/java/com/fdkankan/indoor/base/aop/WebLogAspect.java

@@ -6,6 +6,7 @@ import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
+import org.slf4j.MDC;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -41,11 +42,14 @@ public class WebLogAspect {
     @Before("controllerLog()") //在切入点的方法run之前要干的
     public void logBeforeController(JoinPoint joinPoint) throws Exception {
         startTime = System.currentTimeMillis();
+
+        // 设置链路id, 在logback-spring.xml里用
+        MDC.put("TRACE_ID", startTime+"");
         // 记录下请求内容
         String remoteAddr = request.getRemoteAddr();
         log.warn("");
         log.warn("start : {}, {}, uuid: {}" , request.getMethod(), request.getRequestURI(), startTime);
-        log.info("request IP:{}" , request.getRemoteAddr());
+        log.info("request IP:{}" , remoteAddr);
         log.info("request Args : {}" , Arrays.toString(joinPoint.getArgs()));
 
 
@@ -60,23 +64,6 @@ public class WebLogAspect {
         log.info("request description:{}, addDb:{}", description, addDb);
 
 
-
-//        // 日志保存db
-//        if (addDb) {
-//            if (StringUtils.isNotBlank(description)) {
-//                // 保存数据库
-//                List<String> detail = getDetail(description);
-//            logService.save(new LogEntity(userId, detail.get(0), detail.get(1), remoteAddr));
-//            }
-//
-//        }
-
-
-        //下面这个getSignature().getDeclaringTypeName()是获取包+类名的   然后后面的joinPoint.getSignature.getName()获取了方法名
-//        log.info("request Class_Method : {}" , joinPoint.getSignature().getDeclaringTypeName() + "." + joinPoint.getSignature().getName());
-
-
-
     }
 
 

laser/src/main/java/com/fdkankan/indoor/base/config/WebMvcConfig.java

@@ -3,6 +3,8 @@ package com.fdkankan.indoor.base.config;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.support.config.FastJsonConfig;
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+import com.fdkankan.indoor.base.constant.ConfigConstant;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -19,19 +21,25 @@ import java.util.List;
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 
+    @Autowired
+    ConfigConstant configConstant;
+
     /**
      * 配置全局跨域
+     * 开发、测试环境开启跨域， 正式环境不开启
      */
     @Override
     public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowedOrigins("*")
-                .allowCredentials(true)
-                .allowedMethods("GET", "POST", "DELETE", "PUT", "OPTIONS")
-                .maxAge(3600);
-    }
-
+        String active = configConstant.active;
+        if ("dev".equals(active) || "sit".equals(active)){
+            registry.addMapping("/**")
+                    .allowedOrigins("*")
+                    .allowCredentials(true)
+                    .allowedMethods("GET", "POST", "DELETE", "PUT", "OPTIONS")
+                    .maxAge(3600);
+        }
 
+    }
 
     /**
      * fastJson相关设置

laser/src/main/java/com/fdkankan/indoor/base/constant/CmdConstant.java

@@ -14,7 +14,6 @@ public class CmdConstant {
      * opt/ossutil/ossutil64 cp -r /root/owen/720yun/vtour/ oss://oss-xiaoan/720yun_fd_manage/
      *
      */
-//    public final static String OSSUTIL_UPLOAD_DIR = "/opt/ossutil/ossutil64 cp -r /mnt/720yun_fd_manage_data/@sceneCode oss://oss-xiaoan/720yun_fd_manage/@sceneCode";
 
     /**
      * 用脚本的好处会自动结束线程， java直接跑命令容易出问题

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

@@ -0,0 +1,56 @@
+spring.data.mongodb.uri=mongodb://127.0.0.1:27017/json_data
+spring.data.mongodb.username=4dage
+spring.data.mongodb.password=1234
+
+
+# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
+spring.redis.database=0
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4 \u5355\u4F4D ms\uFF08\u6BEB\u79D2\uFF09
+spring.redis.timeout=3000ms
+# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F8\u3002
+spring.redis.jedis.pool.max-idle=8
+#\u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F0\u3002
+spring.redis.jedis.pool.min-idle=0
+# \u5982\u679C\u8D4B\u503C\u4E3A-1\uFF0C\u5219\u8868\u793A\u4E0D\u9650\u5236\uFF1B\u5982\u679Cpool\u5DF2\u7ECF\u5206\u914D\u4E86maxActive\u4E2Ajedis\u5B9E\u4F8B\uFF0C\u5219\u6B64\u65F6pool\u7684\u72B6\u6001\u4E3Aexhausted(\u8017\u5C3D)\u3002
+spring.redis.jedis.pool.max-active=8
+# \u7B49\u5F85\u53EF\u7528\u8FDE\u63A5\u7684\u6700\u5927\u65F6\u95F4\uFF0C\u5355\u4F4D\u6BEB\u79D2\uFF0C\u9ED8\u8BA4\u503C\u4E3A-1\uFF0C\u8868\u793A\u6C38\u4E0D\u8D85\u65F6\u3002\u5982\u679C\u8D85\u8FC7\u7B49\u5F85\u65F6\u95F4\uFF0C\u5219\u76F4\u63A5\u629B\u51FAJedisConnectionException
+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
+
+swagger.package=com.fdkankan.indoor.core.controller
+swagger.title=${project.sc}-pro
+swagger.description=${swagger.title}
+swagger.version=1.0
+
+#swagger login
+knife4j.basic.enable=true
+knife4j.basic.username=owen
+knife4j.basic.password=owen
+
+# \u540E\u7AEF\u6587\u4EF6\u4FDD\u5B58\u8DEF\u5F84
+server.file.path=/var/www/html/laser/maxkk
+# \u6A21\u677F\u6587\u4EF6\u4F4D\u7F6E
+my.template.path=/root/user/java/jar_run/baseData
+# \u540E\u7AEF\u6587\u4EF6\u4FDD\u5B58\u8DEF\u5F84
+my.back.file.path=/mnt-laser/data/${project.en}_data
+
+
+oss.point=http://oss-cn-shenzhen-internal.aliyuncs.com
+oss.key=LTAIUrvuHqj8pvry
+oss.secrecy=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
+oss.bucket=laser-data
+#oss.type=oss
+# \u524D\u7F00\u76EE\u5F55
+oss.file.path=data
+#oss.domain=https://oss-xiaoan.oss-cn-shenzhen.aliyuncs.com/
+oss.domain=https://laser.4dkankan.com/
+
+# \u573A\u666F\u94FE\u63A5
+web.site=https://laser.4dkankan.com/maxkk/

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/java/indoor/
+logging.file.path=/root/user/log/${project.en}_log
 
 swagger.package=com.fdkankan.indoor.core.controller
 swagger.title=${project.sc}-sit

laser/src/main/resources/logback-spring.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <property name="LOG_MAX_HISTORY" value="180"/>
-    <springProperty scope="context" name="LOG_PATH" source="logging.file.path"/>
+    <springProperty scope="context" name="LOG_PATH" source="logging.path"/>
 
     <!-- 控制台输出 -->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
-            <pattern>${LOG_PATH}/%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>utf-8</charset>
+            <pattern>${LOG_PATH}/%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %X{TRACE_ID} %-5level %logger{50} - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
         </encoder>
     </appender>
     <!-- 按照每天生成日志文件：主项目日志 -->
@@ -26,8 +26,8 @@
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{500} - %msg%n</pattern>
-            <charset>utf-8</charset>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %X{TRACE_ID} %-5level %logger{500} - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
         </encoder>
     </appender>
 
@@ -44,9 +44,9 @@
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程，%-5level：级别从左显示5个字符宽度 %method 方法名  %L 行数 %msg：日志消息，%n是换行符-->
-            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n</pattern>
-            <charset>utf-8</charset>
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度 %method 方法名  %L 行数 %msg：日志消息，%n是换行符-->
+            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %X{TRACE_ID} %-5level %logger{56}.%method:%L - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
         </encoder>
         <!-- 此日志文件只记录info级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -71,8 +71,8 @@
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度 %method 方法名  %L 行数 %msg：日志消息，%n是换行符-->
-            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n</pattern>
-            <charset>utf-8</charset>
+            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %X{TRACE_ID} %-5level %logger{56}.%method:%L - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
         </encoder>
         <!-- 此日志文件只记录error级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -97,8 +97,8 @@
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度 %method 方法名  %L 行数 %msg：日志消息，%n是换行符-->
-            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n</pattern>
-            <charset>utf-8</charset>
+            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %X{TRACE_ID} %-5level %logger{56}.%method:%L - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
         </encoder>
         <!-- 此日志文件只记录warn级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -123,8 +123,8 @@
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度 %method 方法名  %L 行数 %msg：日志消息，%n是换行符-->
-            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n</pattern>
-            <charset>utf-8</charset>
+            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %X{TRACE_ID} %-5level %logger{56}.%method:%L - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
         </encoder>
         <!-- 此日志文件只记录debug级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -153,4 +153,4 @@
         <appender-ref ref="file.warn" />
     </root>
 
-</configuration>
+</configuration>