diff --git a/bonus-base/src/main/java/com/bonus/base/controller/common/CaptchaController.java b/bonus-base/src/main/java/com/bonus/base/controller/common/CaptchaController.java index 7513e82..f6d71e1 100644 --- a/bonus-base/src/main/java/com/bonus/base/controller/common/CaptchaController.java +++ b/bonus-base/src/main/java/com/bonus/base/controller/common/CaptchaController.java @@ -11,7 +11,7 @@ import org.springframework.util.FastByteArrayOutputStream; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import com.google.code.kaptcha.Producer; -import com.bonus.common.config.RuoYiConfig; +import com.bonus.common.config.BonusConfig; import com.bonus.common.constant.CacheConstants; import com.bonus.common.constant.Constants; import com.bonus.common.core.domain.AjaxResult; @@ -61,7 +61,7 @@ public class CaptchaController BufferedImage image = null; // 生成验证码 - String captchaType = RuoYiConfig.getCaptchaType(); + String captchaType = BonusConfig.getCaptchaType(); if ("math".equals(captchaType)) { String capText = captchaProducerMath.createText(); diff --git a/bonus-base/src/main/java/com/bonus/base/controller/common/CommonController.java b/bonus-base/src/main/java/com/bonus/base/controller/common/CommonController.java index 461ef59..5ffcba1 100644 --- a/bonus-base/src/main/java/com/bonus/base/controller/common/CommonController.java +++ b/bonus-base/src/main/java/com/bonus/base/controller/common/CommonController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.bonus.common.config.RuoYiConfig; +import com.bonus.common.config.BonusConfig; import com.bonus.common.constant.Constants; import com.bonus.common.core.domain.AjaxResult; import com.bonus.common.utils.StringUtils; @@ -53,7 +53,7 @@ public class CommonController throw new Exception(StringUtils.format("文件名称({})非法,不允许下载。 ", fileName)); } String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); - String filePath = RuoYiConfig.getDownloadPath() + fileName; + String filePath = BonusConfig.getDownloadPath() + fileName; response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); FileUtils.setAttachmentResponseHeader(response, realFileName); @@ -78,7 +78,7 @@ public class CommonController try { // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); + String filePath = BonusConfig.getUploadPath(); // 上传并返回新文件名称 String fileName = FileUploadUtils.upload(filePath, file); String url = serverConfig.getUrl() + fileName; @@ -104,7 +104,7 @@ public class CommonController try { // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); + String filePath = BonusConfig.getUploadPath(); List urls = new ArrayList(); List fileNames = new ArrayList(); List newFileNames = new ArrayList(); @@ -146,7 +146,7 @@ public class CommonController throw new Exception(StringUtils.format("资源文件({})非法,不允许下载。 ", resource)); } // 本地资源路径 - String localPath = RuoYiConfig.getProfile(); + String localPath = BonusConfig.getProfile(); // 数据库资源地址 String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX); // 下载名称 diff --git a/bonus-base/src/main/java/com/bonus/base/controller/system/SysIndexController.java b/bonus-base/src/main/java/com/bonus/base/controller/system/SysIndexController.java index b458bfb..8fac947 100644 --- a/bonus-base/src/main/java/com/bonus/base/controller/system/SysIndexController.java +++ b/bonus-base/src/main/java/com/bonus/base/controller/system/SysIndexController.java @@ -3,7 +3,7 @@ package com.bonus.base.controller.system; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.bonus.common.config.RuoYiConfig; +import com.bonus.common.config.BonusConfig; import com.bonus.common.utils.StringUtils; /** @@ -16,7 +16,7 @@ public class SysIndexController { /** 系统基础配置 */ @Autowired - private RuoYiConfig ruoyiConfig; + private BonusConfig ruoyiConfig; /** * 访问首页,提示语 diff --git a/bonus-base/src/main/java/com/bonus/base/controller/system/SysProfileController.java b/bonus-base/src/main/java/com/bonus/base/controller/system/SysProfileController.java index 0e50cea..9984430 100644 --- a/bonus-base/src/main/java/com/bonus/base/controller/system/SysProfileController.java +++ b/bonus-base/src/main/java/com/bonus/base/controller/system/SysProfileController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import com.bonus.common.annotation.Log; -import com.bonus.common.config.RuoYiConfig; +import com.bonus.common.config.BonusConfig; import com.bonus.common.core.controller.BaseController; import com.bonus.common.core.domain.AjaxResult; import com.bonus.common.core.domain.entity.SysUser; @@ -124,7 +124,7 @@ public class SysProfileController extends BaseController if (!file.isEmpty()) { LoginUser loginUser = getLoginUser(); - String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION); + String avatar = FileUploadUtils.upload(BonusConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION); if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) { AjaxResult ajax = AjaxResult.success(); diff --git a/bonus-base/src/main/java/com/bonus/base/core/config/SwaggerConfig.java b/bonus-base/src/main/java/com/bonus/base/core/config/SwaggerConfig.java index 22b889b..e53c334 100644 --- a/bonus-base/src/main/java/com/bonus/base/core/config/SwaggerConfig.java +++ b/bonus-base/src/main/java/com/bonus/base/core/config/SwaggerConfig.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.bonus.common.config.RuoYiConfig; +import com.bonus.common.config.BonusConfig; import io.swagger.annotations.ApiOperation; import io.swagger.models.auth.In; import springfox.documentation.builders.ApiInfoBuilder; @@ -32,7 +32,7 @@ public class SwaggerConfig { /** 系统基础配置 */ @Autowired - private RuoYiConfig ruoyiConfig; + private BonusConfig ruoyiConfig; /** 是否开启swagger */ @Value("${swagger.enabled}") diff --git a/bonus-base/src/main/resources/application.yml b/bonus-base/src/main/resources/application.yml index bc466f1..e6d5b88 100644 --- a/bonus-base/src/main/resources/application.yml +++ b/bonus-base/src/main/resources/application.yml @@ -1,5 +1,5 @@ # 项目相关配置 -ruoyi: +bonus: # 名称 name: 博诺思 # 版本 @@ -7,7 +7,7 @@ ruoyi: # 版权年份 copyrightYear: 2025 # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) - profile: D:/ruoyi/uploadPath + profile: D:/bonus/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 @@ -57,9 +57,9 @@ spring: servlet: multipart: # 单个文件大小 - max-file-size: 10MB + max-file-size: -1 # 设置总上传的文件大小 - max-request-size: 20MB + max-request-size: -1 # 服务模块 devtools: restart: diff --git a/bonus-business/src/main/resources/mapper/business/ProductScreenMapper.xml b/bonus-business/src/main/resources/mapper/business/ProductScreenMapper.xml index 20099b4..31796e1 100644 --- a/bonus-business/src/main/resources/mapper/business/ProductScreenMapper.xml +++ b/bonus-business/src/main/resources/mapper/business/ProductScreenMapper.xml @@ -26,14 +26,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where tpt.id=#{id} \ No newline at end of file diff --git a/bonus-common/src/main/java/com/bonus/common/config/RuoYiConfig.java b/bonus-common/src/main/java/com/bonus/common/config/BonusConfig.java similarity index 90% rename from bonus-common/src/main/java/com/bonus/common/config/RuoYiConfig.java rename to bonus-common/src/main/java/com/bonus/common/config/BonusConfig.java index 4a4e575..0180a75 100644 --- a/bonus-common/src/main/java/com/bonus/common/config/RuoYiConfig.java +++ b/bonus-common/src/main/java/com/bonus/common/config/BonusConfig.java @@ -9,8 +9,8 @@ import org.springframework.stereotype.Component; * @author ruoyi */ @Component -@ConfigurationProperties(prefix = "ruoyi") -public class RuoYiConfig +@ConfigurationProperties(prefix = "bonus") +public class BonusConfig { /** 项目名称 */ private String name; @@ -67,7 +67,7 @@ public class RuoYiConfig public void setProfile(String profile) { - RuoYiConfig.profile = profile; + BonusConfig.profile = profile; } public static boolean isAddressEnabled() @@ -77,7 +77,7 @@ public class RuoYiConfig public void setAddressEnabled(boolean addressEnabled) { - RuoYiConfig.addressEnabled = addressEnabled; + BonusConfig.addressEnabled = addressEnabled; } public static String getCaptchaType() { @@ -85,7 +85,7 @@ public class RuoYiConfig } public void setCaptchaType(String captchaType) { - RuoYiConfig.captchaType = captchaType; + BonusConfig.captchaType = captchaType; } /** diff --git a/bonus-common/src/main/java/com/bonus/common/utils/file/FileUploadUtils.java b/bonus-common/src/main/java/com/bonus/common/utils/file/FileUploadUtils.java index 44414e2..1504885 100644 --- a/bonus-common/src/main/java/com/bonus/common/utils/file/FileUploadUtils.java +++ b/bonus-common/src/main/java/com/bonus/common/utils/file/FileUploadUtils.java @@ -8,7 +8,7 @@ import java.util.Objects; import com.bonus.common.utils.uuid.Seq; import org.apache.commons.io.FilenameUtils; import org.springframework.web.multipart.MultipartFile; -import com.bonus.common.config.RuoYiConfig; +import com.bonus.common.config.BonusConfig; import com.bonus.common.constant.Constants; import com.bonus.common.exception.file.FileNameLengthLimitExceededException; import com.bonus.common.exception.file.FileSizeLimitExceededException; @@ -36,7 +36,7 @@ public class FileUploadUtils /** * 默认上传的地址 */ - private static String defaultBaseDir = RuoYiConfig.getProfile(); + private static String defaultBaseDir = BonusConfig.getProfile(); public static void setDefaultBaseDir(String defaultBaseDir) { @@ -143,7 +143,7 @@ public class FileUploadUtils public static final String getPathFileName(String uploadDir, String fileName) throws IOException { - int dirLastIndex = RuoYiConfig.getProfile().length() + 1; + int dirLastIndex = BonusConfig.getProfile().length() + 1; String currentDir = StringUtils.substring(uploadDir, dirLastIndex); return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName; } diff --git a/bonus-common/src/main/java/com/bonus/common/utils/file/FileUtils.java b/bonus-common/src/main/java/com/bonus/common/utils/file/FileUtils.java index ecc3f9b..5e955e2 100644 --- a/bonus-common/src/main/java/com/bonus/common/utils/file/FileUtils.java +++ b/bonus-common/src/main/java/com/bonus/common/utils/file/FileUtils.java @@ -15,7 +15,7 @@ import javax.servlet.http.HttpServletResponse; import com.bonus.common.utils.uuid.IdUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; -import com.bonus.common.config.RuoYiConfig; +import com.bonus.common.config.BonusConfig; import com.bonus.common.utils.DateUtils; import com.bonus.common.utils.StringUtils; import org.apache.commons.io.FilenameUtils; @@ -74,7 +74,7 @@ public class FileUtils */ public static String writeImportBytes(byte[] data) throws IOException { - return writeBytes(data, RuoYiConfig.getImportPath()); + return writeBytes(data, BonusConfig.getImportPath()); } /** diff --git a/bonus-common/src/main/java/com/bonus/common/utils/file/ImageUtils.java b/bonus-common/src/main/java/com/bonus/common/utils/file/ImageUtils.java index 66bcabb..48fc6f5 100644 --- a/bonus-common/src/main/java/com/bonus/common/utils/file/ImageUtils.java +++ b/bonus-common/src/main/java/com/bonus/common/utils/file/ImageUtils.java @@ -9,7 +9,7 @@ import java.util.Arrays; import org.apache.poi.util.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.bonus.common.config.RuoYiConfig; +import com.bonus.common.config.BonusConfig; import com.bonus.common.constant.Constants; import com.bonus.common.utils.StringUtils; @@ -79,7 +79,7 @@ public class ImageUtils else { // 本机地址 - String localPath = RuoYiConfig.getProfile(); + String localPath = BonusConfig.getProfile(); String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX); in = new FileInputStream(downloadPath); } diff --git a/bonus-common/src/main/java/com/bonus/common/utils/ip/AddressUtils.java b/bonus-common/src/main/java/com/bonus/common/utils/ip/AddressUtils.java index 2a9d092..84d5aad 100644 --- a/bonus-common/src/main/java/com/bonus/common/utils/ip/AddressUtils.java +++ b/bonus-common/src/main/java/com/bonus/common/utils/ip/AddressUtils.java @@ -5,7 +5,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.bonus.common.config.RuoYiConfig; +import com.bonus.common.config.BonusConfig; import com.bonus.common.constant.Constants; import com.bonus.common.utils.StringUtils; @@ -31,7 +31,7 @@ public class AddressUtils { return "内网IP"; } - if (RuoYiConfig.isAddressEnabled()) + if (BonusConfig.isAddressEnabled()) { try { diff --git a/bonus-common/src/main/java/com/bonus/common/utils/poi/ExcelUtil.java b/bonus-common/src/main/java/com/bonus/common/utils/poi/ExcelUtil.java index c7a7fcf..77375bd 100644 --- a/bonus-common/src/main/java/com/bonus/common/utils/poi/ExcelUtil.java +++ b/bonus-common/src/main/java/com/bonus/common/utils/poi/ExcelUtil.java @@ -77,7 +77,7 @@ import com.bonus.common.annotation.Excel; import com.bonus.common.annotation.Excel.ColumnType; import com.bonus.common.annotation.Excel.Type; import com.bonus.common.annotation.Excels; -import com.bonus.common.config.RuoYiConfig; +import com.bonus.common.config.BonusConfig; import com.bonus.common.core.domain.AjaxResult; import com.bonus.common.core.text.Convert; import com.bonus.common.exception.UtilException; @@ -1460,7 +1460,7 @@ public class ExcelUtil */ public String getAbsoluteFile(String filename) { - String downloadPath = RuoYiConfig.getDownloadPath() + filename; + String downloadPath = BonusConfig.getDownloadPath() + filename; File desc = new File(downloadPath); if (!desc.getParentFile().exists()) { diff --git a/bonus-framework/src/main/java/com/bonus/framework/config/ResourcesConfig.java b/bonus-framework/src/main/java/com/bonus/framework/config/ResourcesConfig.java index 039b01a..ffe4c06 100644 --- a/bonus-framework/src/main/java/com/bonus/framework/config/ResourcesConfig.java +++ b/bonus-framework/src/main/java/com/bonus/framework/config/ResourcesConfig.java @@ -11,7 +11,7 @@ import org.springframework.web.filter.CorsFilter; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.bonus.common.config.RuoYiConfig; +import com.bonus.common.config.BonusConfig; import com.bonus.common.constant.Constants; import com.bonus.framework.interceptor.RepeatSubmitInterceptor; @@ -31,7 +31,7 @@ public class ResourcesConfig implements WebMvcConfigurer { /** 本地文件上传路径 */ registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**") - .addResourceLocations("file:" + RuoYiConfig.getProfile() + "/"); + .addResourceLocations("file:" + BonusConfig.getProfile() + "/"); /** swagger配置 */ registry.addResourceHandler("/swagger-ui/**")