From 5df75f951185c1f0ca58d32b8e66cb23e96addda Mon Sep 17 00:00:00 2001 From: linhw <5331581+linhw11@user.noreply.gitee.com> Date: Thu, 20 Jun 2024 10:30:02 +0800 Subject: [PATCH] ~ --- .../app/controller/AppSchoolController.java | 4 +- .../ruoyi/app/service/IAppSchoolService.java | 5 +- .../service/impl/AppSchoolServiceImpl.java | 17 +++-- .../impl/AppUserFriendServiceImpl.java | 2 +- .../app/utils/aliyun/sms/SendNoteUtil.java | 67 +++++++++++++++++-- 5 files changed, 81 insertions(+), 14 deletions(-) diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppSchoolController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppSchoolController.java index ebd0878..9a88cda 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppSchoolController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppSchoolController.java @@ -87,7 +87,7 @@ public class AppSchoolController extends BaseController @ApiOperation(value = "新增学校配置", notes = "新增学校配置", httpMethod = "POST") public AjaxResult add(@RequestBody AppSchool appSchool) { - return toAjax(appSchoolService.insertAppSchool(appSchool)); + return appSchoolService.insertAppSchool(appSchool); } /** @@ -99,7 +99,7 @@ public class AppSchoolController extends BaseController @ApiOperation(value = "修改学校配置", notes = "修改学校配置", httpMethod = "PUT") public AjaxResult edit(@RequestBody AppSchool appSchool) { - return toAjax(appSchoolService.updateAppSchool(appSchool)); + return appSchoolService.updateAppSchool(appSchool); } /** diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppSchoolService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppSchoolService.java index 20f64ad..7c592c6 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppSchoolService.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppSchoolService.java @@ -2,6 +2,7 @@ package com.ruoyi.app.service; import java.util.List; import com.ruoyi.app.domain.AppSchool; +import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.system.api.domain.SysUser; /** @@ -34,7 +35,7 @@ public interface IAppSchoolService * @param appSchool 学校配置 * @return 结果 */ - public int insertAppSchool(AppSchool appSchool); + public AjaxResult insertAppSchool(AppSchool appSchool); /** * 修改学校配置 @@ -42,7 +43,7 @@ public interface IAppSchoolService * @param appSchool 学校配置 * @return 结果 */ - public int updateAppSchool(AppSchool appSchool); + public AjaxResult updateAppSchool(AppSchool appSchool); /** * 批量删除学校配置 diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppSchoolServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppSchoolServiceImpl.java index 839de58..74aa9da 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppSchoolServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppSchoolServiceImpl.java @@ -6,6 +6,7 @@ import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.bean.BeanValidators; +import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.system.api.domain.SysUser; import org.springframework.beans.factory.annotation.Autowired; @@ -60,12 +61,16 @@ public class AppSchoolServiceImpl implements IAppSchoolService { * @return 结果 */ @Override - public int insertAppSchool(AppSchool appSchool) { + public AjaxResult insertAppSchool(AppSchool appSchool) { + AppSchool entity = appSchoolMapper.selectAppSchoolByName(appSchool.getName()); + if (entity != null) { + return AjaxResult.error(2001,"该学校名称已存在请重新输入！"); + } appSchool.setCreateTime(DateUtils.getNowDate()); appSchool.setUpdateTime(DateUtils.getNowDate()); appSchool.setCreateBy(SecurityUtils.getUsername()); appSchool.setUpdateBy(SecurityUtils.getUsername()); - return appSchoolMapper.insertAppSchool(appSchool); + return AjaxResult.success(appSchoolMapper.insertAppSchool(appSchool)); } /** @@ -75,10 +80,14 @@ public class AppSchoolServiceImpl implements IAppSchoolService { * @return 结果 */ @Override - public int updateAppSchool(AppSchool appSchool) { + public AjaxResult updateAppSchool(AppSchool appSchool) { + AppSchool entity = appSchoolMapper.selectAppSchoolByName(appSchool.getName()); + if (entity != null && appSchool.getId() != entity.getId()) { + return AjaxResult.error(2001,"该学校名称已存在请重新输入！"); + } appSchool.setUpdateTime(DateUtils.getNowDate()); appSchool.setUpdateBy(SecurityUtils.getUsername()); - return appSchoolMapper.updateAppSchool(appSchool); + return AjaxResult.success(appSchoolMapper.updateAppSchool(appSchool)); } /** diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFriendServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFriendServiceImpl.java index 7cac9b2..7e35a8a 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFriendServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFriendServiceImpl.java @@ -57,7 +57,7 @@ public class AppUserFriendServiceImpl implements IAppUserFriendService public AjaxResult insertAppUserFriend(AppUserFriend appUserFriend) { appUserFriend.setCreateTime(DateUtils.getNowDate()); - appUserFriend.setStatus(0l); + appUserFriend.setStatus(appUserFriend.getStatus() == null ? 0l : appUserFriend.getStatus()); AppUserFriend entity = new AppUserFriend(); entity.setUserId(appUserFriend.getUserId()); entity.setFriendId(appUserFriend.getFriendId()); diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java index b38c5fe..672f936 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java @@ -1,10 +1,13 @@ package com.ruoyi.app.utils.aliyun.sms; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSONObject; import com.aliyuncs.CommonRequest; import com.aliyuncs.CommonResponse; import com.aliyuncs.DefaultAcsClient; import com.aliyuncs.IAcsClient; +import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest; +import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.exceptions.ServerException; import com.aliyuncs.http.MethodType; @@ -79,8 +82,14 @@ public class SendNoteUtil { } randomNumber = "1234"; log.info("--------------------------------------------- " + PhoneNumber + "验证码：" + randomNumber); + redisService.setCacheObject(PhoneNumber, randomNumber, 300L, TimeUnit.SECONDS); + if (!redisService.hasKey(PhoneNumber)) { + return "Redis存入失败"; + } + if (!isChineseMobileNumber(PhoneNumber)) { + return sendForeign(PhoneNumber,randomNumber); + } CommonRequest request = new CommonRequest(); - //request.setSysProtocol(ProtocolType.HTTPS); request.setSysMethod(MethodType.POST); request.setSysDomain(dysmsapi); request.setSysVersion("2017-05-25"); @@ -92,10 +101,6 @@ public class SendNoteUtil { //用户定义的验证码内容 request.putQueryParameter("TemplateParam", "{\"code\": \"" + randomNumber + "\"}"); try { - redisService.setCacheObject(PhoneNumber, randomNumber, 300L, TimeUnit.SECONDS); - if (!redisService.hasKey(PhoneNumber)) { - return "Redis存入失败"; - } CommonResponse response = client.getCommonResponse(request); String returnStr = response.getData(); System.out.println(returnStr); @@ -151,6 +156,9 @@ public class SendNoteUtil { public String sendMessage(String PhoneNumber) { String homeTem = "SMS_467520300"; String foreignTem = "SMS_468380559"; + if (!isChineseMobileNumber(PhoneNumber)) { + return sendForeign(PhoneNumber,"1234"); + } CommonRequest request = new CommonRequest(); request.setSysMethod(MethodType.POST); request.setSysDomain(dysmsapi); @@ -177,4 +185,53 @@ public class SendNoteUtil { String regex = "^1[3-9]\\d{9}$"; return number.matches(regex); } + + private String sendForeign(String phone,String code){ + CommonRequest request = new CommonRequest(); + + request.setSysMethod(MethodType.POST); + request.setSysDomain("dysmsapi.aliyuncs.com"); + request.setSysVersion("2017-05-25"); + request.setSysAction("SendMessageToGlobe"); + request.putQueryParameter("To", phone); + request.putQueryParameter("Message", "您的验证码是" + code + "。请不要把验证码泄露给其他人。"); + //request.putQueryParameter("From", "18773124359"); + request.putQueryParameter("From", "18773124359"); + request.putQueryParameter("Type", "OTP"); + + try { + CommonResponse response = client.getCommonResponse(request); + String returnStr = response.getData(); + System.out.println(returnStr); + String data = response.getData(); + return JSONObject.parseObject(data).getString("Message"); + } catch (ServerException e) { + e.printStackTrace(); + return e.getErrMsg(); + } catch (ClientException e) { + e.printStackTrace(); + return e.getErrMsg(); + } + /*//初始化acsClient，和"在短信控制台查询即可 + DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou","LTAI5tQMf7PG2rH4U2mZBQnK", "3l8t7cVJGTGGu89AepWtq0CddgZNfU"); + IAcsClient client = new DefaultAcsClient(profile); + // 创建API请求并设置参数 + SendSmsRequest request = new SendSmsRequest(); + + request.setPhoneNumbers("1+4049014566"); // 该参数值为假设值，请您根据实际情况进行填写 + + request.setSignName("干杯GoBig"); // 该参数值为假设值，请您根据实际情况进行填写 + request.setTemplateCode("SMS_468240573"); + String randomNumber = "1234"; + request.setTemplateParam("{\"code\": \"" + randomNumber + "\"}"); + try { + SendSmsResponse response = client.getAcsResponse(request); + System.out.println(JSON.toJSONString(response)); + } catch (ServerException e) { + e.printStackTrace(); + } catch (ClientException e) { + e.printStackTrace(); + }*/ + } + } \ No newline at end of file