From 92e15c2f16fb5e7fc7426241557da55a7fdcf136 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 30 三月 2023 22:53:00 +0800
Subject: [PATCH] reset !pr324 有逻辑性问题 暂时回滚
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java | 17 +----
ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java | 14 ++--
script/sql/postgres/postgres_ry_vue_5.X.sql | 6 --
ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsConfig.java | 3 +
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java | 5 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java | 22 +++----
ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java | 9 +-
script/sql/ry_vue_5.X.sql | 17 ++---
script/sql/oracle/oracle_ry_vue_5.X.sql | 6 --
ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/properties/SmsProperties.java | 2
script/sql/sqlserver/sqlserver_ry_vue_5.X.sql | 12 ----
ruoyi-admin/src/main/resources/application.yml | 8 ++
12 files changed, 47 insertions(+), 74 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java
index d5b906c..12cf1fe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java
@@ -2,7 +2,6 @@
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.model.EmailLoginBody;
import com.ruoyi.common.core.domain.model.LoginBody;
@@ -58,9 +57,9 @@
LoginVo loginVo = new LoginVo();
// 鐢熸垚浠ょ墝
String token = loginService.login(
- body.getTenantId(),
- body.getUsername(), body.getPassword(),
- body.getCode(), body.getUuid());
+ body.getTenantId(),
+ body.getUsername(), body.getPassword(),
+ body.getCode(), body.getUuid());
loginVo.setToken(token);
return R.ok(loginVo);
}
@@ -149,16 +148,6 @@
vo.setVoList(CollUtil.isNotEmpty(list) ? list : voList);
vo.setTenantEnabled(TenantHelper.isEnable());
return R.ok(vo);
- }
-
- /**
- * 娉ㄥ唽寮�鍏�
- *
- * @return ture锛氭墦寮� false锛氬叧闂�
- */
- @GetMapping("/registerEnabled")
- public R<Boolean> registerEnabled() {
- return R.ok(Convert.toBool(configService.selectConfigByKey("sys.account.registerUser")));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java
index fec91b9..757caf5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java
@@ -3,9 +3,9 @@
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.captcha.AbstractCaptcha;
import cn.hutool.captcha.generator.CodeGenerator;
-import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
+import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.constant.GlobalConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.SpringUtils;
@@ -14,11 +14,11 @@
import com.ruoyi.common.mail.config.properties.MailProperties;
import com.ruoyi.common.mail.utils.MailUtils;
import com.ruoyi.common.redis.utils.RedisUtils;
+import com.ruoyi.common.sms.config.properties.SmsProperties;
import com.ruoyi.common.sms.core.SmsTemplate;
import com.ruoyi.common.sms.entity.SmsResult;
import com.ruoyi.common.web.config.properties.CaptchaProperties;
import com.ruoyi.common.web.enums.CaptchaType;
-import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.web.domain.vo.CaptchaVo;
import jakarta.validation.constraints.NotBlank;
import lombok.RequiredArgsConstructor;
@@ -47,9 +47,8 @@
public class CaptchaController {
private final CaptchaProperties captchaProperties;
+ private final SmsProperties smsProperties;
private final MailProperties mailProperties;
- private final ISysConfigService configService;
-
/**
* 鐭俊楠岃瘉鐮�
@@ -58,15 +57,14 @@
*/
@GetMapping("/sms/code")
public R<Void> smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
- if (!Convert.toBool(configService.selectConfigByKey("sys.account.smsEnabled"))) {
+ if (!smsProperties.getEnabled()) {
return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
}
String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber;
String code = RandomUtil.randomNumbers(4);
- Integer captchaExpired = Convert.toInt(configService.selectConfigByKey("sys.account.captchaExpired"));
- RedisUtils.setCacheObject(key, code, Duration.ofMinutes(captchaExpired));
+ RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
// 楠岃瘉鐮佹ā鏉縤d 鑷澶勭悊 (鏌ユ暟鎹簱鎴栧啓姝诲潎鍙�)
- String templateId = configService.selectConfigByKey("sys.account.templateId");
+ String templateId = "";
Map<String, String> map = new HashMap<>(1);
map.put("code", code);
SmsTemplate smsTemplate = SpringUtils.getBean(SmsTemplate.class);
@@ -90,10 +88,9 @@
}
String key = GlobalConstants.CAPTCHA_CODE_KEY + email;
String code = RandomUtil.randomNumbers(4);
- Integer captchaExpired = Convert.toInt(configService.selectConfigByKey("sys.account.captchaExpired"));
- RedisUtils.setCacheObject(key, code, Duration.ofMinutes(captchaExpired));
+ RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
try {
- MailUtils.sendText(email, "鐧诲綍楠岃瘉鐮�", "鎮ㄦ湰娆￠獙璇佺爜涓猴細%s锛屾湁鏁堟�т负%d鍒嗛挓锛岃灏藉揩濉啓銆�".formatted(code, captchaExpired));
+ MailUtils.sendText(email, "鐧诲綍楠岃瘉鐮�", "鎮ㄦ湰娆￠獙璇佺爜涓猴細" + code + "锛屾湁鏁堟�т负" + Constants.CAPTCHA_EXPIRATION + "鍒嗛挓锛岃灏藉揩濉啓銆�");
} catch (Exception e) {
log.error("楠岃瘉鐮佺煭淇″彂閫佸紓甯� => {}", e.getMessage());
return R.fail(e.getMessage());
@@ -129,8 +126,7 @@
Expression exp = parser.parseExpression(StringUtils.remove(code, "="));
code = exp.getValue(String.class);
}
- Integer captchaExpired = Convert.toInt(configService.selectConfigByKey("sys.account.captchaExpired"));
- RedisUtils.setCacheObject(verifyKey, code, Duration.ofMinutes(captchaExpired));
+ RedisUtils.setCacheObject(verifyKey, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
captchaVo.setUuid(uuid);
captchaVo.setImg(captcha.getImageBase64());
return R.ok(captchaVo);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java
index f51db1e..3b8a1c6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java
@@ -4,7 +4,6 @@
import cn.dev33.satoken.secure.BCrypt;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.constant.Constants;
@@ -31,11 +30,11 @@
import com.ruoyi.system.domain.vo.SysTenantVo;
import com.ruoyi.system.domain.vo.SysUserVo;
import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysPermissionService;
import com.ruoyi.system.service.ISysTenantService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.time.Duration;
@@ -57,7 +56,12 @@
private final CaptchaProperties captchaProperties;
private final ISysPermissionService permissionService;
private final ISysTenantService tenantService;
- private final ISysConfigService configService;
+
+ @Value("${user.password.maxRetryCount}")
+ private Integer maxRetryCount;
+
+ @Value("${user.password.lockTime}")
+ private Integer lockTime;
/**
* 鐧诲綍楠岃瘉
@@ -336,10 +340,6 @@
// 鑾峰彇鐢ㄦ埛鐧诲綍閿欒娆℃暟(鍙嚜瀹氫箟闄愬埗绛栫暐 渚嬪: key + username + ip)
Integer errorNumber = RedisUtils.getCacheObject(errorKey);
- //瀵嗙爜鏈�澶ч敊璇鏁�
- Integer maxRetryCount = Convert.toInt(configService.selectConfigByKey("sys.user.maxRetryCount"));
- //瀵嗙爜閿佸畾鏃堕棿
- Integer lockTime = Convert.toInt(configService.selectConfigByKey("sys.user.lockTime"));
// 閿佸畾鏃堕棿鍐呯櫥褰� 鍒欒涪鍑�
if (ObjectUtil.isNotNull(errorNumber) && errorNumber.equals(maxRetryCount)) {
recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 8d70429..758b264 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -52,6 +52,14 @@
org.springframework: warn
config: classpath:logback.xml
+# 鐢ㄦ埛閰嶇疆
+user:
+ password:
+ # 瀵嗙爜鏈�澶ч敊璇鏁�
+ maxRetryCount: 5
+ # 瀵嗙爜閿佸畾鏃堕棿锛堥粯璁�10鍒嗛挓锛�
+ lockTime: 10
+
# Spring閰嶇疆
spring:
application:
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
index 203be87..9553d17 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
@@ -63,6 +63,11 @@
String LOGIN_FAIL = "Error";
/**
+ * 楠岃瘉鐮佹湁鏁堟湡锛堝垎閽燂級
+ */
+ Integer CAPTCHA_EXPIRATION = 2;
+
+ /**
* 浠ょ墝
*/
String TOKEN = "token";
diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsConfig.java b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsConfig.java
index dc40901..ecc89af 100644
--- a/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsConfig.java
+++ b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsConfig.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.sms.core.TencentSmsTemplate;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -21,6 +22,7 @@
public class SmsConfig {
@Configuration
+ @ConditionalOnProperty(value = "sms.enabled", havingValue = "true")
@ConditionalOnClass(com.aliyun.dysmsapi20170525.Client.class)
static class AliyunSmsConfig {
@@ -32,6 +34,7 @@
}
@Configuration
+ @ConditionalOnProperty(value = "sms.enabled", havingValue = "true")
@ConditionalOnClass(com.tencentcloudapi.sms.v20190711.SmsClient.class)
static class TencentSmsConfig {
diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/properties/SmsProperties.java b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/properties/SmsProperties.java
index b17466b..57b974a 100644
--- a/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/properties/SmsProperties.java
+++ b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/properties/SmsProperties.java
@@ -13,6 +13,8 @@
@ConfigurationProperties(prefix = "sms")
public class SmsProperties {
+ private Boolean enabled;
+
/**
* 閰嶇疆鑺傜偣
* 闃块噷浜� dysmsapi.aliyuncs.com
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java
index 6584a78..bda9955 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java
@@ -1,9 +1,8 @@
package com.ruoyi.demo.controller;
-import cn.hutool.core.convert.Convert;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.service.ConfigService;
import com.ruoyi.common.core.utils.SpringUtils;
+import com.ruoyi.common.sms.config.properties.SmsProperties;
import com.ruoyi.common.sms.core.SmsTemplate;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -27,7 +26,7 @@
@RequestMapping("/demo/sms")
public class SmsController {
- private final ConfigService configService;
+ private final SmsProperties smsProperties;
// private final SmsTemplate smsTemplate; // 鍙互浣跨敤spring娉ㄥ叆
// private final AliyunSmsTemplate smsTemplate; // 涔熷彲浠ユ敞鍏ユ煇涓巶瀹剁殑妯℃澘宸ュ叿
@@ -39,7 +38,7 @@
*/
@GetMapping("/sendAliyun")
public R<Object> sendAliyun(String phones, String templateId) {
- if (!Convert.toBool(configService.getConfigValue("sys.account.smsEnabled"))) {
+ if (!smsProperties.getEnabled()) {
return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
}
if (!SpringUtils.containsBean("aliyunSmsTemplate")) {
@@ -60,7 +59,7 @@
*/
@GetMapping("/sendTencent")
public R<Object> sendTencent(String phones, String templateId) {
- if (!Convert.toBool(configService.getConfigValue("sys.account.smsEnabled"))) {
+ if (!smsProperties.getEnabled()) {
return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
}
if (!SpringUtils.containsBean("tencentSmsTemplate")) {
diff --git a/script/sql/oracle/oracle_ry_vue_5.X.sql b/script/sql/oracle/oracle_ry_vue_5.X.sql
index 2641479..0456f11 100644
--- a/script/sql/oracle/oracle_ry_vue_5.X.sql
+++ b/script/sql/oracle/oracle_ry_vue_5.X.sql
@@ -827,13 +827,7 @@
insert into sys_config values(1, '000000', '涓绘鏋堕〉-榛樿鐨偆鏍峰紡鍚嶇О', 'sys.index.skinName', 'skin-blue', 'Y', 103, 1, sysdate, null, null, '钃濊壊 skin-blue銆佺豢鑹� skin-green銆佺传鑹� skin-purple銆佺孩鑹� skin-red銆侀粍鑹� skin-yellow' );
insert into sys_config values(2, '000000', '鐢ㄦ埛绠＄悊-璐﹀彿鍒濆瀵嗙爜', 'sys.user.initPassword', '123456', 'Y', 103, 1, sysdate, null, null, '鍒濆鍖栧瘑鐮� 123456' );
insert into sys_config values(3, '000000', '涓绘鏋堕〉-渚ц竟鏍忎富棰�', 'sys.index.sideTheme', 'theme-dark', 'Y', 103, 1, sysdate, null, null, '娣辫壊涓婚theme-dark锛屾祬鑹蹭富棰榯heme-light' );
-insert into sys_config values(4, '000000', '鐢ㄦ埛閰嶇疆-楠岃瘉鐮佹湁鏁堟湡', 'sys.account.captchaExpired', '2', 'Y', 103, 1, sysdate, null, NULL, '楠岃瘉鐮佹湁鏁堟湡锛堝垎閽燂級');
insert into sys_config values(5, '000000', '璐﹀彿鑷姪-鏄惁寮�鍚敤鎴锋敞鍐屽姛鑳�', 'sys.account.registerUser', 'false', 'Y', 103, 1, sysdate, null, null, '鏄惁寮�鍚敞鍐岀敤鎴峰姛鑳斤紙true寮�鍚紝false鍏抽棴锛�');
-insert into sys_config values(6, '000000', '鐢ㄦ埛閰嶇疆-瀵嗙爜鏈�澶ч敊璇鏁�', 'sys.user.maxRetryCount', '5', 'Y', 103, 1, sysdate, null, null, '瀵嗙爜鏈�澶ч敊璇鏁�');
-insert into sys_config values(7, '000000', '鐢ㄦ埛閰嶇疆-瀵嗙爜閿佸畾鏃堕棿', 'sys.user.lockTime', '10', 'Y', 103, 1, sysdate, null, null, '瀵嗙爜閿佸畾鏃堕棿锛堝垎閽燂級');
-insert into sys_config values(8, '000000', '璐﹀彿鑷姪-鐭俊寮�鍏�', 'sys.account.smsEnabled', 'false', 'Y', 103, 1, sysdate, null, null, '鏄惁寮�鍚煭淇″姛鑳斤紙true寮�鍚紝false鍏抽棴锛�');
-insert into sys_config values(9, '000000', '璐﹀彿鑷姪-楠岃瘉鐮佹ā鏉縤d', 'sys.account.templateId', '', 'Y', 103, 1, sysdate, null, null, '楠岃瘉鐮佹ā鏉縤d');
-insert into sys_config values(10, '000000', '璐﹀彿鑷姪-閭欢寮�鍏�', 'sys.account.emailEnabled', 'false', 'Y', 103, 1, sysdate, null, NULL, '鏄惁寮�鍚偖浠跺姛鑳斤紙true寮�鍚紝false鍏抽棴锛�');
insert into sys_config values(11, '000000', 'OSS棰勮鍒楄〃璧勬簮寮�鍏�', 'sys.oss.previewListResource', 'true', 'Y', 103, 1, sysdate, null, null, 'true:寮�鍚�, false:鍏抽棴');
diff --git a/script/sql/postgres/postgres_ry_vue_5.X.sql b/script/sql/postgres/postgres_ry_vue_5.X.sql
index 930daf0..bdf28b4 100644
--- a/script/sql/postgres/postgres_ry_vue_5.X.sql
+++ b/script/sql/postgres/postgres_ry_vue_5.X.sql
@@ -848,13 +848,7 @@
insert into sys_config values(1, '000000', '涓绘鏋堕〉-榛樿鐨偆鏍峰紡鍚嶇О', 'sys.index.skinName', 'skin-blue', 'Y', 103, 1, now(), null, null, '钃濊壊 skin-blue銆佺豢鑹� skin-green銆佺传鑹� skin-purple銆佺孩鑹� skin-red銆侀粍鑹� skin-yellow' );
insert into sys_config values(2, '000000', '鐢ㄦ埛绠＄悊-璐﹀彿鍒濆瀵嗙爜', 'sys.user.initPassword', '123456', 'Y', 103, 1, now(), null, null, '鍒濆鍖栧瘑鐮� 123456' );
insert into sys_config values(3, '000000', '涓绘鏋堕〉-渚ц竟鏍忎富棰�', 'sys.index.sideTheme', 'theme-dark', 'Y', 103, 1, now(), null, null, '娣辫壊涓婚theme-dark锛屾祬鑹蹭富棰榯heme-light' );
-insert into sys_config values(4, '000000', '鐢ㄦ埛閰嶇疆-楠岃瘉鐮佹湁鏁堟湡', 'sys.account.captchaExpired', '2', 'Y', 103, 1, now(), null, NULL, '楠岃瘉鐮佹湁鏁堟湡锛堝垎閽燂級');
insert into sys_config values(5, '000000', '璐﹀彿鑷姪-鏄惁寮�鍚敤鎴锋敞鍐屽姛鑳�', 'sys.account.registerUser', 'false', 'Y', 103, 1, now(), null, null, '鏄惁寮�鍚敞鍐岀敤鎴峰姛鑳斤紙true寮�鍚紝false鍏抽棴锛�');
-insert into sys_config values(6, '000000', '鐢ㄦ埛閰嶇疆-瀵嗙爜鏈�澶ч敊璇鏁�', 'sys.user.maxRetryCount', '5', 'Y', 103, 1,now(), null, null, '瀵嗙爜鏈�澶ч敊璇鏁�');
-insert into sys_config values(7, '000000', '鐢ㄦ埛閰嶇疆-瀵嗙爜閿佸畾鏃堕棿', 'sys.user.lockTime', '10', 'Y', 103, 1, now(), null, null, '瀵嗙爜閿佸畾鏃堕棿锛堝垎閽燂級');
-insert into sys_config values(8, '000000', '璐﹀彿鑷姪-鐭俊寮�鍏�', 'sys.account.smsEnabled', 'false', 'Y', 103, 1, now(), null, null, '鏄惁寮�鍚煭淇″姛鑳斤紙true寮�鍚紝false鍏抽棴锛�');
-insert into sys_config values(9, '000000', '璐﹀彿鑷姪-楠岃瘉鐮佹ā鏉縤d', 'sys.account.templateId', '', 'Y', 103, 1, now(), null, null, '楠岃瘉鐮佹ā鏉縤d');
-insert into sys_config values(10, '000000', '璐﹀彿鑷姪-閭欢寮�鍏�', 'sys.account.emailEnabled', 'false', 'Y', 103, 1, now(), null, NULL, '鏄惁寮�鍚偖浠跺姛鑳斤紙true寮�鍚紝false鍏抽棴锛�');
insert into sys_config values(11, '000000', 'OSS棰勮鍒楄〃璧勬簮寮�鍏�', 'sys.oss.previewListResource', 'true', 'Y', 103, 1, now(), null, null, 'true:寮�鍚�, false:鍏抽棴');
diff --git a/script/sql/ry_vue_5.X.sql b/script/sql/ry_vue_5.X.sql
index ca4fe11..2b3ea0c 100644
--- a/script/sql/ry_vue_5.X.sql
+++ b/script/sql/ry_vue_5.X.sql
@@ -625,17 +625,12 @@
primary key (config_id)
) engine=innodb comment = '鍙傛暟閰嶇疆琛�';
-insert into sys_config values(1, '000000', '涓绘鏋堕〉-榛樿鐨偆鏍峰紡鍚嶇О', 'sys.index.skinName', 'skin-blue', 'Y', 103, 1, sysdate(), null, NULL, '钃濊壊 skin-blue銆佺豢鑹� skin-green銆佺传鑹� skin-purple銆佺孩鑹� skin-red銆侀粍鑹� skin-yellow');
-insert into sys_config values(2, '000000', '鐢ㄦ埛绠＄悊-璐﹀彿鍒濆瀵嗙爜', 'sys.user.initPassword', '123456', 'Y', 103, 1, sysdate(), null, NULL, '鍒濆鍖栧瘑鐮� 123456');
-insert into sys_config values(3, '000000', '涓绘鏋堕〉-渚ц竟鏍忎富棰�', 'sys.index.sideTheme', 'theme-dark', 'Y', 103, 1, sysdate(), null, NULL, '娣辫壊涓婚theme-dark锛屾祬鑹蹭富棰榯heme-light');
-insert into sys_config values(4, '000000', '鐢ㄦ埛閰嶇疆-楠岃瘉鐮佹湁鏁堟湡', 'sys.account.captchaExpired', '2', 'Y', 103, 1, sysdate(), null, NULL, '楠岃瘉鐮佹湁鏁堟湡锛堝垎閽燂級');
-insert into sys_config values(5, '000000', '璐﹀彿鑷姪-鏄惁寮�鍚敤鎴锋敞鍐屽姛鑳�', 'sys.account.registerUser', 'false', 'Y', 103, 1, sysdate(), null, NULL, '鏄惁寮�鍚敞鍐岀敤鎴峰姛鑳斤紙true寮�鍚紝false鍏抽棴锛�');
-insert into sys_config values(6, '000000', '鐢ㄦ埛閰嶇疆-瀵嗙爜鏈�澶ч敊璇鏁�', 'sys.user.maxRetryCount', '5', 'Y', 103, 1, sysdate(), null, NULL, '瀵嗙爜鏈�澶ч敊璇鏁�');
-insert into sys_config values(7, '000000', '鐢ㄦ埛閰嶇疆-瀵嗙爜閿佸畾鏃堕棿', 'sys.user.lockTime', '10', 'Y', 103, 1, sysdate(), null, NULL, '瀵嗙爜閿佸畾鏃堕棿锛堝垎閽燂級');
-insert into sys_config values(8, '000000', '璐﹀彿鑷姪-鐭俊寮�鍏�', 'sys.account.smsEnabled', 'false', 'Y', 103, 1, sysdate(), null, NULL, '鏄惁寮�鍚煭淇″姛鑳斤紙true寮�鍚紝false鍏抽棴锛�');
-insert into sys_config values(9, '000000', '璐﹀彿鑷姪-鐭俊楠岃瘉鐮佹ā鏉縤d', 'sys.account.templateId', '', 'Y', 103, 1, sysdate(), null, NULL, '楠岃瘉鐮佹ā鏉縤d');
-insert into sys_config values(10, '000000', '璐﹀彿鑷姪-閭欢寮�鍏�', 'sys.account.emailEnabled', 'false', 'Y', 103, 1, sysdate(), null, NULL, '鏄惁寮�鍚偖浠跺姛鑳斤紙true寮�鍚紝false鍏抽棴锛�');
-insert into sys_config values(11,'000000', 'OSS棰勮鍒楄〃璧勬簮寮�鍏�', 'sys.oss.previewListResource', 'true', 'Y', 103, 1, sysdate(), null, NULL, 'true:寮�鍚�, false:鍏抽棴');
+insert into sys_config values(1, '000000', '涓绘鏋堕〉-榛樿鐨偆鏍峰紡鍚嶇О', 'sys.index.skinName', 'skin-blue', 'Y', 103, 1, sysdate(), null, null, '钃濊壊 skin-blue銆佺豢鑹� skin-green銆佺传鑹� skin-purple銆佺孩鑹� skin-red銆侀粍鑹� skin-yellow' );
+insert into sys_config values(2, '000000', '鐢ㄦ埛绠＄悊-璐﹀彿鍒濆瀵嗙爜', 'sys.user.initPassword', '123456', 'Y', 103, 1, sysdate(), null, null, '鍒濆鍖栧瘑鐮� 123456' );
+insert into sys_config values(3, '000000', '涓绘鏋堕〉-渚ц竟鏍忎富棰�', 'sys.index.sideTheme', 'theme-dark', 'Y', 103, 1, sysdate(), null, null, '娣辫壊涓婚theme-dark锛屾祬鑹蹭富棰榯heme-light' );
+insert into sys_config values(5, '000000', '璐﹀彿鑷姪-鏄惁寮�鍚敤鎴锋敞鍐屽姛鑳�', 'sys.account.registerUser', 'false', 'Y', 103, 1, sysdate(), null, null, '鏄惁寮�鍚敞鍐岀敤鎴峰姛鑳斤紙true寮�鍚紝false鍏抽棴锛�');
+insert into sys_config values(11, '000000', 'OSS棰勮鍒楄〃璧勬簮寮�鍏�', 'sys.oss.previewListResource', 'true', 'Y', 103, 1, sysdate(), null, null, 'true:寮�鍚�, false:鍏抽棴');
+
-- ----------------------------
-- 14銆佺郴缁熻闂褰�
diff --git a/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql b/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql
index 38e2b2f..f72dfff 100644
--- a/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql
+++ b/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql
@@ -694,19 +694,7 @@
GO
INSERT sys_config VALUES (3, N'000000', N'涓绘鏋堕〉-渚ц竟鏍忎富棰�', N'sys.index.sideTheme', N'theme-dark', N'Y', 103, 1, getdate(), NULL, NULL, N'娣辫壊涓婚theme-dark锛屾祬鑹蹭富棰榯heme-light')
GO
-INSERT sys_config VALUES (4, N'000000', N'鐢ㄦ埛閰嶇疆-楠岃瘉鐮佹湁鏁堟湡', N'sys.account.captchaExpired', N'2', N'Y', 103, 1, sysdate(), null, NULL, N'楠岃瘉鐮佹湁鏁堟湡锛堝垎閽燂級');
-GO
INSERT sys_config VALUES (5, N'000000', N'璐﹀彿鑷姪-鏄惁寮�鍚敤鎴锋敞鍐屽姛鑳�', N'sys.account.registerUser', N'false', N'Y', 103, 1, getdate(), NULL, NULL, N'鏄惁寮�鍚敞鍐岀敤鎴峰姛鑳斤紙true寮�鍚紝false鍏抽棴锛�')
-GO
-INSERT sys_config VALUES (6, N'000000', N'鐢ㄦ埛閰嶇疆-瀵嗙爜鏈�澶ч敊璇鏁�', N'sys.user.maxRetryCount', N'5', N'Y', 103, 1, getdate(), NULL, NULL, N'瀵嗙爜鏈�澶ч敊璇鏁�')
-GO
-INSERT sys_config VALUES (7, N'000000', N'鐢ㄦ埛閰嶇疆-瀵嗙爜閿佸畾鏃堕棿', N'sys.user.lockTime', N'10', N'Y', 103, 1, getdate(), NULL, NULL, N'瀵嗙爜閿佸畾鏃堕棿锛堝垎閽燂級')
-GO
-INSERT sys_config VALUES (8, N'000000', N'璐﹀彿鑷姪-鐭俊寮�鍏�', N'sys.account.smsEnabled', N'false', N'Y', 103, 1, getdate(), NULL, NULL, N'鏄惁寮�鍚煭淇″姛鑳斤紙true寮�鍚紝false鍏抽棴锛�')
-GO
-INSERT sys_config VALUES (9, N'000000', N'璐﹀彿鑷姪-楠岃瘉鐮佹ā鏉縤d', N'sys.account.templateId', N'', N'Y', 103, 1, getdate(), NULL, NULL, N'楠岃瘉鐮佹ā鏉縤d')
-GO
-INSERT sys_config VALUES (10, N'000000', N'璐﹀彿鑷姪-閭欢寮�鍏�', N'sys.account.emailEnabled', N'false', N'Y', 103, 1, getdate(), NULL, NULL, N'鏄惁寮�鍚偖浠跺姛鑳斤紙true寮�鍚紝false鍏抽棴锛�')
GO
INSERT sys_config VALUES (11, N'000000', N'OSS棰勮鍒楄〃璧勬簮寮�鍏�', N'sys.oss.previewListResource', N'true', N'Y', 103, 1, getdate(), NULL, NULL, N'true:寮�鍚�, false:鍏抽棴');
GO
--
Gitblit v1.9.3