--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/fg/permissions/FgPermissionsController.java

@@ -218,7 +218,7 @@ public class FgPermissionsController {
 	
 	@ApiOperation(value = "微信用户登录", notes = "0：登录成功；5：该账户已禁用；6：第三方登录错误；7：未绑定平台账号")
 	@GetMapping(value =MemberRequestPath.WECHAT + MemberRequestPath.LOGIN)
-	public CallBack<Member> wechartLogin(@RequestParam("code")String code) throws BaseException, Exception {
+	public CallBack<LoginMemberInfo> wechartLogin(@RequestParam("code")String code) throws BaseException, Exception {
 		CallBack<WeChartThirdReturn> cb = weChatLogin.query(code);
 		if(!cb.isStatus()){
 			throw new BaseException(6,cb.getMsg());
@@ -233,13 +233,13 @@ public class FgPermissionsController {
 		}else if (m.getStatus() == 0) {
 			throw new BaseException(5,"该账户已禁用");
 		}
-		LoginMemberInfo	info1 = new LoginMemberInfo();
-		BeanUtils.copyProperties(m, info1);
+		LoginMemberInfo	info = new LoginMemberInfo();
+		BeanUtils.copyProperties(m, info);
 		String token = MD5Util.getEncoderByMd5(m.getAccount());
-		info1.setToken(token);
+		info.setToken(token);
 		m.setToken(token);
-		redis.set(token,  JsonUtil.bean2Json(info1),60*60*24*7,TimeUnit.SECONDS);
-		return CallBack.success(m);
+		redis.set(token,  JsonUtil.bean2Json(info),60*60*24*7,TimeUnit.SECONDS);
+		return CallBack.success(info);
 	}
 	@ApiOperation(value = "QQ用户登录", notes = "0：登录成功；5：该账户已禁用；6：第三方登录错误；7：未绑定平台账号；")
 	@GetMapping(value =MemberRequestPath.QQ + MemberRequestPath.LOGIN)