diff --git a/zt-admin/src/main/java/com/wuzhen/ZtApplication.java b/zt-admin/src/main/java/com/wuzhen/ZtApplication.java index be1a06da6..434c8cbde 100644 --- a/zt-admin/src/main/java/com/wuzhen/ZtApplication.java +++ b/zt-admin/src/main/java/com/wuzhen/ZtApplication.java @@ -44,7 +44,9 @@ public class ZtApplication implements WebMvcConfigurer */ registry.addResourceHandler("/fp/**").addResourceLocations("file:" + RuoYiConfig.getProfile()+"/fp/"); registry.addResourceHandler("/lp/**").addResourceLocations("file:" + RuoYiConfig.getLPUploadPath()+"/"); - System.out.println( RuoYiConfig.getLPUploadPath()+"/"); + registry.addResourceHandler("/ls/**").addResourceLocations("file:" + RuoYiConfig.getLSUploadPath()+"/"); + registry.addResourceHandler("/fp/**").addResourceLocations("file:" + RuoYiConfig.getFPUploadPath()+"/"); +// System.out.println( RuoYiConfig.getLPUploadPath()+"/"); // registry.addResourceHandler("/**").addResourceLocations("file:" + RuoYiConfig.getProfile()); } diff --git a/zt-admin/src/main/java/com/wuzhen/web/core/config/WebConfig.java b/zt-admin/src/main/java/com/wuzhen/web/core/config/WebConfig.java index 7d4b521ec..816bd2402 100644 --- a/zt-admin/src/main/java/com/wuzhen/web/core/config/WebConfig.java +++ b/zt-admin/src/main/java/com/wuzhen/web/core/config/WebConfig.java @@ -31,7 +31,9 @@ public class WebConfig implements WebMvcConfigurer { */ registry.addResourceHandler("/fp/**").addResourceLocations("file:" + RuoYiConfig.getProfile()+"/fp/"); registry.addResourceHandler("/lp/**").addResourceLocations("file:" + RuoYiConfig.getLPUploadPath()+"/"); - System.out.println( RuoYiConfig.getLPUploadPath()+"/"); + registry.addResourceHandler("/ls/**").addResourceLocations("file:" + RuoYiConfig.getLSUploadPath()+"/"); + registry.addResourceHandler("/fp/**").addResourceLocations("file:" + RuoYiConfig.getFPUploadPath()+"/"); +// System.out.println( RuoYiConfig.getLPUploadPath()+"/"); // registry.addResourceHandler("/**").addResourceLocations("file:" + RuoYiConfig.getProfile()); } diff --git a/zt-system/src/main/resources/mapper/system/ActiveInfoMapper.xml b/zt-system/src/main/resources/mapper/system/ActiveInfoMapper.xml index 4eaee8ffd..adbd9c7a5 100644 --- a/zt-system/src/main/resources/mapper/system/ActiveInfoMapper.xml +++ b/zt-system/src/main/resources/mapper/system/ActiveInfoMapper.xml @@ -54,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} + + order by r.create_time desc