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

refactor: 优化部分配置及工具类使用，适配最新 ContiNew Starter

Browse Source 
IpUtils 已经提取到 ContiNew Starter
This commit is contained in:
Charles7c
2023-11-26 14:36:52 +08:00
parent f28fbd14fa
commit feef427d41
14 changed files with 24 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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.ProjectProperties;
import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties;
/**
* 启动程序

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

@@ -47,7 +47,6 @@ 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.ProjectProperties;
import top.charles7c.cnadmin.common.constant.CacheConstants;
import top.charles7c.cnadmin.common.constant.RegexConstants;
import top.charles7c.cnadmin.common.model.resp.CaptchaResp;
@@ -57,6 +56,7 @@ import top.charles7c.cnadmin.common.util.TemplateUtils;
import top.charles7c.cnadmin.common.util.validate.CheckUtils;
import top.charles7c.continew.starter.cache.redisson.util.RedisUtils;
import top.charles7c.continew.starter.captcha.graphic.autoconfigure.GraphicCaptchaProperties;
import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties;
/**
* 验证码 API

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

@@ -44,7 +44,6 @@ import cn.hutool.core.util.StrUtil;
import top.charles7c.cnadmin.common.base.IBaseEnum;
import top.charles7c.cnadmin.common.config.properties.LocalStorageProperties;
import top.charles7c.cnadmin.common.config.properties.ProjectProperties;
import top.charles7c.cnadmin.common.constant.CacheConstants;
import top.charles7c.cnadmin.common.model.query.SortQuery;
import top.charles7c.cnadmin.common.model.resp.LabelValueResp;
@@ -59,6 +58,7 @@ import top.charles7c.cnadmin.system.model.query.OptionQuery;
import top.charles7c.cnadmin.system.model.query.RoleQuery;
import top.charles7c.cnadmin.system.model.resp.RoleResp;
import top.charles7c.cnadmin.system.service.*;
import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties;
/**
* 公共 API

2
continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/tool/GeneratorController.java
View File

@@ -31,7 +31,6 @@ import org.springframework.web.bind.annotation.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import top.charles7c.cnadmin.common.config.properties.ProjectProperties;
import top.charles7c.cnadmin.common.model.query.PageQuery;
import top.charles7c.cnadmin.common.model.resp.PageDataResp;
import top.charles7c.cnadmin.common.model.resp.R;
@@ -42,6 +41,7 @@ import top.charles7c.cnadmin.tool.model.query.TableQuery;
import top.charles7c.cnadmin.tool.model.req.GenConfigReq;
import top.charles7c.cnadmin.tool.model.resp.TableResp;
import top.charles7c.cnadmin.tool.service.GeneratorService;
import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties;
/**
* 代码生成 API

4
continew-admin-webapi/src/main/resources/config/application-dev.yml
View File

@@ -220,8 +220,8 @@ local-storage:
avatarMaxSizeInMb: 5
## Windows 系统本地存储配置
windows:
file: C:\${project.appName}\data\file\
avatar: C:\${project.appName}\data\avatar\
file: C:\${project.app-name}\data\file\
avatar: C:\${project.app-name}\data\avatar\
## Linux 系统本地存储配置
linux:
file: ./data/file/

4
continew-admin-webapi/src/main/resources/config/application-prod.yml
View File

@@ -219,8 +219,8 @@ local-storage:
avatarMaxSizeInMb: 5
## Windows 系统本地存储配置
windows:
file: C:\${project.appName}\data\file\
avatar: C:\${project.appName}\data\avatar\
file: C:\${project.app-name}\data\file\
avatar: C:\${project.app-name}\data\avatar\
## Linux 系统本地存储配置
linux:
file: ../data/file/

26
continew-admin-webapi/src/main/resources/config/application.yml
View File

@@ -3,13 +3,13 @@ project:
# 名称
name: ContiNew Admin
# 应用名称
appName: continew-admin
app-name: continew-admin
# 版本
version: 2.1.0-SNAPSHOT
# 描述
description: ContiNew Admin 中后台管理框架/脚手架，Continue New Admin，持续以最新流行技术栈构建，拥抱变化，迭代优化。
# 基本包
basePackage: top.charles7c.cnadmin
base-package: top.charles7c.cnadmin
## 作者信息配置
contact:
name: Charles7c
@@ -19,8 +19,8 @@ project:
license:
name: Apache-2.0
url: https://github.com/Charles7c/continew-admin/blob/dev/LICENSE
# 是否本地解析 IP 归属地
ipAddrLocalParseEnabled: true
# 是否启用本地解析 IP 归属地
ip-addr-local-parse-enabled: true
--- ### 日志配置（重叠部分，优先级高于 logback-spring.xml 中的配置）
logging:
@@ -47,31 +47,31 @@ springdoc:
group-configs:
- group: 'all'
paths-to-match: '/**'
packages-to-scan: ${project.basePackage}.webapi.controller
packages-to-scan: ${project.base-package}.webapi.controller
- group: 'auth'
display-name: '系统认证'
paths-to-match:
- '/auth/**'
- '/oauth/**'
packages-to-scan: ${project.basePackage}.webapi.controller.auth
packages-to-scan: ${project.base-package}.webapi.controller.auth
- group: 'common'
display-name: '通用接口'
paths-to-match:
- '/common/**'
- '/dashboard/**'
packages-to-scan: ${project.basePackage}.webapi.controller.common
packages-to-scan: ${project.base-package}.webapi.controller.common
- group: 'system'
display-name: '系统管理'
paths-to-match: '/system/**'
packages-to-scan: ${project.basePackage}.webapi.controller.system
packages-to-scan: ${project.base-package}.webapi.controller.system
- group: 'tool'
display-name: '系统工具'
paths-to-match: '/tool/**'
packages-to-scan: ${project.basePackage}.webapi.controller.tool
packages-to-scan: ${project.base-package}.webapi.controller.tool
- group: 'monitor'
display-name: '系统监控'
paths-to-match: '/monitor/**'
packages-to-scan: ${project.basePackage}.webapi.controller.monitor
packages-to-scan: ${project.base-package}.webapi.controller.monitor
## 接口文档增强配置
knife4j:
enable: true
@@ -114,7 +114,7 @@ mybatis-plus:
# Mapper XML 文件目录配置
mapper-locations: classpath*:/mapper/**/*Mapper.xml
# 类型别名扫描包配置
type-aliases-package: ${project.basePackage}.**.model
type-aliases-package: ${project.base-package}.**.model
configuration:
# MyBatis 自动映射策略
# NONE：不启用 PARTIAL：只对非嵌套 resultMap 自动映射 FULL：对所有 resultMap 自动映射
@@ -135,7 +135,7 @@ mybatis-plus:
extension:
enabled: true
# Mapper 接口扫描包配置
mapper-package: ${project.basePackage}.**.mapper
mapper-package: ${project.base-package}.**.mapper
# 数据权限实现
data-permission-handler-impl: top.charles7c.cnadmin.common.config.mybatis.DataPermissionHandlerImpl
# 分页插件配置
@@ -166,7 +166,7 @@ server:
--- ### Spring 配置
spring:
application:
name: ${project.appName}
name: ${project.app-name}
## 环境配置
profiles:
# 启用的环境