From bcee7405c2ce5ee0431b1a2ef2135ca27fc0d52b Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Thu, 5 Sep 2024 16:59:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E7=94=A8?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SingleLoginServiceImpl.java | 10 ++-- .../service/impl/SysUserServiceImpl.java | 55 +++++++++++++++++++ 2 files changed, 60 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java index 5f5848b..d837120 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java @@ -76,11 +76,11 @@ public class SingleLoginServiceImpl implements SingleLoginService { if (userService.checkUserNameUnique(user)) { user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); userService.insertUser(user); - if ("02".equals(userType) & isTiming) { - if (user.getPhonenumber() != null) { - smsAlertsService.addSsmPhone(user.getPhonenumber()); - } - } +// if ("02".equals(userType) & isTiming) { +// if (user.getPhonenumber() != null) { +// smsAlertsService.addSsmPhone(user.getPhonenumber()); +// } +// } } //新增user账号密码 UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(userName, "admin123"); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index cb3baa5..6ae3cc8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -1,6 +1,13 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.RandomUtil; +import cn.hutool.crypto.digest.DigestAlgorithm; +import cn.hutool.crypto.digest.Digester; +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.entity.SysRole; @@ -24,13 +31,17 @@ import com.ruoyi.system.service.ISysUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.validation.Validator; +import java.time.Instant; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -55,7 +66,30 @@ public class SysUserServiceImpl implements ISysUserService, UserService { private SysUserPostMapper userPostMapper; @Autowired private ISysConfigService configService; + @Value("${smsSend}") + private String smsSend; + + @Value("${smsPhoneAdd}") + private String smsPhoneAdd; + + @Value("${paaSID}") + private String paaSID; + + @Value("${smsToken}") + private String smsToken; + + @Value("${code}") + private String code; + + @Value("${smsV}") + private String smsV; + + @Value("${paramType}") + private String paramType; + + @Value("${isTiming}") + private Boolean isTiming; /** * 根据条件分页查询用户列表 * @@ -230,6 +264,27 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Override @Transactional public int insertUser(SysUser user) { + if ("02".equals(user.getUserType()) & isTiming) { + if (user.getPhonenumber() != null) { + Digester sha256 = new Digester(DigestAlgorithm.SHA256); + String timestamp = String.valueOf(Instant.now().getEpochSecond()); + String str = RandomUtil.randomString(30); + //请求头 + HashMap headers = new HashMap<>();//存放请求头,可以存放多个请求头 + headers.put("x-tif-paasid", paaSID); + headers.put("x-tif-signature", sha256.digestHex(timestamp + smsToken + str + timestamp).toUpperCase()); + headers.put("x-tif-timestamp", timestamp); + headers.put("x-tif-nonce", str); + Map js1 = new HashMap<>();//存放参数 + js1.put("orderId", code); + js1.put("nums", user.getPhonenumber()); + HttpResponse response = HttpRequest.post(smsPhoneAdd) + .addHeaders(headers) + .form(js1) + .execute(); + System.out.println(response.body()); + } + } // 新增用户信息 int rows = userMapper.insertUser(user); // 新增用户岗位关联