Merge branch 'master' of http://47.108.150.237:10000/allen/fidms

fidms-common/src/main/java/com/fidms/common/utils/FolderUtils.java

@@ -0,0 +1,34 @@
+package com.fidms.common.utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.awt.*;
+import java.io.File;
+import java.io.IOException;
+
+public class FolderUtils {
+
+    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public String openFolder(String path) throws IOException {
+        String errorMsg = "";
+        // 指定要打开的文件夹路径
+        File folder = new File(path);
+
+        // 检查桌面是否支持打开文件夹操作
+        if (Desktop.isDesktopSupported()) {
+            Desktop desktop = Desktop.getDesktop();
+            if (folder.exists()) {
+                desktop.open(folder);
+            } else {
+                logger.warn("文件夹不存在，path: {}", path);
+                errorMsg = "文件夹不存在";
+            }
+        } else {
+            logger.warn("不支持桌面操作，path: {}", path);
+            errorMsg = "不支持桌面操作";
+        }
+        return errorMsg;
+    }
+}

fidms-framework/src/main/java/com/fidms/framework/config/ResourcesConfig.java

@@ -36,7 +36,7 @@ public class ResourcesConfig implements WebMvcConfigurer
         /** swagger配置 */
         registry.addResourceHandler("/swagger-ui/**")
                 .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/")
-                .setCacheControl(CacheControl.maxAge(5, TimeUnit.HOURS).cachePublic());;
+                .setCacheControl(CacheControl.maxAge(5, TimeUnit.HOURS).cachePublic());
     }
 
     /**

fidms-ui/public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>logo.png">
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>