From 196ac84b6ec0dd05304dd6577f169f7fbf5fe726 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:13:18 +0800
Subject: [PATCH] merge
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java
index 59b4160..69d5127 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppLoginController.java
@@ -1,5 +1,8 @@
package com.sinata.web.controller.applet;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.sinata.common.constant.Constants;
import com.sinata.common.core.domain.AjaxResult;
import com.sinata.common.core.domain.R;
@@ -9,6 +12,7 @@
import com.sinata.common.core.domain.model.LoginBody;
import com.sinata.common.core.domain.model.LoginUser;
import com.sinata.common.utils.SecurityUtils;
+import com.sinata.common.utils.StringUtils;
import com.sinata.framework.web.service.SysLoginService;
import com.sinata.framework.web.service.SysPermissionService;
import com.sinata.framework.web.service.TokenService;
@@ -17,6 +21,9 @@
import com.sinata.system.service.ISysMenuService;
import com.sinata.system.service.ISysRoleService;
import com.sinata.system.service.SysDepartmentService;
+import com.sinata.system.service.biz.AliSmsService;
+import com.sinata.web.controller.tool.weChat.WXCore;
+import com.sinata.web.controller.tool.weChat.WeChatUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +31,10 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.List;
+import java.util.Map;
+import java.util.Random;
import java.util.Set;
/**
@@ -54,7 +64,47 @@
@Resource
private SysDepartmentService departmentService;
+ @Resource
+ private AliSmsService aliSmsService;
+
+ @PostMapping("/getCode")
+ @ApiOperation("获取验证码")
+ public AjaxResult getCode(String phone)
+ {
+ Random random = new Random();
+
+ int i = 100000 + random.nextInt(900000);
+ aliSmsService.sendLoginCode(phone, String.valueOf(i));
+ return AjaxResult.success();
+ }
+ @Resource
+ private WeChatUtil weChatUtil;
+
+
+ @PostMapping("/getPhone")
+ @ApiOperation("获取手机号")
+ public R getPhone(String jscoe, String EncryptedData_phone,String Iv_phone)
+ {
+ //使用jscode获取微信openid
+ Map<String, Object> map = weChatUtil.code2Session(jscoe);
+ Integer errcode = Integer.valueOf(map.get("errcode").toString());
+ if(0 != errcode){
+ return R.fail(map.get("msg").toString());
+ }
+ String openid = map.get("openid").toString();
+ String sessionKey = map.get("sessionKey").toString();
+
+
+ String decrypt = WXCore.decrypt(EncryptedData_phone, sessionKey, Iv_phone);
+ if (StringUtils.isEmpty(decrypt)) {
+ return R.fail("获取手机信息失败");
+ }
+ JSONObject phone = JSON.parseObject(decrypt);
+ String purePhoneNumber = phone.getString("purePhoneNumber");
+ return R.ok(purePhoneNumber);
+
+ }
/**
* 登录方法
*
@@ -95,11 +145,9 @@
public R<UserInfoDTO> user()
{
SysUser user = SecurityUtils.getLoginUser().getUser();
- Set<String> roles = permissionService.getRolePermission(user);
SysDepartment byId2 = departmentService.getById(user.getDepartmentId());
UserInfoDTO userInfoDTO = new UserInfoDTO();
userInfoDTO.setNickName(user.getNickName());
- userInfoDTO.setRoles(roles);
userInfoDTO.setDepartment(byId2);
return R.ok(userInfoDTO);
}
--
Gitblit v1.7.1