ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-10-12 12:57:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 使用属性变量消除配置文件中分散的 ContiNew Admin 品牌元素

Browse Source 
1.项目配置属性前缀由 continew-admin 改为 project（暂时未发现属性前缀 project 冲突）
2.配置文件中涉及到项目元素信息使用的，统一通过变量引用项目配置属性（如此改动之后，仅需要修改项目配置即可快速调整大量项目配置信息）
This commit is contained in:
Charles7c
2023-08-20 10:23:12 +08:00
parent cd3ac8a120
commit 54ea41048a
10 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
continew-admin-webapi/src/main/java/top/charles7c/cnadmin/ContiNewAdminApplication.java
View File

@@ -38,7 +38,7 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.URLUtil;
import cn.hutool.extra.spring.SpringUtil;
import top.charles7c.cnadmin.common.config.properties.ContiNewAdminProperties;
import top.charles7c.cnadmin.common.config.properties.ProjectProperties;
/**
* 启动程序
@@ -54,7 +54,7 @@ import top.charles7c.cnadmin.common.config.properties.ContiNewAdminProperties;
@ComponentScan(basePackages = {"top.charles7c.cnadmin", "cn.hutool.extra.spring"})
public class ContiNewAdminApplication implements ApplicationRunner {
private final ContiNewAdminProperties properties;
private final ProjectProperties projectProperties;
private final ServerProperties serverProperties;
public static void main(String[] args) {
@@ -70,7 +70,7 @@ public class ContiNewAdminApplication implements ApplicationRunner {
@SaIgnore
@GetMapping("/")
public String index() {
return String.format("%s backend service started successfully.", properties.getName());
return String.format("%s backend service started successfully.", projectProperties.getName());
}
@Override
@@ -80,7 +80,7 @@ public class ContiNewAdminApplication implements ApplicationRunner {
String contextPath = serverProperties.getServlet().getContextPath();
String baseUrl = URLUtil.normalize(String.format("%s:%s%s", hostAddress, port, contextPath));
log.info("------------------------------------------------------");
log.info("{} backend service started successfully.", properties.getName());
log.info("{} backend service started successfully.", projectProperties.getName());
log.info("后端 API 地址：{}", baseUrl);
Boolean docEnabled = Convert.toBool(SpringUtil.getProperty("springdoc.swagger-ui.enabled"));
if (Boolean.TRUE.equals(docEnabled)) {

6
continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CaptchaController.java
View File

@@ -40,7 +40,7 @@ import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
import top.charles7c.cnadmin.common.config.properties.CaptchaProperties;
import top.charles7c.cnadmin.common.config.properties.ContiNewAdminProperties;
import top.charles7c.cnadmin.common.config.properties.ProjectProperties;
import top.charles7c.cnadmin.common.constant.CacheConsts;
import top.charles7c.cnadmin.common.constant.RegexConsts;
import top.charles7c.cnadmin.common.model.vo.CaptchaVO;
@@ -65,7 +65,7 @@ import top.charles7c.cnadmin.common.util.validate.CheckUtils;
public class CaptchaController {
private final CaptchaProperties captchaProperties;
private final ContiNewAdminProperties properties;
private final ProjectProperties projectProperties;
@Operation(summary = "获取图片验证码", description = "获取图片验证码（Base64编码，带图片格式：data:image/gif;base64）")
@GetMapping("/img")
@@ -101,7 +101,7 @@ public class CaptchaController {
Long expirationInMinutes = captchaMail.getExpirationInMinutes();
String content = TemplateUtils.render(captchaMail.getTemplatePath(),
Dict.create().set("captcha", captcha).set("expiration", expirationInMinutes));
MailUtils.sendHtml(email, String.format("【%s】邮箱验证码", properties.getName()), content);
MailUtils.sendHtml(email, String.format("【%s】邮箱验证码", projectProperties.getName()), content);
// 保存验证码
String captchaKey = RedisUtils.formatKey(captchaKeyPrefix, email);

6
continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/common/CommonController.java
View File

@@ -37,7 +37,7 @@ import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.util.ClassUtil;
import top.charles7c.cnadmin.common.base.BaseEnum;
import top.charles7c.cnadmin.common.config.properties.ContiNewAdminProperties;
import top.charles7c.cnadmin.common.config.properties.ProjectProperties;
import top.charles7c.cnadmin.common.model.query.SortQuery;
import top.charles7c.cnadmin.common.model.vo.LabelValueVO;
import top.charles7c.cnadmin.common.model.vo.R;
@@ -67,7 +67,7 @@ public class CommonController {
private final DeptService deptService;
private final MenuService menuService;
private final RoleService roleService;
private final ContiNewAdminProperties properties;
private final ProjectProperties projectProperties;
@Operation(summary = "查询部门树", description = "查询树结构的部门列表")
@GetMapping("/tree/dept")
@@ -95,7 +95,7 @@ public class CommonController {
@GetMapping("/dict/enum/{enumTypeName}")
public R<List<LabelValueVO>> listEnumDict(@PathVariable String enumTypeName) {
// 扫描所有 BaseEnum 枚举基类的子类
Set<Class<?>> classSet = ClassUtil.scanPackageBySuper(properties.getBasePackage(), BaseEnum.class);
Set<Class<?>> classSet = ClassUtil.scanPackageBySuper(projectProperties.getBasePackage(), BaseEnum.class);
Optional<Class<?>> first =
classSet.stream().filter(c -> c.getSimpleName().equalsIgnoreCase(enumTypeName)).findFirst();
if (!first.isPresent()) {