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

fix: 修复部分配置错误

Browse Source
This commit is contained in:
Charles7c
2023-03-30 23:40:30 +08:00
parent 0aafcc015c
commit 40e11a7a25
10 changed files with 43 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/MenuController.java
View File

@@ -52,14 +52,14 @@ public class MenuController extends BaseController<MenuService, MenuVO, MenuVO,
@Override
@SaCheckPermission("system:menu:add")
protected R<Long> add(@Validated(BaseRequest.Add.class) @RequestBody MenuRequest request) {
public R<Long> add(@Validated(BaseRequest.Add.class) @RequestBody MenuRequest request) {
this.checkPath(request);
return super.add(request);
}
@Override
@SaCheckPermission("system:menu:update")
protected R update(@Validated(BaseRequest.Update.class) @RequestBody MenuRequest request, @PathVariable Long id) {
public R update(@Validated(BaseRequest.Update.class) @RequestBody MenuRequest request, @PathVariable Long id) {
this.checkPath(request);
return super.update(request, id);
}

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

@@ -20,7 +20,7 @@ spring:
master:
url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:continew_admin}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false
username: ${DB_USER:root}
password: ${DB_PWD:root}
password: ${DB_PWD:123456}
driver-class-name: com.mysql.cj.jdbc.Driver
# 从库配置（可配多个，构成多从）
slave_1:
@@ -60,7 +60,7 @@ spring:
# 端口（默认 6379）
port: ${REDIS_PORT:6379}
# 密码（未设置密码时可为空或注释掉）
# password: ${REDIS_PWD:123456}
password: ${REDIS_PWD:123456}
# 数据库索引
database: ${REDIS_DB:0}
# 连接超时时间

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

@@ -53,19 +53,20 @@ spring.liquibase:
--- ### Redis 单机配置
spring:
redis:
# 地址
host: ${REDIS_HOST:127.0.0.1}
# 端口（默认 6379）
port: ${REDIS_PORT:6379}
# 密码（未设置密码时可为空或注释掉）
password: ${REDIS_PWD:123456}
# 数据库索引
database: ${REDIS_DB:0}
# 连接超时时间
timeout: 10s
# 是否开启 SSL
ssl: false
data:
redis:
# 地址
host: ${REDIS_HOST:127.0.0.1}
# 端口（默认 6379）
port: ${REDIS_PORT:6379}
# 密码（未设置密码时可为空或注释掉）
password: ${REDIS_PWD:123456}
# 数据库索引
database: ${REDIS_DB:0}
# 连接超时时间
timeout: 10s
# 是否开启 SSL
ssl: false
--- ### 邮件配置
spring:

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

@@ -188,6 +188,13 @@ spring:
# 允许反序列化不存在的属性
FAIL_ON_UNKNOWN_PROPERTIES: false
--- ### 健康检查配置
management:
health:
mail:
# 关闭邮箱健康检查（邮箱配置错误或邮箱服务器不可用时，健康检查会报错）
enabled: false
--- ### 线程池配置
thread-pool:
# 是否启用线程池
@@ -195,23 +202,4 @@ thread-pool:
# 队列容量
queueCapacity: 128
# 活跃时间
keepAliveSeconds: 300
management:
health:
mail:
# 临时关闭邮箱健康检查
# 注: 邮箱参数没有正确配置会出现mail health异常
enabled: false
# redis:
# # redis
# enabled: false
# mongo:
# # 关闭mongodb健康检查
# enabled: false
# solr:
# # 关闭solr健康检查
# enabled: false
# elasticsearch:
# # 关闭es健康检查
# enabled: false
keepAliveSeconds: 300