From 84ac1b668620679c93ec47bafc6b14156879eea5 Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Tue, 20 May 2025 10:59:22 +0800 Subject: [PATCH] =?UTF-8?q?update:=E5=8F=AF=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=99=BA=E6=8E=A7=E5=8F=B0=E5=BA=95=E9=83=A8=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/ali-sms-integration.md | 2 +- .../xiaozhi/common/constant/Constant.java | 48 +++++----- .../security/controller/LoginController.java | 17 ++-- .../service/impl/CaptchaServiceImpl.java | 2 +- .../resources/db/changelog/202505182232.sql | 3 - .../{202505141132.sql => 202505182234.sql} | 12 ++- .../db/changelog/db.changelog-master.yaml | 11 +-- .../src/components/VersionFooter.vue | 87 ++++++++++++------- 8 files changed, 108 insertions(+), 74 deletions(-) delete mode 100644 main/manager-api/src/main/resources/db/changelog/202505182232.sql rename main/manager-api/src/main/resources/db/changelog/{202505141132.sql => 202505182234.sql} (84%) diff --git a/docs/ali-sms-integration.md b/docs/ali-sms-integration.md index 1e3f7f91..1be27787 100644 --- a/docs/ali-sms-integration.md +++ b/docs/ali-sms-integration.md @@ -40,5 +40,5 @@ 2、开启允许非管理员用户可注册，将参数`server.allow_user_register`设置成`true` -3、开启手机注册功能，将参数`system.enable_mobile_register`设置成`true` +3、开启手机注册功能，将参数`server.enable_mobile_register`设置成`true` ![步骤](images/alisms/sms-32.png) \ No newline at end of file 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 c6ec6761..b3c036ee 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 @@ -118,29 +118,17 @@ public interface Constant { enum SysBaseParam { /** - * 系统全称 + * ICP备案号 */ - SYS_NAME("SYS_NAME"), + BEIAN_ICP_NUM("server.beian_icp_num"), /** - * 系统简称 + * GA备案号 */ - SYS_SHORT_NAME("SYS_SHORT_NAME"), + BEIAN_GA_NUM("server.beian_ga_num"), /** - * 系统描述 + * 系统名称 */ - SYS_DES("SYS_DES"), - /** - * 登录失败几次锁定 - */ - LOGIN_LOCK_COUNT("LOGIN_LOCK_COUNT"), - /** - * 账号失败锁定分钟数 - */ - LOGIN_LOCK_TIME("LOGIN_LOCK_TIME"), - /** - * TOKEN强验证 - */ - SYS_TOKEN_SECURITY("SYS_TOKEN_SECURITY"); + SERVER_NAME("server.name"); private String value; @@ -176,11 +164,11 @@ public interface Constant { /** * 单号码最大短信发送条数 */ - SYSTEM_SMS_MAX_SEND_COUNT("system.sms.max_send_count"), + SERVER_SMS_MAX_SEND_COUNT("server.sms_max_send_count"), /** * 是否开启手机注册 */ - SYSTEM_ENABLE_MOBILE_REGISTER("system.enable_mobile_register"); + SERVER_ENABLE_MOBILE_REGISTER("server.enable_mobile_register"); private String value; @@ -245,4 +233,24 @@ public interface Constant { * 无效固件URL */ String INVALID_FIRMWARE_URL = "http://xiaozhi.server.com:8002/xiaozhi/otaMag/download/NOT_ACTIVATED_FIRMWARE_THIS_IS_A_INVALID_URL"; + + /** + * 字典类型 + */ + enum DictType { + /** + * 手机区号 + */ + MOBILE_AREA("MOBILE_AREA"); + + private String value; + + DictType(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + } } \ No newline at end of file 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 e792fc0f..4ee21ea2 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 @@ -1,6 +1,7 @@ package xiaozhi.modules.security.controller; import java.io.IOException; +import java.util.Calendar; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -70,7 +71,7 @@ public class LoginController { throw new RenException("图形验证码错误"); } Boolean isMobileRegister = sysParamsService - .getValueObject(Constant.SysMSMParam.SYSTEM_ENABLE_MOBILE_REGISTER.getValue(), Boolean.class); + .getValueObject(Constant.SysMSMParam.SERVER_ENABLE_MOBILE_REGISTER.getValue(), Boolean.class); if (!isMobileRegister) { throw new RenException("没有开启手机注册，没法使用短信验证码功能"); } @@ -108,7 +109,7 @@ public class LoginController { } // 是否开启手机注册 Boolean isMobileRegister = sysParamsService - .getValueObject(Constant.SysMSMParam.SYSTEM_ENABLE_MOBILE_REGISTER.getValue(), Boolean.class); + .getValueObject(Constant.SysMSMParam.SERVER_ENABLE_MOBILE_REGISTER.getValue(), Boolean.class); boolean validate; if (isMobileRegister) { // 验证用户是否是手机号码 @@ -165,7 +166,7 @@ public class LoginController { public Result retrievePassword(@RequestBody RetrievePasswordDTO dto) { // 是否开启手机注册 Boolean isMobileRegister = sysParamsService - .getValueObject(Constant.SysMSMParam.SYSTEM_ENABLE_MOBILE_REGISTER.getValue(), Boolean.class); + .getValueObject(Constant.SysMSMParam.SERVER_ENABLE_MOBILE_REGISTER.getValue(), Boolean.class); if (!isMobileRegister) { throw new RenException("没有开启手机注册，没法使用找回密码功能"); } @@ -198,13 +199,15 @@ public class LoginController { public Result> pubConfig() { Map config = new HashMap<>(); config.put("enableMobileRegister", sysParamsService - .getValueObject(Constant.SysMSMParam.SYSTEM_ENABLE_MOBILE_REGISTER.getValue(), Boolean.class)); + .getValueObject(Constant.SysMSMParam.SERVER_ENABLE_MOBILE_REGISTER.getValue(), Boolean.class)); config.put("version", Constant.VERSION); + config.put("year", "©" + Calendar.getInstance().get(Calendar.YEAR)); config.put("allowUserRegister", sysUserService.getAllowUserRegister()); - List list = sysDictDataService.getDictDataByType("MOBILE_AREA"); + List list = sysDictDataService.getDictDataByType(Constant.DictType.MOBILE_AREA.getValue()); config.put("mobileAreaList", list); - config.put("beianIcpNum", sysParamsService.getValue("beian_icp_num", true)); - config.put("beianGaNum", sysParamsService.getValue("beian_ga_num", true)); + config.put("beianIcpNum", sysParamsService.getValue(Constant.SysBaseParam.BEIAN_ICP_NUM.getValue(), true)); + config.put("beianGaNum", sysParamsService.getValue(Constant.SysBaseParam.BEIAN_GA_NUM.getValue(), true)); + config.put("name", sysParamsService.getValue(Constant.SysBaseParam.SERVER_NAME.getValue(), true)); return new Result>().ok(config); } diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/service/impl/CaptchaServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/security/service/impl/CaptchaServiceImpl.java index 09c8a185..d74a25cc 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/security/service/impl/CaptchaServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/security/service/impl/CaptchaServiceImpl.java @@ -98,7 +98,7 @@ public class CaptchaServiceImpl implements CaptchaService { // 获取最大发送次数限制 Integer maxSendCount = sysParamsService.getValueObject( - Constant.SysMSMParam.SYSTEM_SMS_MAX_SEND_COUNT.getValue(), + Constant.SysMSMParam.SERVER_SMS_MAX_SEND_COUNT.getValue(), Integer.class); if (maxSendCount == null) { maxSendCount = 5; // 默认值 diff --git a/main/manager-api/src/main/resources/db/changelog/202505182232.sql b/main/manager-api/src/main/resources/db/changelog/202505182232.sql deleted file mode 100644 index 7b2da074..00000000 --- a/main/manager-api/src/main/resources/db/changelog/202505182232.sql +++ /dev/null @@ -1,3 +0,0 @@ -delete from sys_params where id in (700,701); -INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (700, 'beian_icp_num', 'null', 'string', 1, 'ipc备案号，填写null则不设置'); -INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (701, 'beian_ga_num', 'null', 'string', 1, '公安备案号，填写null则不设置'); diff --git a/main/manager-api/src/main/resources/db/changelog/202505141132.sql b/main/manager-api/src/main/resources/db/changelog/202505182234.sql similarity index 84% rename from main/manager-api/src/main/resources/db/changelog/202505141132.sql rename to main/manager-api/src/main/resources/db/changelog/202505182234.sql index 4e60a350..3873e5d4 100644 --- a/main/manager-api/src/main/resources/db/changelog/202505141132.sql +++ b/main/manager-api/src/main/resources/db/changelog/202505182234.sql @@ -1,15 +1,21 @@ -- 添加手机短信注册功能的需要的参数 -delete from sys_params where id in (601, 602, 610, 611, 612, 613); +delete from sys_params where id in (108, 109, 110, 111, 112, 113, 114, 115); +delete from sys_params where id in (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', '10', 'number', 1, '单号码单日最大短信发送条数', NULL, NULL, NULL, NULL), +(108, 'server.name', 'xiaozhi-esp32-server', 'string', 1, '系统名称', NULL, NULL, NULL, NULL), +(109, 'server.beian_icp_num', 'null', 'string', 1, 'icp备案号，填写null则不设置', NULL, NULL, NULL, NULL), +(110, 'server.beian_ga_num', 'null', 'string', 1, '公安备案号，填写null则不设置', NULL, NULL, NULL, NULL), +(111, 'server.enable_mobile_register', 'false', 'boolean', 1, '是否开启手机注册', NULL, NULL, NULL, NULL), +(112, 'server.sms_max_send_count', '10', '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); +update sys_params set remark = '是否允许管理员以外的人注册' where param_code = 'server.allow_user_register'; + -- 增加手机区域字典 -- 插入固件类型字典类型 delete from `sys_dict_type` where `id` = 102; 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 f0a337a5..b52dd24c 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 @@ -114,13 +114,6 @@ databaseChangeLog: - sqlFile: encoding: utf8 path: classpath:db/changelog/202505091409.sql - - changeSet: - id: 202505141132 - author: zjy - changes: - - sqlFile: - encoding: utf8 - path: classpath:db/changelog/202505141132.sql - changeSet: id: 202505091555 author: whosmyqueen @@ -150,9 +143,9 @@ databaseChangeLog: encoding: utf8 path: classpath:db/changelog/202505142037.sql - changeSet: - id: 202505182232 + id: 202505182234 author: amen changes: - sqlFile: encoding: utf8 - path: classpath:db/changelog/202505182232.sql \ No newline at end of file + path: classpath:db/changelog/202505182234.sql \ No newline at end of file diff --git a/main/manager-web/src/components/VersionFooter.vue b/main/manager-web/src/components/VersionFooter.vue index ece85512..ea34b1bb 100644 --- a/main/manager-web/src/components/VersionFooter.vue +++ b/main/manager-web/src/components/VersionFooter.vue @@ -1,47 +1,74 @@ \ No newline at end of file