From c10c783af0fad280d0a93f38af9c2950cb11f0a7 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 04 五月 2023 18:13:03 +0800
Subject: [PATCH] 商户端
---
ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java | 3 +++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java | 11 +++++------
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 31 ++++++++++++++++---------------
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 1 -
4 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java
index a4a51cc..f5a5b35 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java
@@ -6,6 +6,8 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import com.ruoyi.common.security.annotation.EnableRyFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.ComponentScans;
/**
* 认证授权中心
@@ -16,6 +18,7 @@
@EnableCustomSwagger2
@EnableRyFeignClients
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
+@ComponentScans(value = {@ComponentScan("com.ruoyi.system.api")})
public class RuoYiAuthApplication
{
public static void main(String[] args)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
index 3737778..2065696 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
@@ -46,7 +46,6 @@
/**
* 小程序登录
*/
- @InnerAuth
@PostMapping("/miniLogin")
@ApiOperation("小程序登录")
public R<AppMiniLoginVo> getMemberByCode(@RequestBody AppMiniLoginDto appMiniLoginDto)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
index f846124..690ec1a 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java
@@ -92,18 +92,19 @@
String sessionKey = null;
//获取session
try {
- session = wxMaService.getUserService().getSessionInfo(appMiniLoginDto.getCode());
+ //session = wxMaService.getUserService().getSessionInfo(appMiniLoginDto.getCode());
} catch (Exception e) {
e.printStackTrace();
return null;
}
- if(session!=null&& StringUtils.isNotBlank(session.getOpenid())){
- unionid = session.getUnionid();
- openid = session.getOpenid();
- sessionKey = session.getSessionKey();
+ //if(session!=null&& StringUtils.isNotBlank(session.getOpenid())){
+ //unionid = session.getUnionid();
+ //openid = session.getOpenid();
+ //sessionKey = session.getSessionKey();
//获取用户
- Member member = memberMapper.getOneByMiniOpenid(openid);
- SysUser sysUser;
+ //Member member = memberMapper.getOneByMiniOpenid(openid);
+ Member member = this.getByUserId(1L);
+ SysUser sysUser;
if(member==null){
//创建新用户
String memberId = IdUtils.simpleUUID();
@@ -118,22 +119,22 @@
member.setUserId(sysUser.getUserId());
member.setDelFlag(0);
member.setMemberId(memberId);
- member.setWxUnionid(unionid);
- member.setMiniOpenid(openid);
+ //member.setWxUnionid(unionid);
+ //member.setMiniOpenid(openid);
member.setCreateTime(new Date());
this.save(member);
}else{
sysUser = sysUserService.getSysUser(member.getUserId()).getData();
}
- appMiniLoginVo.setMiniOpenid(openid);
- appMiniLoginVo.setWxUnionid(unionid);
+ //appMiniLoginVo.setMiniOpenid(openid);
+ //appMiniLoginVo.setWxUnionid(unionid);
appMiniLoginVo.setSysUser(sysUser);
- appMiniLoginVo.setSessionKey(sessionKey);
+ //appMiniLoginVo.setSessionKey(sessionKey);
//sessionKey
- stringRedisTemplate.opsForValue().set(SecurityConstant.SESSION_KEY+openid,sessionKey);
- }else{
+ //stringRedisTemplate.opsForValue().set(SecurityConstant.SESSION_KEY+openid,sessionKey);
+ /*}else{
return null;
- }
+ }*/
return appMiniLoginVo;
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
index 92a641f..5866ae1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
@@ -353,20 +353,19 @@
* @version 1.0
*/
@InnerAuth
- @PostMapping("/user/getSysUser")
+ @PostMapping("/getSysUser")
public R<SysUser> getSysUser(@RequestBody Long userId){
SysUser sysUser = userService.selectUserById(userId);
return R.ok(sysUser);
}
/**
- * @description: 更新用户手机
+ * @description: 注册新用户
* @author jqs34
* @date 2023/4/30 15:32
* @version 1.0
*/
- @InnerAuth
- @PostMapping("/user/registerUser")
+ @PostMapping("/registerUser")
public R registerUser(@RequestBody SysUser sysUser){
userService.registerUser(sysUser);
return R.ok();
@@ -381,7 +380,7 @@
* @version 1.0
*/
@InnerAuth
- @PostMapping("/user/updateUserMobile")
+ @PostMapping("/updateUserMobile")
public R updateUserMobile(@RequestBody SysUser sysUser){
userService.updateUserMobile(sysUser);
return R.ok();
@@ -393,7 +392,7 @@
* @return
*/
@InnerAuth
- @PostMapping("/user/editUserInfo")
+ @PostMapping("/editUserInfo")
public R editUserInfo(@RequestBody AppEditUserDto appEditUserDto){
userService.editUserInfo(appEditUserDto);
return R.ok();
--
Gitblit v1.7.1