update:优化

2026-07-22 07:03:53 +08:00 · 2025-05-18 11:09:58 +08:00
parent 7d7324ddbc
commit 91d2ab7d1d
6 changed files with 27 additions and 25 deletions
@@ -28,7 +28,7 @@
        <captcha.version>1.6.2</captcha.version>
        <guava.version>33.0.0-jre</guava.version>
        <liquibase-core.version>4.20.0</liquibase-core.version>
-        <the-latest-version>4.1.0</the-latest-version>
+        <aliyun-sms-version>4.1.0</aliyun-sms-version>
        <okio-version>3.4.0</okio-version>
    </properties>

@@ -208,7 +208,7 @@
        <dependency>
            <groupId>com.aliyun</groupId>
            <artifactId>dysmsapi20170525</artifactId>
-            <version>${the-latest-version}</version>
+            <version>${aliyun-sms-version}</version>
        </dependency>
        <!-- 阿里云短信sdk使用的okio:1.15.0版本有安全漏洞：GHSA-w33c-445m-f8w7 现在升级成3.4.0安全版本-->
        <dependency>
@@ -159,15 +159,15 @@ public interface Constant {
         */
        ALIYUN_SMS_ACCESS_KEY_SECRET("aliyun.sms.access_key_secret"),
        /**
-         *
+         * 阿里云短信签名
         */
        ALIYUN_SMS_SIGN_NAME("aliyun.sms.sign_name"),
        /**
-         * 已删除
+         * 阿里云短信模板
         */
        ALIYUN_SMS_SMS_CODE_TEMPLATE_CODE("aliyun.sms.sms_code_template_code"),
        /**
-         * 已删除
+         * 单号码最大短信发送条数
         */
        SYSTEM_SMS_MAX_SEND_COUNT("system.sms.max_send_count"),
        /**
@@ -93,8 +93,8 @@ public class LoginController {
            throw new RenException("当前不允许普通用户注册");
        }
        // 是否开启手机注册
-        Boolean isMobileRegister = sysParamsService.getValueObject(Constant.SysMSMParam
-                .SYSTEM_ENABLE_MOBILE_REGISTER.getValue(), Boolean.class);
+        Boolean isMobileRegister = sysParamsService
+                .getValueObject(Constant.SysMSMParam.SYSTEM_ENABLE_MOBILE_REGISTER.getValue(), Boolean.class);
        boolean validate;
        if (isMobileRegister) {
            // 验证用户是否是手机号码
@@ -103,7 +103,7 @@ public class LoginController {
                throw new RenException("用户名不是手机号码，请重新输入");
            }
            // 验证短信验证码是否正常
-            validate = captchaService.validateSMSValidateCode(login.getUsername(),login.getCaptcha());
+            validate = captchaService.validateSMSValidateCode(login.getUsername(), login.getCaptcha());
        } else {
            // 验证是否正确输入验证码
            validate = captchaService.validate(login.getCaptchaId(), login.getCaptcha());
@@ -147,8 +147,8 @@ public class LoginController {
    @Operation(summary = "找回密码")
    public Result<?> retrievePassword(@RequestBody RetrievePasswordDTO dto) {
        // 是否开启手机注册
-        Boolean isMobileRegister = sysParamsService.getValueObject(Constant.SysMSMParam
-                .SYSTEM_ENABLE_MOBILE_REGISTER.getValue(), Boolean.class);
+        Boolean isMobileRegister = sysParamsService
+                .getValueObject(Constant.SysMSMParam.SYSTEM_ENABLE_MOBILE_REGISTER.getValue(), Boolean.class);
        if (!isMobileRegister) {
            throw new RenException("没有开启手机注册，没法使用找回密码功能");
        }
@@ -158,7 +158,7 @@ public class LoginController {
        boolean validPhone = ValidatorUtils.isValidPhone(dto.getPhone());
        if (!validPhone) {
            throw new RenException("用户名不是手机号码，无法提供找回密码服务");
-        };
+        }

        // 按照用户名获取用户
        SysUserDTO userDTO = sysUserService.getByUsername(dto.getPhone());
@@ -166,7 +166,7 @@ public class LoginController {
            throw new RenException("用户名或验证码错误");
        }
        // 验证短信验证码是否正常
-        boolean validate = captchaService.validateSMSValidateCode(dto.getPhone(),dto.getCode());
+        boolean validate = captchaService.validateSMSValidateCode(dto.getPhone(), dto.getCode());
        // 判断是否通过验证
        if (!validate) {
            throw new RenException("用户名或验证码错误");
@@ -181,6 +181,8 @@ public class LoginController {
    @Operation(summary = "公共配置")
    public Result<Map<String, Object>> pubConfig() {
        Map<String, Object> config = new HashMap<>();
+        config.put("enableMobileRegister", sysParamsService
+                .getValueObject(Constant.SysMSMParam.SYSTEM_ENABLE_MOBILE_REGISTER.getValue(), Boolean.class));
        config.put("version", Constant.VERSION);
        config.put("allowUserRegister", sysUserService.getAllowUserRegister());
        return new Result<Map<String, Object>>().ok(config);
@@ -1,11 +0,0 @@
-- 添加手机短信注册功能的需要的参数
-INSERT INTO
-    xiaozhi_esp32_server.sys_params
-(id, param_code, param_value, value_type, param_type, remark, creator, create_date, updater, update_date)
-    VALUES
-(501, 'system.enable_mobile_register', 'false', 'boolean', 1, '是否开启手机注册', NULL, NULL, NULL, NULL),
-(502, 'system.sms.max_send_count', '5', 'number', 1, '单号码最大短信发送条数', NULL, NULL, NULL, NULL),
-(510, 'aliyun.sms.access_key_id', '', 'string', 1, '阿里云平台access_key', NULL, NULL, NULL, NULL),
-(511, 'aliyun.sms.access_key_secret', '', 'string', 1, '阿里云平台access_key_secret', NULL, NULL, NULL, NULL),
-(512, 'aliyun.sms.sign_name', '', 'string', 1, '阿里云短信签名', NULL, NULL, NULL, NULL),
-(513, 'aliyun.sms.sms_code_template_code', '', 'string', 1, '阿里云短信模板', NULL, NULL, NULL, NULL);
@@ -0,0 +1,11 @@
+-- 添加手机短信注册功能的需要的参数
+delete from sys_params where id in (601, 602, 610, 611, 612, 613);
+INSERT INTO sys_params
+(id, param_code, param_value, value_type, param_type, remark, creator, create_date, updater, update_date)
+    VALUES
+(601, 'system.enable_mobile_register', 'false', 'boolean', 1, '是否开启手机注册', NULL, NULL, NULL, NULL),
+(602, 'system.sms.max_send_count', '5', 'number', 1, '单号码最大短信发送条数', NULL, NULL, NULL, NULL),
+(610, 'aliyun.sms.access_key_id', '', 'string', 1, '阿里云平台access_key', NULL, NULL, NULL, NULL),
+(611, 'aliyun.sms.access_key_secret', '', 'string', 1, '阿里云平台access_key_secret', NULL, NULL, NULL, NULL),
+(612, 'aliyun.sms.sign_name', '', 'string', 1, '阿里云短信签名', NULL, NULL, NULL, NULL),
+(613, 'aliyun.sms.sms_code_template_code', '', 'string', 1, '阿里云短信模板', NULL, NULL, NULL, NULL);
@@ -115,9 +115,9 @@ databaseChangeLog:
            encoding: utf8
            path: classpath:db/changelog/202505091409.sql
  - changeSet:
-      id: 202505141129
+      id: 202505141130
      author: zjy
      changes:
        - sqlFile:
            encoding: utf8
-            path: classpath:db/changelog/202505141129.sql
+            path: classpath:db/changelog/202505141130.sql