Merge branch 'dev_06-26' into bbt

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -89,11 +89,12 @@ public class CommonController
             String filePath = RuoYiConfig.getUploadPath();
             // 上传并返回新文件名称
             String fileName = FileUploadUtils.upload(filePath, file);
-            String url = serverConfig.getUrl() + fileName;
+            String filename = fileName.replace("/profile/upload/", "/profileSpecific/upload/");
+            String url = serverConfig.getUrl() + filename;
             AjaxResult ajax = AjaxResult.success();
             ajax.put("url", url);
-            ajax.put("fileName", fileName);
+            ajax.put("fileName", filename);
-            ajax.put("newFileName", FileUtils.getName(fileName));
+            ajax.put("newFileName", FileUtils.getName(filename));
             ajax.put("originalFilename", file.getOriginalFilename());
             return ajax;
         }

ruoyi-admin/src/main/resources/application.yml

@@ -10,6 +10,9 @@ ruoyi:
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: /home/project/nbzhpc/pic
+  #  profile: D:\home
+  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+  profileSpecific: /home/project/nbzhpc/pic
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -21,7 +24,7 @@ server:
   port: 8799
   servlet:
     # 应用的访问路径
-    context-path: /zhpcapi
+    context-path: /
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8
@@ -97,7 +100,7 @@ token:
     # 令牌密钥
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期（默认30分钟）
-    expireTime: 30
+    expireTime: 1440
 
 # MyBatis Plus配置
 mybatis-plus:

ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java

@@ -27,6 +27,9 @@ public class RuoYiConfig
     /** 上传路径 */
     private static String profile;
 
+    /** 上传路径 */
+    private static String profileSpecific;
+
     /** 获取地址开关 */
     private static boolean addressEnabled;
 
@@ -83,6 +86,15 @@ public class RuoYiConfig
         RuoYiConfig.profile = profile;
     }
 
+
+    public static String getProfileSpecific(){
+        return profileSpecific;
+    }
+    public void setProfileSpecific(String ProfileSpecific)
+    {
+        RuoYiConfig.profileSpecific = ProfileSpecific;
+    }
+
     public static boolean isAddressEnabled()
     {
         return addressEnabled;

ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -113,6 +113,10 @@ public class Constants
      * 资源映射路径 前缀
      */
     public static final String RESOURCE_PREFIX = "/profile";
+    /**
+     * 资源映射路径 前缀
+     */
+    public static final String RESOURCE_PREFIX_SPECIFIC = "/profileSpecific";
 
     /**
      * RMI 远程方法调用

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

@@ -36,6 +36,10 @@ public class ResourcesConfig implements WebMvcConfigurer {
         registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**")
                 .addResourceLocations("file:" + RuoYiConfig.getProfile() + "/");
 
+        /** 本地文件上传路径 */
+        registry.addResourceHandler(Constants.RESOURCE_PREFIX_SPECIFIC + "/**")
+                .addResourceLocations("file:" + RuoYiConfig.getProfile() + "/");
+
         /** swagger配置 */
         registry.addResourceHandler("/swagger-ui/**")
                 .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/")