Просмотр исходного кода

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

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
8d1f2f51f7
6 измененных файлов: 27 добавлений и 38 удалений
  1. +5
    -14
      mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java
  2. +0
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  4. +9
    -10
      mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java
  5. +8
    -2
      mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml
  6. +4
    -10
      mallinkWechatOpen/src/main/java/com/iformall/controller/HomeController.java

+ 5
- 14
mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java Просмотреть файл

@@ -96,7 +96,7 @@ public class HomeController extends BaseController {
ResultData data = new ResultData();
if (StringUtils.isBlank(user.getUsername()) || StringUtils.isBlank(user.getPassword())) {
// throw new SystemException(ErrorCode.LOGIN_USER_OR_PWD_ERROR);
return new ResultData(ResultData.ERROR, "用户名或者密码错误");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
try {
Subject subject = SecurityUtils.getSubject();
@@ -108,9 +108,6 @@ public class HomeController extends BaseController {
info.setBopenId("保密");
if(StringUtils.isNotBlank(info.getWebOpenId())) {
info.setWebOpenId("保密");
info.setWithWechat(true);
} else {
info.setWithWechat(false);
}
String menus = mallUserRoleService.getPermissionsByUser(info);
if(menus != null) {
@@ -118,7 +115,7 @@ public class HomeController extends BaseController {
}
data.data = info;
} catch (Exception e) {
return new ResultData(ResultData.ERROR, "用户名或者密码错误");
return new ResultData(ErrorCode.USER_PASSWD_ERR);
}
return data;
}
@@ -160,7 +157,7 @@ public class HomeController extends BaseController {
} else {
if (StringUtils.isEmpty(user.getUsername()) || StringUtils.isEmpty(user.getPassword())) {
// throw new SystemException(ErrorCode.LOGIN_USER_OR_PWD_ERROR);
return new ResultData(ResultData.ERROR, "用户名或者密码错误");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
}

@@ -174,9 +171,6 @@ public class HomeController extends BaseController {
info.setBopenId("保密");
if(StringUtils.isNotBlank(info.getWebOpenId())) {
info.setWebOpenId("保密");
info.setWithWechat(true);
} else {
info.setWithWechat(false);
}
String menus = mallUserRoleService.getPermissionsByUser(info);
if(menus != null) {
@@ -184,7 +178,7 @@ public class HomeController extends BaseController {
}
data.data = info;
} catch (Exception e) {
return new ResultData(ResultData.ERROR, "用户名或者密码错误");
return new ResultData(ErrorCode.USER_PASSWD_ERR);
}
return data;
}
@@ -248,9 +242,6 @@ public class HomeController extends BaseController {
info.setBopenId("保密");
if(StringUtils.isNotBlank(info.getWebOpenId())) {
info.setWebOpenId("保密");
info.setWithWechat(true);
} else {
info.setWithWechat(false);
}
String menus = mallUserRoleService.getPermissionsByUser(info);
if(menus != null) {
@@ -258,7 +249,7 @@ public class HomeController extends BaseController {
}
return new ResultData(info);
} catch (Exception e) {
return new ResultData(ResultData.ERROR, "用户名或者密码错误");
return new ResultData(ErrorCode.USER_PASSWD_ERR);
}
} else {
return new ResultData(ErrorCode.MSG_VERIFY_CODE_NOT_FOUND);


+ 0
- 2
mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java Просмотреть файл

@@ -105,7 +105,6 @@ public class WechatLoginController extends BaseController {
info.setPassword("保密");
info.setBopenId("保密");
info.setWebOpenId("保密");
info.setWithWechat(true);
String menus = mallUserRoleService.getPermissionsByUser(info);
if(menus != null) {
info.setMenus(menus);
@@ -189,7 +188,6 @@ public class WechatLoginController extends BaseController {
info.setPassword("保密");
info.setBopenId("保密");
info.setWebOpenId("保密");
info.setWithWechat(true);
String menus = mallUserRoleService.getPermissionsByUser(info);
if(menus != null) {
info.setMenus(menus);


+ 1
- 0
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Просмотреть файл

@@ -59,6 +59,7 @@ public enum ErrorCode{
/**
* 用户2000-2099
*/
USER_PASSWD_ERR(1987, "用户名或者密码错误"),
USER_IS_MULTI(1988, "有多个手机号,请联系富茂管理员"),
USER_IS_NOT_MEMBER(1989,"用户还未授权手机号成为会员"),
USER_PHONE_IS_NOT_FOUND(1990,"手机号不存在"),


+ 9
- 10
mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java Просмотреть файл

@@ -71,16 +71,18 @@ public class MallUserInfo implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="昵称",name="nickName")
private String nickName;

@io.swagger.annotations.ApiModelProperty(value="手机",name="phone")
@io.swagger.annotations.ApiModelProperty(value="手机,系统内手机号唯一",name="phone")
private String phone;
/** B端用户微信openid,领导看数据塔台用 */
@io.swagger.annotations.ApiModelProperty(value="bopenId",name="bopenId")
@io.swagger.annotations.ApiModelProperty(value="B端用户微信openid,领导看数据塔台用",name="bopenId")
private String bopenId;

/** B端用户微信openid,领导看数据塔台用 */
@io.swagger.annotations.ApiModelProperty(value="webOpenId",name="webOpenId")
@io.swagger.annotations.ApiModelProperty(value="admin用户微信登录用,可绑定多个账户",name="webOpenId")
private String webOpenId;

@io.swagger.annotations.ApiModelProperty(value="0 未绑定wechat,1绑定微信",name="withWechat")
private Integer withWechat;

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

@Transient
private boolean withWechat;

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

public boolean isWithWechat() {
public Integer getWithWechat() {
return withWechat;
}

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



+ 8
- 2
mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml Просмотреть файл

@@ -15,15 +15,18 @@
<result column="phone" jdbcType="VARCHAR" property="phone"/>
<result column="bopen_id" jdbcType="VARCHAR" property="bopenId"/>
<result column="web_open_id" jdbcType="VARCHAR" property="webOpenId"/>
<result column="with_wechat" jdbcType="INTEGER" property="withWechat"/>
<result column="flow_permission" property="flowPermission"/>
</resultMap>

<sql id="allSafeColumns">
`id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`flow_permission`
`id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`flow_permission`,
isnull(`web_open_id`) has_wechat
</sql>

<sql id="allColumns">
`id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`bopen_id`,`web_open_id`,`flow_permission`
`id`,`tenant_id`,`username`,`name`,`password`,`create_time`,`last_login_time`,`status`,`is_admin`,`nick_name`,`phone`,`flow_permission`,
`bopen_id`,`web_open_id`,isnull(`web_open_id`) has_wechat
</sql>

<sql id="dynamicWhereConditions">
@@ -208,6 +211,7 @@
<result column="phone" jdbcType="VARCHAR" property="phone"/>
<result column="bopen_id" jdbcType="VARCHAR" property="bopenId"/>
<result column="web_open_id" jdbcType="VARCHAR" property="webOpenId"/>
<result column="with_wechat" jdbcType="INTEGER" property="withWechat"/>
<result column="flow_permission" property="flowPermission"/>

<result column="mall_name" jdbcType="VARCHAR" property="mallName"/>
@@ -218,11 +222,13 @@

<sql id="allSafeVColumns">
u.`id`,u.`tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`nick_name`,u.`phone`,u.`flow_permission`,
isnull(u.`web_open_id`) with_wechat,
m.`name` as mall_name, m.`group` as mall_group, m.`img_url`, m.`img_url_h`
</sql>

<sql id="allVColumns">
u.`id`,u.`tenant_id`,u.`username`,u.`name`,u.`password`,u.`create_time`,u.`last_login_time`,u.`status`,u.`is_admin`,u.`nick_name`,u.`phone`,u.`flow_permission`,
u.`bopen_id`,u.`web_open_id`,isnull(u.`web_open_id`) with_wechat
m.`name` as mall_name, m.`group` as mall_group, m.`img_url`, m.`img_url_h`
</sql>



+ 4
- 10
mallinkWechatOpen/src/main/java/com/iformall/controller/HomeController.java Просмотреть файл

@@ -85,29 +85,23 @@ public class HomeController extends BaseController {
ResultData data = new ResultData();
if (StringUtils.isBlank(user.getUsername()) || StringUtils.isBlank(user.getPassword())) {
// throw new SystemException(ErrorCode.LOGIN_USER_OR_PWD_ERROR);
return new ResultData(ResultData.ERROR, "用户名或者密码错误");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
try {
Subject subject = SecurityUtils.getSubject();
UsernamePasswordToken token = new UsernamePasswordToken(user.getUsername(), user.getPassword());
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);
info.setPassword("保密");
// System.out.println("id:"+ SecurityUtils.getSubject().getSession().getId());
info.setBopenId("保密");
info.setWebOpenId("保密");
String menus = mallUserRoleService.getPermissionsByUser(info);
if(menus != null) {
info.setMenus(menus);
}
data.data = info;
} catch (Exception e) {
return new ResultData(ResultData.ERROR, "用户名或者密码错误");
return new ResultData(ErrorCode.USER_PASSWD_ERR);
}
return data;
}


Загрузка…
Отмена
Сохранить