dengsixing 1 éve
szülő
commit
8a450278f8

+ 7 - 1
4dkankan-common-utils/pom.xml

@@ -101,5 +101,11 @@
             <artifactId>okhttp</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.ulisesbocchio</groupId>
+            <artifactId>jasypt-spring-boot-starter</artifactId>
+            <version>3.0.5</version>
+        </dependency>
+
     </dependencies>
-</project>
+</project>

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

@@ -0,0 +1,42 @@
+package com.fdkankan.common.util;
+
+import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
+
+/**
+ * @author ys
+ * @create 2021/9/22
+ * @desc Jasypt安全框架加密类工具包
+ **/
+public class EncryptDecrypt {
+    public static String algorithm = "PBEWithMD5AndDES";
+    public static String password = "4dage168...";
+
+   static StandardPBEStringEncryptor standardPBEStringEncryptor = new StandardPBEStringEncryptor();
+   static {
+       standardPBEStringEncryptor.setAlgorithm(algorithm);
+       standardPBEStringEncryptor.setPassword(password);
+   }
+
+    public static void main(String[] args) {
+        System.out.println(getEncrypt("JK20220120%JIK"));
+//        System.out.println(getEncrypt("LTAI5tJZBJwP5qazE6b3b4Gr"));
+//        System.out.println(getEncrypt("zSQCG0yyvRJISPokNZGhbhaAfh4hGX"));
+//        System.out.println(getEncrypt("4dkankan524%40123*"));
+//        System.out.println(getEncrypt("admin"));
+//        System.out.println(getEncrypt("admin1231"));
+    }
+
+   private static String getEncrypt(String value){
+       String password = standardPBEStringEncryptor.encrypt(value);
+       return  "ENC(" +password +")";
+   }
+
+    private static String getDecrypt(String value){
+       if(value.contains("ENC(")){
+           value = value.replace("ENC(","");
+           value = value.replace(")","");
+       }
+        return standardPBEStringEncryptor.decrypt(value);
+    }
+}
+

+ 1 - 0
4dkankan-utils-fyun-parent/src/main/java/com/fdkankan/fyun/constant/FYunTypeEnum.java

@@ -3,6 +3,7 @@ package com.fdkankan.fyun.constant;
 public enum FYunTypeEnum {
     OSS("oss", "阿里云"),
     AWS("aws", "亚马逊"),
+    COS("cos", "腾讯云"),
     LOCAL("local", "本地"),
     HTTPS("https", "通过https请求文件");
 

+ 16 - 0
4dkankan-utils-model/src/main/java/com/fdkankan/model/utils/SceneUtil.java

@@ -59,6 +59,22 @@ public class SceneUtil {
     }
 
     /**
+     * 根据vision.txt获取全景图名称列表
+     * @param visionPath
+     * @return
+     */
+    public static List<String> getPanoramaUuidList(String visionPath){
+        String visionTxt = FileUtil.readString(visionPath, Charset.forName("UTF-8"));
+        JSONObject visionObject = JSON.parseObject(visionTxt);
+        JSONArray sweepLocations = visionObject.getJSONArray("sweepLocations");
+        List<String> uuidList = sweepLocations.parallelStream().map(o -> {
+            JSONObject item = (JSONObject) o;
+            return item.getString("uuid");
+        }).collect(Collectors.toList());
+        return uuidList;
+    }
+
+    /**
      * 根据dataSource获取原始资源目录
      * @param dataSource
      * @return