diff --git a/main/manager-api/pom.xml b/main/manager-api/pom.xml index c4234647..883295bf 100644 --- a/main/manager-api/pom.xml +++ b/main/manager-api/pom.xml @@ -28,7 +28,7 @@ 1.6.2 33.0.0-jre 4.20.0 - 4.1.0 + 4.1.0 3.4.0 @@ -208,7 +208,7 @@ com.aliyun dysmsapi20170525 - ${the-latest-version} + ${aliyun-sms-version} diff --git a/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java b/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java index 171d1a21..9c0c5be7 100644 --- a/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java +++ b/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java @@ -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"), /** diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java b/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java index 8ffd2b95..3e23bd35 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java @@ -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> pubConfig() { Map 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>().ok(config); diff --git a/main/manager-api/src/main/resources/db/changelog/202505141129.sql b/main/manager-api/src/main/resources/db/changelog/202505141129.sql deleted file mode 100644 index e18bb523..00000000 --- a/main/manager-api/src/main/resources/db/changelog/202505141129.sql +++ /dev/null @@ -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); \ No newline at end of file diff --git a/main/manager-api/src/main/resources/db/changelog/202505141130.sql b/main/manager-api/src/main/resources/db/changelog/202505141130.sql new file mode 100644 index 00000000..5afefe72 --- /dev/null +++ b/main/manager-api/src/main/resources/db/changelog/202505141130.sql @@ -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); \ No newline at end of file diff --git a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml index 299efc9c..8bc4797f 100755 --- a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml @@ -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 \ No newline at end of file + path: classpath:db/changelog/202505141130.sql \ No newline at end of file