Explorar o código

mtl文件图片检测

lyhzzz %!s(int64=2) %!d(string=hai) anos
pai
achega
7c35607964

+ 12 - 2
src/main/java/com/fdkankan/fusion/common/util/OBJToGLBUtil.java

@@ -97,10 +97,20 @@ public class OBJToGLBUtil {
             while ((line = br.readLine()) != null) {
                 String[] tempsa = line.split("[ ]+");
                 if (tempsa[0].trim().equals("map_Ka")) {
-                    imgName.add(tempsa[1]);
+                    String mtlName = tempsa[1];
+                    if(mtlName.contains("/")){
+                        String[] split = mtlName.split("/");
+                        mtlName = split[split.length-1];
+                    }
+                    imgName.add(mtlName);
                 }
                 if (tempsa[0].trim().equals("map_Kd")) {
-                    imgName.add(tempsa[1]);
+                    String mtlName = tempsa[1];
+                    if(mtlName.contains("/")){
+                        String[] split = mtlName.split("/");
+                        mtlName = split[split.length-1];
+                    }
+                    imgName.add(mtlName);
                 }
             }
         } catch (Exception e) {

+ 2 - 2
src/main/java/com/fdkankan/fusion/controller/TestController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.fusion.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.dtflys.forest.annotation.Post;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.common.util.ShellUtil;
 import com.fdkankan.fusion.entity.CaseEntity;
@@ -11,8 +12,7 @@ import com.fdkankan.fusion.service.*;
 import com.fdkankan.redis.util.RedisUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.concurrent.ThreadPoolExecutor;

+ 4 - 2
src/main/resources/application-local.yaml

@@ -2,7 +2,9 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource          # 数据源类型:HikariCP
     driver-class-name: com.mysql.jdbc.Driver          # mysql驱动
+    #120.25.146.52
     url: jdbc:mysql://120.25.146.52:13306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    #url: jdbc:mysql://127.0.0.1:13306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
     username: root
     password: JK123456%JIK
     hikari:
@@ -15,10 +17,10 @@ spring:
       max-lifetime: 1800000             # 连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认:30分钟 1800000ms
       connection-test-query: SELECT 1   # 连接测试语句
   redis:
-    host: 120.25.146.52
+    host: 120.24.144.164
     port: 6379
     timeout: 6000ms
-    password:
+    password: bgh0cae240
     jedis:
       pool:
         max-active: 10  #连接池最大连接数(使用负值表示没有限制)

+ 1 - 1
src/main/resources/application.yaml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: ${activeProfile:test}
+    active: ${activeProfile:local}
   servlet:
     multipart:
       max-file-size: 1000MB