修改配置

This commit is contained in:
18536819133 2023-10-20 16:25:34 +08:00
parent 8918116dbd
commit 4af1c07029
4 changed files with 37 additions and 35 deletions

View File

@ -28,10 +28,10 @@ public class SysRegisterController extends BaseController
@PostMapping("/register") @PostMapping("/register")
public AjaxResult register(@RequestBody RegisterBody user) public AjaxResult register(@RequestBody RegisterBody user)
{ {
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) // if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
{ // {
return error("当前系统没有开启注册功能!"); // return error("当前系统没有开启注册功能!");
} // }
String msg = registerService.register(user); String msg = registerService.register(user);
return StringUtils.isEmpty(msg) ? success() : error(msg); return StringUtils.isEmpty(msg) ? success() : error(msg);
} }

View File

@ -2,23 +2,24 @@
spring: spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
# driverClassName: com.mysql.cj.jdbc.Driver # driverClassName: com.mysql.cj.jdbc.Driver
driver-class-name: org.postgresql.Driver driver-class-name: org.postgresql.Driver
druid: druid:
master: master:
url: jdbc:postgresql://192.168.2.9:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai #url: jdbc:postgresql://47.243.79.66:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
username: sjs #url: jdbc:postgresql://192.168.2.9:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
password: song5325 # username: postgres
# url: jdbc:mysql://192.168.2.9:3306/nuoyi?AllowPublicKeyRetrieval=True&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai # password: postgres
# username: saas url: jdbc:postgresql://118.195.242.28:5432/yada?AllowPublicKeyRetrieval=True&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
# password: XKrs123. username: gty
password: 308525
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭
enabled: false enabled: false
url: url:
username: username:
password: password:
# 初始连接数 # 初始连接数
initialSize: 5 initialSize: 5
# 最小连接池数量 # 最小连接池数量
@ -34,12 +35,12 @@ spring:
# 配置一个连接在池中最大生存的时间,单位是毫秒 # 配置一个连接在池中最大生存的时间,单位是毫秒
maxEvictableIdleTimeMillis: 900000 maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效select * from pg_stat_activity # 配置检测连接是否有效select * from pg_stat_activity
# validationQuery: SELECT 1 FROM DUAL # validationQuery: SELECT 1 FROM DUAL
validationQuery: SELECT version() validationQuery: SELECT version()
testWhileIdle: true testWhileIdle: true
testOnBorrow: false testOnBorrow: false
testOnReturn: false testOnReturn: false
webStatFilter: webStatFilter:
enabled: true enabled: true
statViewServlet: statViewServlet:
enabled: true enabled: true

View File

@ -9,7 +9,7 @@ ruoyi:
# 实例演示开关 # 实例演示开关
demoEnabled: true demoEnabled: true
# 文件路径 示例( Windows配置D:/ruoyi/uploadPathLinux配置 /home/ruoyi/uploadPath # 文件路径 示例( Windows配置D:/ruoyi/uploadPathLinux配置 /home/ruoyi/uploadPath
profile: D:/ruoyi/uploadPath profile: /home/gty/ruoyi/uploadPath
# 获取ip地址开关 # 获取ip地址开关
addressEnabled: false addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证 # 验证码类型 math 数组计算 char 字符验证
@ -19,6 +19,7 @@ ruoyi:
server: server:
# 服务器的HTTP端口默认为8080 # 服务器的HTTP端口默认为8080
port: 8080 port: 8080
#port: 6061
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /
@ -65,7 +66,7 @@ spring:
# 数据库索引 # 数据库索引
database: 0 database: 0
# 密码 # 密码
password: sdust2020 password: '*&jkjusWETO(^ses%i'
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
lettuce: lettuce:
@ -134,3 +135,4 @@ xss:
excludes: /system/notice/* excludes: /system/notice/*
# 匹配链接 # 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/* urlPatterns: /system/*,/monitor/*,/tool/*

View File

@ -41,12 +41,12 @@ public class SysRegisterService
{ {
String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword(); String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword();
boolean captchaOnOff = configService.selectCaptchaOnOff(); // boolean captchaOnOff = configService.selectCaptchaOnOff();
// 验证码开关 // // 验证码开关
if (captchaOnOff) // if (captchaOnOff)
{ // {
validateCaptcha(username, registerBody.getCode(), registerBody.getUuid()); // validateCaptcha(username, registerBody.getCode(), registerBody.getUuid());
} // }
if (StringUtils.isEmpty(username)) if (StringUtils.isEmpty(username))
{ {
@ -56,16 +56,16 @@ public class SysRegisterService
{ {
msg = "用户密码不能为空"; msg = "用户密码不能为空";
} }
else if (username.length() < UserConstants.USERNAME_MIN_LENGTH // else if (username.length() < UserConstants.USERNAME_MIN_LENGTH
|| username.length() > UserConstants.USERNAME_MAX_LENGTH) // || username.length() > UserConstants.USERNAME_MAX_LENGTH)
{ // {
msg = "账户长度必须在2到20个字符之间"; // msg = "账户长度必须在2到20个字符之间";
} // }
else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH // else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
|| password.length() > UserConstants.PASSWORD_MAX_LENGTH) // || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
{ // {
msg = "密码长度必须在5到20个字符之间"; // msg = "密码长度必须在5到20个字符之间";
} // }
else if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username))) else if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username)))
{ {
msg = "保存用户'" + username + "'失败,注册账号已存在"; msg = "保存用户'" + username + "'失败,注册账号已存在";
@ -89,7 +89,6 @@ public class SysRegisterService
} }
return msg; return msg;
} }
/** /**
* 校验验证码 * 校验验证码
* *