diff --git a/common/src/main/java/ink/wgink/common/config/WebConfig.java b/common/src/main/java/ink/wgink/common/config/WebConfig.java index c71e9d30..71c9d6f1 100644 --- a/common/src/main/java/ink/wgink/common/config/WebConfig.java +++ b/common/src/main/java/ink/wgink/common/config/WebConfig.java @@ -1,6 +1,7 @@ package ink.wgink.common.config; import ink.wgink.properties.FileProperties; +import ink.wgink.properties.web.WebProperties; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; @@ -23,6 +24,8 @@ public class WebConfig implements WebMvcConfigurer { @Autowired private FileProperties fileProperties; + @Autowired + private WebProperties webProperties; @Override public void addViewControllers(ViewControllerRegistry registry) { @@ -33,7 +36,12 @@ public class WebConfig implements WebMvcConfigurer { public void addResourceHandlers(ResourceHandlerRegistry registry) { // 上传文件的直接访问地址 if (!StringUtils.isBlank(fileProperties.getUploadPath())) { - registry.addResourceHandler("/upload-files/**").addResourceLocations("file:" + fileProperties.getUploadPath()); + // 静态文件 + registry.addResourceHandler("/static-files/**").addResourceLocations("file:" + fileProperties.getUploadPath()); + } + if (!StringUtils.isBlank(webProperties.getPath())) { + // 网站 + registry.addResourceHandler("/web/**").addResourceLocations("file:" + webProperties.getPath()); } // 静态资源 registry.addResourceHandler("/assets/**", "/pages/**").addResourceLocations("classpath:/static/assets/", "classpath:/static/pages/").setCachePeriod(7 * 24 * 3600); diff --git a/common/src/main/resources/static/assets/js/layui-util.js b/common/src/main/resources/static/assets/js/layui-util.js index 73dded8d..4ff6222e 100644 --- a/common/src/main/resources/static/assets/js/layui-util.js +++ b/common/src/main/resources/static/assets/js/layui-util.js @@ -274,7 +274,6 @@ function LayuiUtil(layui, viewer) { } $(document).on('click', '.form-upload-file .file-item', function() { - console.log(this); var fileId = this.dataset.fileId; if(onFileClick) { onFileClick(fileId);