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

Merge branch 'pr_2' into 2.0.x

Browse Source 
# Conflicts:
#	continew-admin-common/pom.xml
#	continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java
#	continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java
#	continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/DeptRequest.java
#	continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/MenuRequest.java
#	continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/RoleRequest.java
#	continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UpdateBasicInfoRequest.java
#	continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/request/UserRequest.java
#	pom.xml
This commit is contained in:
Charles7c
2023-03-30 22:59:43 +08:00
parent 65401d0219 dea160a7b2
commit 0aafcc015c
44 changed files with 122 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,9 +18,9 @@ package top.charles7c.cnadmin.webapi.controller.common;
import java.time.Duration;
import javax.mail.MessagingException;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import jakarta.mail.MessagingException;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.RequiredArgsConstructor;

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

@@ -16,7 +16,7 @@
package top.charles7c.cnadmin.webapi.controller.system;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;

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

@@ -53,7 +53,7 @@ public class UserController extends BaseController<UserService, UserVO, UserDeta
@Override
@SaCheckPermission("system:user:add")
protected R<Long> add(@Validated(BaseRequest.Add.class) @RequestBody UserRequest request) {
public R<Long> add(@Validated(BaseRequest.Add.class) @RequestBody UserRequest request) {
Long id = baseService.add(request);
return R.ok(String.format("新增成功，请牢记默认密码：%s", SysConsts.DEFAULT_PASSWORD), id);
}

29
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:123456}
password: ${DB_PWD:root}
driver-class-name: com.mysql.cj.jdbc.Driver
# 从库配置（可配多个，构成多从）
slave_1:
@@ -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:

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

@@ -196,3 +196,22 @@ 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