更新恩光处理请求

startJar.sh

@@ -91,8 +91,8 @@ checkServer(){
         exit 0
     else
         echo "${APP_NAME} 没有运行,即将重启"
+        start $1
         echo `date +%Y-%m-%d` `date +%H:%M:%S` ${APP_NAME} "没有运行,即将重启" >> check.log
-        restart  $1
     fi
 }
 

sxz-application/src/main/resources/application-dev.properties

@@ -84,6 +84,7 @@ light.build.url=http://192.168.0.30:8100/
 model.build.url=http://192.168.0.30:8100/
 #.max转datasmith和obj加减面url
 max.obj.url=http://192.168.0.75:8080/
+maxToDatasmith.url=http://192.168.0.75:8001/
 dingding.warning.address=https://oapi.dingtalk.com/robot/send?access_token=13ae02d6821a56ce86c3e6ad98d0260896eba5888a9bd18aed141c39f11299a8
 #缓存接口日志时间(单位小时)
 logsTimeOut=8

sxz-application/src/main/resources/application-uat.properties

@@ -85,6 +85,7 @@ light.build.url=http://192.168.0.49:8100/
 model.build.url=http://192.168.0.49:8100/
 #.max转datasmith和obj加减面url
 max.obj.url=http://192.168.0.75:8080/
+maxToDatasmith.url=http://192.168.0.75:8001/
 dingding.warning.address=https://oapi.dingtalk.com/robot/send?access_token=13ae02d6821a56ce86c3e6ad98d0260896eba5888a9bd18aed141c39f11299a8
 #缓存接口日志时间(单位小时)
 logsTimeOut=8

sxz-application/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread]   %highlight(%X{TRACE_ID}) %-5level %logger{50} - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%X{TRACE_ID}) %-5level %logger{50} - %msg%n</pattern>
             <charset>utf-8</charset>
         </encoder>
     </appender>
@@ -27,7 +27,7 @@
         <Prudent>true</Prudent>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--日志文件输出的文件名 -->
-            <FileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <!-- 除按日志记录之外，还配置了日志文件不能超过10M(默认)，若超过10M，日志文件会以索引0开始， -->

sxz-core/src/main/java/com/fdkk/sxz/other/listener/RunBuild.java

@@ -81,6 +81,9 @@ public class RunBuild {
     @Value("${max.obj.url}")
     private String maxObjUrl;
 
+    @Value("${maxToDatasmith.url}")
+    private String maxToDatasmithUrl;
+
     @Value("${driveLetter}")
     private String driveLetter;
 
@@ -878,7 +881,7 @@ public class RunBuild {
                 //开始计时
                 timer.start();
                 timer.start("global");
-                String maxUrl = maxObjUrl + "maxToDatasmith?uuid=" + fileId + "&max=" + maxName + "&flag=" + flag + "&resData=" + data;
+                String maxUrl = maxToDatasmithUrl + "?uuid=" + fileId + "&max=" + maxName + "&flag=" + flag + "&resData=" + data;
                 RunBuild.log.info("请求maxToDataSmith地址-{}", maxUrl);
                 OkHttpUtils.httpGet(maxUrl);
                 RunBuild.log.info("运行maxToDataSmith结束-{}", fileId);
@@ -1256,7 +1259,7 @@ public class RunBuild {
                                 uploadToOssUtil.downloadFileTo4dTjw("domain/eHome/furniture/ue4data/" + productName + "/" + componentName + "/" + componentName + "-base.obj", uploadPath + ".obj");
                                 uploadToOssUtil.downloadFileTo4dTjw("domain/eHome/furniture/ue4data/" + productName + "/" + componentName + "/" + componentName + ".mtl", uploadPath + ".mtl");
                                 uploadToOssUtil.downloadFileTo4dTjw("domain/eHome/furniture/ue4data/" + productName + "/" + componentName + "/" + componentName + ".jpg", uploadPath + ".jpg");
-                                
+
                                 ComponentModelUploadEntity componentEntity = componentModelUploadService.findById(component.getLong("id"));
                                 if (componentEntity != null) {
                                     componentEntity.setThumPath(uploadPath.replace(buildPath, "") + "_preview.jpg");