From f21d302f4ccb816ca2d411544b5ff8bd4f9d4cac Mon Sep 17 00:00:00 2001
From: yanzhaofeige <yanzhaofeige@qq.com>
Date: Mon, 30 Sep 2024 09:52:34 +0800
Subject: [PATCH] init
---
cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/file/ImageUtils.java | 4 +-
cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/poi/ExcelUtil.java | 4 +-
cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/common/CommonController.java | 10 ++--
cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/file/FileUtils.java | 4 +-
cpzidc-admin/src/main/java/com/odcc/cpzidc/web/core/config/SwaggerConfig.java | 4 +-
cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/system/SysIndexController.java | 4 +-
cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/system/SysProfileController.java | 4 +-
cpzidc-admin/src/main/resources/application.yml | 14 +++---
cpzidc-common/src/main/java/com/odcc/cpzidc/common/config/CpzIdcConfig.java | 10 ++--
cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/file/FileUploadUtils.java | 6 +-
cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/ip/AddressUtils.java | 4 +-
cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/common/CaptchaController.java | 4 +-
cpzidc-framework/src/main/java/com/odcc/cpzidc/framework/config/ResourcesConfig.java | 4 +-
13 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/common/CaptchaController.java b/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/common/CaptchaController.java
index ec3e5bd..1756edf 100644
--- a/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/common/CaptchaController.java
+++ b/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/common/CaptchaController.java
@@ -11,7 +11,7 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import com.google.code.kaptcha.Producer;
-import com.odcc.cpzidc.common.config.RuoYiConfig;
+import com.odcc.cpzidc.common.config.CpzIdcConfig;
import com.odcc.cpzidc.common.constant.CacheConstants;
import com.odcc.cpzidc.common.constant.Constants;
import com.odcc.cpzidc.common.core.domain.AjaxResult;
@@ -61,7 +61,7 @@
BufferedImage image = null;
// 生成验证码
- String captchaType = RuoYiConfig.getCaptchaType();
+ String captchaType = CpzIdcConfig.getCaptchaType();
if ("math".equals(captchaType))
{
String capText = captchaProducerMath.createText();
diff --git a/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/common/CommonController.java b/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/common/CommonController.java
index fd1bc90..e40bff4 100644
--- a/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/common/CommonController.java
+++ b/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/common/CommonController.java
@@ -13,7 +13,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
-import com.odcc.cpzidc.common.config.RuoYiConfig;
+import com.odcc.cpzidc.common.config.CpzIdcConfig;
import com.odcc.cpzidc.common.constant.Constants;
import com.odcc.cpzidc.common.core.domain.AjaxResult;
import com.odcc.cpzidc.common.utils.StringUtils;
@@ -53,7 +53,7 @@
throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
}
String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
- String filePath = RuoYiConfig.getDownloadPath() + fileName;
+ String filePath = CpzIdcConfig.getDownloadPath() + fileName;
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
FileUtils.setAttachmentResponseHeader(response, realFileName);
@@ -78,7 +78,7 @@
try
{
// 上传文件路径
- String filePath = RuoYiConfig.getUploadPath();
+ String filePath = CpzIdcConfig.getUploadPath();
// 上传并返回新文件名称
String fileName = FileUploadUtils.upload(filePath, file);
String url = serverConfig.getUrl() + fileName;
@@ -104,7 +104,7 @@
try
{
// 上传文件路径
- String filePath = RuoYiConfig.getUploadPath();
+ String filePath = CpzIdcConfig.getUploadPath();
List<String> urls = new ArrayList<String>();
List<String> fileNames = new ArrayList<String>();
List<String> newFileNames = new ArrayList<String>();
@@ -146,7 +146,7 @@
throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource));
}
// 本地资源路径
- String localPath = RuoYiConfig.getProfile();
+ String localPath = CpzIdcConfig.getProfile();
// 数据库资源地址
String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
// 下载名称
diff --git a/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/system/SysIndexController.java b/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/system/SysIndexController.java
index 6b43b00..e8aea9c 100644
--- a/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/system/SysIndexController.java
+++ b/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/system/SysIndexController.java
@@ -3,7 +3,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.odcc.cpzidc.common.config.RuoYiConfig;
+import com.odcc.cpzidc.common.config.CpzIdcConfig;
import com.odcc.cpzidc.common.utils.StringUtils;
/**
@@ -16,7 +16,7 @@
{
/** 系统基础配置 */
@Autowired
- private RuoYiConfig ruoyiConfig;
+ private CpzIdcConfig ruoyiConfig;
/**
* 访问首页，提示语
diff --git a/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/system/SysProfileController.java b/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/system/SysProfileController.java
index 0af3edb..211c732 100644
--- a/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/system/SysProfileController.java
+++ b/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/controller/system/SysProfileController.java
@@ -10,7 +10,7 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import com.odcc.cpzidc.common.annotation.Log;
-import com.odcc.cpzidc.common.config.RuoYiConfig;
+import com.odcc.cpzidc.common.config.CpzIdcConfig;
import com.odcc.cpzidc.common.core.controller.BaseController;
import com.odcc.cpzidc.common.core.domain.AjaxResult;
import com.odcc.cpzidc.common.core.domain.entity.SysUser;
@@ -121,7 +121,7 @@
if (!file.isEmpty())
{
LoginUser loginUser = getLoginUser();
- String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
+ String avatar = FileUploadUtils.upload(CpzIdcConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
{
AjaxResult ajax = AjaxResult.success();
diff --git a/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/core/config/SwaggerConfig.java b/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/core/config/SwaggerConfig.java
index 19b12ba..83c5055 100644
--- a/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/core/config/SwaggerConfig.java
+++ b/cpzidc-admin/src/main/java/com/odcc/cpzidc/web/core/config/SwaggerConfig.java
@@ -6,7 +6,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import com.odcc.cpzidc.common.config.RuoYiConfig;
+import com.odcc.cpzidc.common.config.CpzIdcConfig;
import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
import springfox.documentation.builders.ApiInfoBuilder;
@@ -32,7 +32,7 @@
{
/** 系统基础配置 */
@Autowired
- private RuoYiConfig ruoyiConfig;
+ private CpzIdcConfig ruoyiConfig;
/** 是否开启swagger */
@Value("${swagger.enabled}")
diff --git a/cpzidc-admin/src/main/resources/application.yml b/cpzidc-admin/src/main/resources/application.yml
index 0bccec4..b2cf0aa 100644
--- a/cpzidc-admin/src/main/resources/application.yml
+++ b/cpzidc-admin/src/main/resources/application.yml
@@ -1,13 +1,13 @@
# 项目相关配置
-ruoyi:
+cpzidc:
# 名称
- name: RuoYi
+ name: CpzIdc
# 版本
version: 3.8.8
# 版权年份
copyrightYear: 2024
- # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
- profile: D:/ruoyi/uploadPath
+ # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /data/CpzIdc/uploadPath）
+ profile: /data/cpzIdc/uploadPath
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数字计算 char 字符验证
@@ -16,7 +16,7 @@
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
- port: 8080
+ port: 8560
servlet:
# 应用的访问路径
context-path: /
@@ -57,9 +57,9 @@
servlet:
multipart:
# 单个文件大小
- max-file-size: 10MB
+ max-file-size: 20MB
# 设置总上传的文件大小
- max-request-size: 20MB
+ max-request-size: 50MB
# 服务模块
devtools:
restart:
diff --git a/cpzidc-common/src/main/java/com/odcc/cpzidc/common/config/RuoYiConfig.java b/cpzidc-common/src/main/java/com/odcc/cpzidc/common/config/CpzIdcConfig.java
similarity index 90%
rename from cpzidc-common/src/main/java/com/odcc/cpzidc/common/config/RuoYiConfig.java
rename to cpzidc-common/src/main/java/com/odcc/cpzidc/common/config/CpzIdcConfig.java
index 46a92d8..a974ffa 100644
--- a/cpzidc-common/src/main/java/com/odcc/cpzidc/common/config/RuoYiConfig.java
+++ b/cpzidc-common/src/main/java/com/odcc/cpzidc/common/config/CpzIdcConfig.java
@@ -9,8 +9,8 @@
* @author ruoyi
*/
@Component
-@ConfigurationProperties(prefix = "ruoyi")
-public class RuoYiConfig
+@ConfigurationProperties(prefix = "cpzidc")
+public class CpzIdcConfig
{
/** 项目名称 */
private String name;
@@ -67,7 +67,7 @@
public void setProfile(String profile)
{
- RuoYiConfig.profile = profile;
+ CpzIdcConfig.profile = profile;
}
public static boolean isAddressEnabled()
@@ -77,7 +77,7 @@
public void setAddressEnabled(boolean addressEnabled)
{
- RuoYiConfig.addressEnabled = addressEnabled;
+ CpzIdcConfig.addressEnabled = addressEnabled;
}
public static String getCaptchaType() {
@@ -85,7 +85,7 @@
}
public void setCaptchaType(String captchaType) {
- RuoYiConfig.captchaType = captchaType;
+ CpzIdcConfig.captchaType = captchaType;
}
/**
diff --git a/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/file/FileUploadUtils.java b/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/file/FileUploadUtils.java
index 5408a69..aaa5f74 100644
--- a/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/file/FileUploadUtils.java
+++ b/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/file/FileUploadUtils.java
@@ -6,7 +6,7 @@
import java.util.Objects;
import org.apache.commons.io.FilenameUtils;
import org.springframework.web.multipart.MultipartFile;
-import com.odcc.cpzidc.common.config.RuoYiConfig;
+import com.odcc.cpzidc.common.config.CpzIdcConfig;
import com.odcc.cpzidc.common.constant.Constants;
import com.odcc.cpzidc.common.exception.file.FileNameLengthLimitExceededException;
import com.odcc.cpzidc.common.exception.file.FileSizeLimitExceededException;
@@ -35,7 +35,7 @@
/**
* 默认上传的地址
*/
- private static String defaultBaseDir = RuoYiConfig.getProfile();
+ private static String defaultBaseDir = CpzIdcConfig.getProfile();
public static void setDefaultBaseDir(String defaultBaseDir)
{
@@ -142,7 +142,7 @@
public static final String getPathFileName(String uploadDir, String fileName) throws IOException
{
- int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
+ int dirLastIndex = CpzIdcConfig.getProfile().length() + 1;
String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
}
diff --git a/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/file/FileUtils.java b/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/file/FileUtils.java
index d36e1ac..ff1bf4b 100644
--- a/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/file/FileUtils.java
+++ b/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/file/FileUtils.java
@@ -13,7 +13,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.ArrayUtils;
-import com.odcc.cpzidc.common.config.RuoYiConfig;
+import com.odcc.cpzidc.common.config.CpzIdcConfig;
import com.odcc.cpzidc.common.utils.DateUtils;
import com.odcc.cpzidc.common.utils.StringUtils;
import com.odcc.cpzidc.common.utils.uuid.IdUtils;
@@ -73,7 +73,7 @@
*/
public static String writeImportBytes(byte[] data) throws IOException
{
- return writeBytes(data, RuoYiConfig.getImportPath());
+ return writeBytes(data, CpzIdcConfig.getImportPath());
}
/**
diff --git a/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/file/ImageUtils.java b/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/file/ImageUtils.java
index 31f73d8..d622cf6 100644
--- a/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/file/ImageUtils.java
+++ b/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/file/ImageUtils.java
@@ -9,7 +9,7 @@
import org.apache.poi.util.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.odcc.cpzidc.common.config.RuoYiConfig;
+import com.odcc.cpzidc.common.config.CpzIdcConfig;
import com.odcc.cpzidc.common.constant.Constants;
import com.odcc.cpzidc.common.utils.StringUtils;
@@ -79,7 +79,7 @@
else
{
// 本机地址
- String localPath = RuoYiConfig.getProfile();
+ String localPath = CpzIdcConfig.getProfile();
String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX);
in = new FileInputStream(downloadPath);
}
diff --git a/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/ip/AddressUtils.java b/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/ip/AddressUtils.java
index 5191b68..8f7d93b 100644
--- a/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/ip/AddressUtils.java
+++ b/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/ip/AddressUtils.java
@@ -4,7 +4,7 @@
import org.slf4j.LoggerFactory;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.odcc.cpzidc.common.config.RuoYiConfig;
+import com.odcc.cpzidc.common.config.CpzIdcConfig;
import com.odcc.cpzidc.common.constant.Constants;
import com.odcc.cpzidc.common.utils.StringUtils;
import com.odcc.cpzidc.common.utils.http.HttpUtils;
@@ -31,7 +31,7 @@
{
return "内网IP";
}
- if (RuoYiConfig.isAddressEnabled())
+ if (CpzIdcConfig.isAddressEnabled())
{
try
{
diff --git a/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/poi/ExcelUtil.java b/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/poi/ExcelUtil.java
index a9597d2..335d2fa 100644
--- a/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/poi/ExcelUtil.java
+++ b/cpzidc-common/src/main/java/com/odcc/cpzidc/common/utils/poi/ExcelUtil.java
@@ -74,7 +74,7 @@
import com.odcc.cpzidc.common.annotation.Excel.ColumnType;
import com.odcc.cpzidc.common.annotation.Excel.Type;
import com.odcc.cpzidc.common.annotation.Excels;
-import com.odcc.cpzidc.common.config.RuoYiConfig;
+import com.odcc.cpzidc.common.config.CpzIdcConfig;
import com.odcc.cpzidc.common.core.domain.AjaxResult;
import com.odcc.cpzidc.common.core.text.Convert;
import com.odcc.cpzidc.common.exception.UtilException;
@@ -1409,7 +1409,7 @@
*/
public String getAbsoluteFile(String filename)
{
- String downloadPath = RuoYiConfig.getDownloadPath() + filename;
+ String downloadPath = CpzIdcConfig.getDownloadPath() + filename;
File desc = new File(downloadPath);
if (!desc.getParentFile().exists())
{
diff --git a/cpzidc-framework/src/main/java/com/odcc/cpzidc/framework/config/ResourcesConfig.java b/cpzidc-framework/src/main/java/com/odcc/cpzidc/framework/config/ResourcesConfig.java
index ec21527..a876897 100644
--- a/cpzidc-framework/src/main/java/com/odcc/cpzidc/framework/config/ResourcesConfig.java
+++ b/cpzidc-framework/src/main/java/com/odcc/cpzidc/framework/config/ResourcesConfig.java
@@ -11,7 +11,7 @@
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.odcc.cpzidc.common.config.RuoYiConfig;
+import com.odcc.cpzidc.common.config.CpzIdcConfig;
import com.odcc.cpzidc.common.constant.Constants;
import com.odcc.cpzidc.framework.interceptor.RepeatSubmitInterceptor;
@@ -31,7 +31,7 @@
{
/** 本地文件上传路径 */
registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**")
- .addResourceLocations("file:" + RuoYiConfig.getProfile() + "/");
+ .addResourceLocations("file:" + CpzIdcConfig.getProfile() + "/");
/** swagger配置 */
registry.addResourceHandler("/swagger-ui/**")
--
Gitblit v1.9.3