Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-27 01:23:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1323 from xinnan-tech/hot-fix

Browse Source 
fix:参数名称变更
This commit is contained in:
欣南科技
2025-05-20 11:31:28 +08:00
committed by GitHub
parent 282706dbc8 ac9abf8ede
commit fe47fd1910
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysParamsServiceImpl.java
+13 -8
View File
@@ -1,6 +1,10 @@
package xiaozhi.modules.sys.service.impl; package xiaozhi.modules.sys.service.impl;
import java.util.*; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -52,7 +56,7 @@ public class SysParamsServiceImpl extends BaseServiceImpl<SysParamsDao, SysParam
QueryWrapper<SysParamsEntity> wrapper = new QueryWrapper<>(); QueryWrapper<SysParamsEntity> wrapper = new QueryWrapper<>();
wrapper.eq("param_type", 1); wrapper.eq("param_type", 1);
wrapper.nested(StringUtils.isNotBlank(paramCode),i->i.like("param_code", paramCode) wrapper.nested(StringUtils.isNotBlank(paramCode), i -> i.like("param_code", paramCode)
.or() .or()
.like("remark", paramCode)); .like("remark", paramCode));
@@ -81,7 +85,7 @@ public class SysParamsServiceImpl extends BaseServiceImpl<SysParamsDao, SysParam
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void update(SysParamsDTO dto) { public void update(SysParamsDTO dto) {
validateParamValue(dto); validateParamValue(dto);
detectingSMSParameters(dto.getParamCode(),dto.getParamValue()); detectingSMSParameters(dto.getParamCode(), dto.getParamValue());
SysParamsEntity entity = ConvertUtils.sourceToTarget(dto, SysParamsEntity.class); SysParamsEntity entity = ConvertUtils.sourceToTarget(dto, SysParamsEntity.class);
updateById(entity); updateById(entity);
@@ -206,13 +210,14 @@ public class SysParamsServiceImpl extends BaseServiceImpl<SysParamsDao, SysParam
/** /**
* 检测短信参数是否符合要求 * 检测短信参数是否符合要求
* @param paramCode 参数编码 *
* @param paramCode 参数编码
* @param paramValue 参数值 * @param paramValue 参数值
* @return 是否通过 * @return 是否通过
*/ */
private boolean detectingSMSParameters(String paramCode, String paramValue){ private boolean detectingSMSParameters(String paramCode, String paramValue) {
// 判断是否是开启手机注册的参数编码，如果不是参数编码，着不需要检测其他短信参数，直接返回true // 判断是否是开启手机注册的参数编码，如果不是参数编码，着不需要检测其他短信参数，直接返回true
if (!Constant.SysMSMParam.SYSTEM_ENABLE_MOBILE_REGISTER.getValue().equals(paramCode)){ if (!Constant.SysMSMParam.SERVER_ENABLE_MOBILE_REGISTER.getValue().equals(paramCode)) {
return true; return true;
} }
// 判断是否为关闭，如果是关闭短信注册，着不需要检测其他短信参数，直接返回true // 判断是否为关闭，如果是关闭短信注册，着不需要检测其他短信参数，直接返回true
@@ -221,13 +226,13 @@ public class SysParamsServiceImpl extends BaseServiceImpl<SysParamsDao, SysParam
} }
// 检测短信关联参数是否为空 // 检测短信关联参数是否为空
ArrayList<String> list = new ArrayList<String>(); ArrayList<String> list = new ArrayList<String>();
list.add(Constant.SysMSMParam.SYSTEM_SMS_MAX_SEND_COUNT.getValue()); list.add(Constant.SysMSMParam.SERVER_SMS_MAX_SEND_COUNT.getValue());
list.add(Constant.SysMSMParam.ALIYUN_SMS_ACCESS_KEY_ID.getValue()); list.add(Constant.SysMSMParam.ALIYUN_SMS_ACCESS_KEY_ID.getValue());
list.add(Constant.SysMSMParam.ALIYUN_SMS_ACCESS_KEY_SECRET.getValue()); list.add(Constant.SysMSMParam.ALIYUN_SMS_ACCESS_KEY_SECRET.getValue());
list.add(Constant.SysMSMParam.ALIYUN_SMS_SIGN_NAME.getValue()); list.add(Constant.SysMSMParam.ALIYUN_SMS_SIGN_NAME.getValue());
list.add(Constant.SysMSMParam.ALIYUN_SMS_SMS_CODE_TEMPLATE_CODE.getValue()); list.add(Constant.SysMSMParam.ALIYUN_SMS_SMS_CODE_TEMPLATE_CODE.getValue());
StringBuilder str = new StringBuilder(); StringBuilder str = new StringBuilder();
list.forEach( item -> { list.forEach(item -> {
if (!StringUtils.isNoneBlank(item)) { if (!StringUtils.isNoneBlank(item)) {
str.append(",").append(item); str.append(",").append(item);
} }