|
|
|
@@ -5,6 +5,7 @@ import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.MallUserInfo; |
|
|
|
import com.iformall.domain.vo.MallUserInfoVo; |
|
|
|
import com.iformall.enums.EnumUserAdmin; |
|
|
|
import com.iformall.service.MallUserInfoService; |
|
|
|
import com.iformall.service.MallUserRoleService; |
|
|
|
import com.iformall.shiro.UserSession; |
|
|
|
@@ -19,6 +20,7 @@ import me.chanjar.weixin.common.error.WxErrorException; |
|
|
|
import me.chanjar.weixin.mp.api.WxMpService; |
|
|
|
import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken; |
|
|
|
import me.chanjar.weixin.mp.bean.result.WxMpUser; |
|
|
|
import net.sf.saxon.trans.Err; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.shiro.SecurityUtils; |
|
|
|
import org.apache.shiro.subject.Subject; |
|
|
|
@@ -256,7 +258,13 @@ public class WechatLoginController extends BaseController { |
|
|
|
if(userInfo.getId() == null && userInfo.getUsername() == null) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); |
|
|
|
} |
|
|
|
mallUserInfoService.cleanWebOpenId(userInfo); |
|
|
|
return new ResultData(); |
|
|
|
if(userInfo.getId().equals(user.getId()) |
|
|
|
|| user.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { |
|
|
|
mallUserInfoService.cleanWebOpenId(userInfo); |
|
|
|
return new ResultData(); |
|
|
|
} else { |
|
|
|
return new ResultData(ErrorCode.USER_NO_PERMISSION); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |