11111

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/EncryptDecrypt.java

@@ -18,7 +18,7 @@ public class EncryptDecrypt {
    }
 
     public static void main(String[] args) {
-        System.out.println(getEncrypt("DOB87VaBCXmk3L3OWiO++iWoevuek7QkC9NrbDvs"));
+        System.out.println(getEncrypt("WFlh5+irtZyaF9WfBYNvDGpSZrU/k/QiHQUizJ3I"));
 //        System.out.println(getEncrypt("LTAI5tJZBJwP5qazE6b3b4Gr"));
 //        System.out.println(getEncrypt("zSQCG0yyvRJISPokNZGhbhaAfh4hGX"));
 //        System.out.println(getEncrypt("4dkankan524%40123*"));

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/OBJToGLBUtil.java

@@ -21,12 +21,13 @@ public class OBJToGLBUtil {
      * @param objPath obj文件的目录
      * @param glbPath glb文件的最对路径
      */
-    public static void objToGlb(String objPath, String glbPath) {
+    public static void objToGlb(String objPath, String glbPath) throws Exception {
         OBJToGLBUtil.checkObj(objPath);
         objPath = OBJToGLBUtil.getObj(objPath);
         String command = "obj2gltf -i " + objPath + " -o " + glbPath;
         log.info("开始执行obj转换gbl命令-{}", command);
-        Process exec = RuntimeUtil.exec(command);
+//        Process exec = RuntimeUtil.exec(command);
+        CmdUtils.callLine(command);
         log.info("结束执行obj转换gbl命令-{}", command);
     }
 

4dkankan-utils-fyun-s3/src/main/java/com/fdkankan/fyun/s3/S3FileService.java

@@ -305,7 +305,7 @@ public class S3FileService extends AbstractFYunFileService {
 			}
 			return content.toString();
         } catch (Exception e) {
-            log.error("获取文件内容失败：{}", remoteFilePath);
+            log.error("获取文件内容失败：{}", remoteFilePath, e);
             return null;
         }
     }