Browse Source

[微信第三方登录][修改]:用户是否绑定微信

release_toaliyun_real
Stormeye Wu 7 years ago
parent
commit
8302b2f41d
2 changed files with 17 additions and 9 deletions
  1. +5
    -8
      mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java
  2. +12
    -1
      mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java

+ 5
- 8
mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java View File

@@ -102,19 +102,16 @@ public class HomeController extends BaseController {
Subject subject = SecurityUtils.getSubject(); Subject subject = SecurityUtils.getSubject();
UsernamePasswordToken token = new UsernamePasswordToken(user.getUsername(), user.getPassword()); UsernamePasswordToken token = new UsernamePasswordToken(user.getUsername(), user.getPassword());
subject.login(token); subject.login(token);
// List<MallRole> roleList = sysRoleService.findRoleByUserId(user.getId());
// if (null != roleList && roleList.size() > 0) {
// List<MallPermission> permissionList = sysPermissionService
// .findPermissionByRoleIds(roleList.stream().map(MallRole::getId).collect(Collectors.toList()));
// user.setRole(roleList);
// user.setPermission(permissionList);
// }
MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); MallUserInfo info = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo);
info.setPassword("保密"); info.setPassword("保密");
if(StringUtils.isNotBlank(info.getBopenId())) if(StringUtils.isNotBlank(info.getBopenId()))
info.setBopenId("保密"); info.setBopenId("保密");
if(StringUtils.isNotBlank(info.getWebOpenId()))
if(StringUtils.isNotBlank(info.getWebOpenId())) {
info.setWebOpenId("保密"); info.setWebOpenId("保密");
info.setWithWechat(true);
} else {
info.setWithWechat(false);
}
// System.out.println("id:"+ SecurityUtils.getSubject().getSession().getId()); // System.out.println("id:"+ SecurityUtils.getSubject().getSession().getId());
String menus = mallUserRoleService.getPermissionsByUser(info); String menus = mallUserRoleService.getPermissionsByUser(info);
if(menus != null) { if(menus != null) {


+ 12
- 1
mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java View File

@@ -99,6 +99,9 @@ public class MallUserInfo implements Serializable {
@Transient @Transient
private String captcha; private String captcha;


@Transient
private boolean withWechat;

/**1合同审批 2账单审批**/ /**1合同审批 2账单审批**/
@io.swagger.annotations.ApiModelProperty(value="1合同审批 2账单审批",name="flowPermission") @io.swagger.annotations.ApiModelProperty(value="1合同审批 2账单审批",name="flowPermission")
private String flowPermission; private String flowPermission;
@@ -215,7 +218,15 @@ public class MallUserInfo implements Serializable {
this.captcha = captcha; this.captcha = captcha;
} }


public String getPhone() {
public boolean isWithWechat() {
return withWechat;
}

public void setWithWechat(boolean withWechat) {
this.withWechat = withWechat;
}

public String getPhone() {
return phone; return phone;
} }




Loading…
Cancel
Save