Compare commits
31 Commits
master
...
11b8a3db44
| Author | SHA1 | Date | |
|---|---|---|---|
|
11b8a3db44 | ||
|
|
43ee95a198 | ||
|
7c5e92246f | ||
|
|
fafe483b53 | ||
|
|
6148ca9ae8 | ||
|
|
3006b3c751 | ||
|
|
e9e8ea36b7 | ||
|
|
c9ee01dd1f | ||
|
|
2de946adb8 | ||
|
|
a4976eff13 | ||
|
|
bd12230d7e | ||
|
|
42e4acf3dd | ||
|
|
498a502c02 | ||
|
|
5c0a93f679 | ||
|
|
264a5d910f | ||
|
|
15bc756bd4 | ||
|
|
c424d5cd89 | ||
|
|
9b784c99ed | ||
|
|
5041f3f92f | ||
|
|
f4caf10bd3 | ||
|
|
bb6fb94038 | ||
|
|
7cfae514ea | ||
|
|
d262ec6b72 | ||
|
|
a51c6872d8 | ||
|
|
afa068f477 | ||
|
|
c6fa415356 | ||
|
|
6006a9f18c | ||
|
|
1722abfae7 | ||
|
|
57db36e015 | ||
|
|
43e3d8cfea | ||
|
|
598860d544 |
@@ -20,16 +20,7 @@ public class RuoYiApplication
|
||||
SpringApplication.run(RuoYiApplication.class, args);
|
||||
System.out.println();
|
||||
System.out.println(" --->>>启动成功！<<<---");
|
||||
// System.out.println("(♥◠‿◠)ﾉﾞ ლ(´ڡ`ლ)ﾞ \n" +
|
||||
// " .-------. ____ __ \n" +
|
||||
// " | _ _ \\ \\ \\ / / \n" +
|
||||
// " | ( ' ) | \\ _. / ' \n" +
|
||||
// " |(_ o _) / _( )_ .' \n" +
|
||||
// " | (_,_).' __ ___(_ o _)' \n" +
|
||||
// " | |\\ \\ | || |(_,_)' \n" +
|
||||
// " | | \\ `' /| `-' / \n" +
|
||||
// " | | \\ / \\ / \n" +
|
||||
// " ''-' `'-' `-..-' ");
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -28,10 +28,10 @@ public class SysRegisterController extends BaseController
|
||||
@PostMapping("/register")
|
||||
public AjaxResult register(@RequestBody RegisterBody user)
|
||||
{
|
||||
// if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
|
||||
// {
|
||||
// return error("当前系统没有开启注册功能！");
|
||||
// }
|
||||
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser"))))
|
||||
{
|
||||
return error("当前系统没有开启注册功能！");
|
||||
}
|
||||
String msg = registerService.register(user);
|
||||
return StringUtils.isEmpty(msg) ? success() : error(msg);
|
||||
}
|
||||
|
||||
@@ -2,17 +2,16 @@
|
||||
spring:
|
||||
datasource:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
# driverClassName: com.mysql.cj.jdbc.Driver
|
||||
# driverClassName: com.mysql.cj.jdbc.Driver
|
||||
driver-class-name: org.postgresql.Driver
|
||||
druid:
|
||||
master:
|
||||
#url: jdbc:postgresql://47.243.79.66:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
|
||||
#url: jdbc:postgresql://192.168.2.9:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
|
||||
# username: postgres
|
||||
# password: postgres
|
||||
url: jdbc:postgresql://118.195.242.28:5432/yada?AllowPublicKeyRetrieval=True&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
|
||||
username: gty
|
||||
password: 308525
|
||||
url: jdbc:postgresql://192.168.2.9:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
|
||||
username: sjs
|
||||
password: song5325
|
||||
# url: jdbc:mysql://192.168.2.9:3306/nuoyi?AllowPublicKeyRetrieval=True&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
|
||||
# username: saas
|
||||
# password: XKrs123.
|
||||
# 从库数据源
|
||||
slave:
|
||||
# 从数据源开关/默认关闭
|
||||
@@ -35,7 +34,7 @@ spring:
|
||||
# 配置一个连接在池中最大生存的时间，单位是毫秒
|
||||
maxEvictableIdleTimeMillis: 900000
|
||||
# 配置检测连接是否有效select * from pg_stat_activity
|
||||
# validationQuery: SELECT 1 FROM DUAL
|
||||
# validationQuery: SELECT 1 FROM DUAL
|
||||
validationQuery: SELECT version()
|
||||
testWhileIdle: true
|
||||
testOnBorrow: false
|
||||
|
||||
@@ -9,7 +9,7 @@ ruoyi:
|
||||
# 实例演示开关
|
||||
demoEnabled: true
|
||||
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
|
||||
profile: /home/gty/ruoyi/uploadPath
|
||||
profile: D:/ruoyi/uploadPath
|
||||
# 获取ip地址开关
|
||||
addressEnabled: false
|
||||
# 验证码类型 math 数组计算 char 字符验证
|
||||
@@ -19,7 +19,6 @@ ruoyi:
|
||||
server:
|
||||
# 服务器的HTTP端口，默认为8080
|
||||
port: 8080
|
||||
#port: 6061
|
||||
servlet:
|
||||
# 应用的访问路径
|
||||
context-path: /
|
||||
@@ -66,7 +65,7 @@ spring:
|
||||
# 数据库索引
|
||||
database: 0
|
||||
# 密码
|
||||
password: '*&jkjusWETO(^ses%i'
|
||||
password: sdust2020
|
||||
# 连接超时时间
|
||||
timeout: 10s
|
||||
lettuce:
|
||||
@@ -135,4 +134,3 @@ xss:
|
||||
excludes: /system/notice/*
|
||||
# 匹配链接
|
||||
urlPatterns: /system/*,/monitor/*,/tool/*
|
||||
|
||||
|
||||
@@ -41,12 +41,12 @@ public class SysRegisterService
|
||||
{
|
||||
String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword();
|
||||
|
||||
// boolean captchaOnOff = configService.selectCaptchaOnOff();
|
||||
// // 验证码开关
|
||||
// if (captchaOnOff)
|
||||
// {
|
||||
// validateCaptcha(username, registerBody.getCode(), registerBody.getUuid());
|
||||
// }
|
||||
boolean captchaOnOff = configService.selectCaptchaOnOff();
|
||||
// 验证码开关
|
||||
if (captchaOnOff)
|
||||
{
|
||||
validateCaptcha(username, registerBody.getCode(), registerBody.getUuid());
|
||||
}
|
||||
|
||||
if (StringUtils.isEmpty(username))
|
||||
{
|
||||
@@ -56,16 +56,16 @@ public class SysRegisterService
|
||||
{
|
||||
msg = "用户密码不能为空";
|
||||
}
|
||||
// else if (username.length() < UserConstants.USERNAME_MIN_LENGTH
|
||||
// || username.length() > UserConstants.USERNAME_MAX_LENGTH)
|
||||
// {
|
||||
// msg = "账户长度必须在2到20个字符之间";
|
||||
// }
|
||||
// else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
|
||||
// || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
|
||||
// {
|
||||
// msg = "密码长度必须在5到20个字符之间";
|
||||
// }
|
||||
else if (username.length() < UserConstants.USERNAME_MIN_LENGTH
|
||||
|| username.length() > UserConstants.USERNAME_MAX_LENGTH)
|
||||
{
|
||||
msg = "账户长度必须在2到20个字符之间";
|
||||
}
|
||||
else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
|
||||
|| password.length() > UserConstants.PASSWORD_MAX_LENGTH)
|
||||
{
|
||||
msg = "密码长度必须在5到20个字符之间";
|
||||
}
|
||||
else if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username)))
|
||||
{
|
||||
msg = "保存用户'" + username + "'失败，注册账号已存在";
|
||||
@@ -89,6 +89,7 @@ public class SysRegisterService
|
||||
}
|
||||
return msg;
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验验证码
|
||||
*
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
<<<<<<< HEAD
|
||||
<template>
|
||||
<i-frame :src="url" />
|
||||
</template>
|
||||
@@ -14,3 +15,21 @@ export default {
|
||||
},
|
||||
};
|
||||
</script>
|
||||
=======
|
||||
<template>
|
||||
<i-frame :src="url" />
|
||||
</template>
|
||||
<script>
|
||||
import iFrame from "@/components/iFrame/index";
|
||||
export default {
|
||||
name: "Swagger",
|
||||
components: { iFrame },
|
||||
data() {
|
||||
return {
|
||||
// url: process.env.VUE_APP_BASE_API + "/swagger-ui/index.html"
|
||||
url: process.env.VUE_APP_BASE_API + "/doc.html"
|
||||
};
|
||||
},
|
||||
};
|
||||
</script>
|
||||
>>>>>>> 43ee95a198fd259c420f6370f4035895bfd4af3c
|
||||
|
||||
Reference in New Issue
Block a user