From b37275dba6b782bf3bb3817c4504f6cdef1bef7c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 18 三月 2021 18:38:51 +0800
Subject: [PATCH] APP首页顶部标签兼容
---
src/main/java/com/yeshi/buwan/service/imp/UserService.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/service/imp/UserService.java b/src/main/java/com/yeshi/buwan/service/imp/UserService.java
index 75b446e..2d8197c 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/UserService.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/UserService.java
@@ -9,9 +9,9 @@
import com.yeshi.buwan.dao.user.LoginUserExtraDao;
import com.yeshi.buwan.domain.user.LoginUserExtra;
import com.yeshi.buwan.dto.user.LoginInfoDto;
-import com.yeshi.buwan.dto.user.QQUserInfo;
import com.yeshi.buwan.exception.user.LoginUserException;
import com.yeshi.buwan.exception.user.RegisterUserException;
+import com.yeshi.buwan.service.inter.LoginUserService;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.springframework.cache.annotation.Cacheable;
@@ -22,12 +22,11 @@
import com.yeshi.buwan.dao.user.LoginUserDao;
import com.yeshi.buwan.dao.UserDao;
import com.yeshi.buwan.domain.user.LoginUser;
-import com.yeshi.buwan.domain.SystemInfo;
+import com.yeshi.buwan.domain.system.SystemInfo;
import com.yeshi.buwan.domain.UserData;
import com.yeshi.buwan.domain.UserInfo;
import com.yeshi.buwan.util.Constant;
import com.yeshi.buwan.util.StringUtil;
-import org.yeshi.utils.entity.wx.WeiXinUser;
@Service
public class UserService {
@@ -44,6 +43,9 @@
@Resource
private LoginUserExtraDao loginUserExtraDao;
+
+ @Resource
+ private LoginUserService loginUserService;
// 鐢ㄦ埛鎿嶄綔
@@ -257,7 +259,7 @@
*
* @param dto
*/
- public void register(LoginInfoDto dto) throws RegisterUserException {
+ public LoginUser register(LoginInfoDto dto) throws RegisterUserException {
LoginUser loginUser = null;
LoginUserExtra loginUserExtra = null;
switch (dto.getLoginType()) {
@@ -295,6 +297,7 @@
loginUser.setLoginType(LoginUser.LOGIN_TYPE_QQ);
loginUser.setQqOpenId(dto.getQqUserInfo().getOpenId());
loginUser.setName(dto.getQqUserInfo().getName());
+ loginUser.setPortrait(dto.getQqUserInfo().getPortrait());
loginUserExtra = new LoginUserExtra();
@@ -316,6 +319,7 @@
loginUser.setWxUnionId(dto.getWeiXinUser().getUnionid());
loginUser.setName(dto.getWeiXinUser().getNickname());
loginUser.setWxOpenId(dto.getWeiXinUser().getOpenid());
+ loginUser.setPortrait(dto.getWeiXinUser().getHeadimgurl());
loginUserExtra = new LoginUserExtra();
@@ -371,7 +375,9 @@
loginUserExtra.setId(loginUser.getId());
loginUserExtra.setCreateTime(new Date());
- loginUserExtraDao.save(loginUserExtra);
+ loginUserService.initExtra(loginUserExtra);
+
+ return loginUser;
}
public LoginUser getLoginUser(String id) {
--
Gitblit v1.8.0