|
@@ -95,8 +95,8 @@ public class WxUserController extends AppBaseController{
|
|
|
if (StringUtils.isBlank(param.getCode())) {
|
|
|
return R.error("code不存在");
|
|
|
}
|
|
|
- FsSysConfig con = configUtil.getSysConfig();
|
|
|
- final WxMaService wxService = WxMaConfiguration.getMaService(con.getAppid());
|
|
|
+// FsSysConfig con = configUtil.getSysConfig();
|
|
|
+ final WxMaService wxService = WxMaConfiguration.getMaService(param.getAppId());
|
|
|
try {
|
|
|
WxMaJscode2SessionResult session = wxService.getUserService().getSessionInfo(param.getCode());
|
|
|
this.logger.info(session.getSessionKey());
|
|
@@ -117,8 +117,6 @@ public class WxUserController extends AppBaseController{
|
|
|
if(user==null){
|
|
|
//新用户
|
|
|
String phoneNumber = phoneNoInfo.getPhoneNumber();
|
|
|
-
|
|
|
-
|
|
|
//查询手机号是否存在,如果存在,更新
|
|
|
FsUser checkPhone=userService.selectFsUserByPhone(encryptPhone(phoneNumber));
|
|
|
if (checkPhone==null){
|
|
@@ -171,16 +169,6 @@ public class WxUserController extends AppBaseController{
|
|
|
map.put("token",token);
|
|
|
user.setPhone(encryptPhone(phoneNoInfo.getPhoneNumber()));
|
|
|
map.put("user",user);
|
|
|
- FsUserLoginLog log = new FsUserLoginLog();
|
|
|
- log.setCode(param.getCode());
|
|
|
- log.setLoginJson(JSON.toJSONString(param));
|
|
|
-// log.setUserRegisterJson(JSON.toJSONString(jsonMap));
|
|
|
- log.setStatus(1);
|
|
|
- log.setUserId(user.getUserId());
|
|
|
- log.setPhone(user.getPhone());
|
|
|
- log.setMaOpenId(user.getMaOpenId());
|
|
|
- log.setCreateTime(DateUtils.getNowDate());
|
|
|
- fsUserLoginLogMapper.insertFsUserLoginLog(log);
|
|
|
return R.ok(map);
|
|
|
} catch (WxErrorException e) {
|
|
|
//this.logger.error(e.getMessage(), e);
|