From b832327f508412c7297442365937fa26c6d2c0f6 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 22 十月 2025 11:49:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 453956e..10a2f75 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,9 +1,6 @@
package com.ruoyi.web.controller.system;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.concurrent.TimeUnit;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -16,15 +13,17 @@
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.model.TSysAppUser;
-import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.system.service.TSysAppUserService;
+import com.ruoyi.system.model.TSysMessageTemplate;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.utils.wx.body.resp.Code2SessionRespBody;
import com.ruoyi.system.utils.wx.body.resq.Code2SessionResqBody;
import com.ruoyi.system.utils.wx.model.WeixinProperties;
import com.ruoyi.system.utils.wx.pojo.AppletUserDecodeData;
import com.ruoyi.system.utils.wx.pojo.AppletUserEncrypteData;
+import com.ruoyi.system.utils.wx.pojo.OfficeUserEncrypteData;
import com.ruoyi.system.utils.wx.tools.WxAppletTools;
import com.ruoyi.system.utils.wx.tools.WxUtils;
+import com.ruoyi.web.controller.tool.MsgUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -41,7 +40,6 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.framework.web.service.SysPermissionService;
-import com.ruoyi.system.service.ISysMenuService;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
@@ -74,10 +72,16 @@
private WeixinProperties wxConfig;
@Autowired
private RestTemplate wxRestTemplate;
- @Resource
+ @Autowired
+ private MsgUtils msgUtils;
+ @Autowired
+ private TSysMessageTemplateService sysMessageTemplateService;
+ @Autowired
private RedisService redisService;
- @Resource
+ @Autowired
private TSysAppUserService sysAppUserService;
+ @Autowired
+ private ISysUserService sysUserService;
/**
* 账号密码登录
*
@@ -131,16 +135,15 @@
.and(e->e.eq(TSysAppUser::getOpenId, appletUserDecodeData.getOpenId()).or()
.eq(TSysAppUser::getPhone, appletUserDecodeData.getPhoneNumber())));
if (sysAppUser==null){
-// appUser.setTenantAttributes();
-// appUser.setTenantType();
sysAppUser = new TSysAppUser();
sysAppUser.setPhone(appletUserDecodeData.getPhoneNumber());
-// sysAppUser.setAccount(appletUserDecodeData.getPhoneNumber());
-// sysAppUser.setPassword(SecurityUtils.encryptPassword(appletUserDecodeData.getPhoneNumber().substring(5)));
sysAppUser.setOpenId(appletUserDecodeData.getOpenId());
// 手机号中间四位替换为*
sysAppUser.setNickName(appletUserDecodeData.getPhoneNumber().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
sysAppUserService.save(sysAppUser);
+ }else {
+ // 手机号相同但openId为空的情况
+ sysAppUser.setOpenId(appletUserDecodeData.getOpenId());
}
LoginUserApplet loginUserApplet = new LoginUserApplet();
TSysUserResp sysUserResp = new TSysUserResp();
@@ -151,6 +154,33 @@
tokenInfos.put("token",tokenService.createTokenApplet(loginUserApplet));
tokenInfos.put("info",loginUserApplet);
return R.ok(tokenInfos);
+ }
+
+ @ApiOperation(value = "通过code获得openid",tags = {"微信服务号、公众号登录"})
+ @PostMapping("/openIdByCode")
+ public R<Map<String, Object>> openIdByCode(@RequestBody OfficeUserEncrypteData data) {
+ log.info("<<<<<<<<换取openid开始<<<<<<<<:{}", data.getCode());
+ WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig, redisService);
+ Code2SessionRespBody body = appletTools.getOpenIdByJscode2session(new Code2SessionResqBody().build(data.getCode()));
+ String openid = body.getOpenid();
+ String phone = data.getPhone();
+ if(StringUtils.isEmpty(phone)){
+ return R.fail("请输入手机号");
+ }
+ TSysAppUser sysAppUser = sysAppUserService.getOne(Wrappers.lambdaQuery(TSysAppUser.class)
+ .eq(TSysAppUser::getPhone, phone));
+ if(Objects.nonNull(sysAppUser)){
+ sysAppUser.setOfficeOpenId(openid);
+ sysAppUserService.updateById(sysAppUser);
+ }
+ // 获取诊所信息
+ SysUser sysUser = sysUserService.selectByPhone(phone);
+ if(Objects.nonNull(sysUser) && (sysUser.getRoleType() == 5 || sysUser.getRoleType() == 3)){
+ // 诊所
+ sysUser.setOpenId(openid);
+ sysUserService.updateUserInfo(sysUser);
+ }
+ return R.ok();
}
/**
@@ -186,7 +216,11 @@
String code = String.valueOf((int) (Math.random() * 1000000));
redisCache.setCacheObject(phone, code,5*60,TimeUnit.SECONDS);
try {
-// smsUtil.sendSms(phone, "2369926", new String[]{code});
+ TSysMessageTemplate messageTemplate = sysMessageTemplateService.getOne(Wrappers.lambdaQuery(TSysMessageTemplate.class)
+ .eq(TSysMessageTemplate::getTemplateType, 1));
+ Map<String,String> params = new HashMap<>();
+ params.put("code", code);
+ msgUtils.sendMsg(phone, params, messageTemplate.getTemplateCode());
} catch (Exception e) {
throw new RuntimeException(e);
}
--
Gitblit v1.7.1