debug
This commit is contained in:
parent
091ec422be
commit
7354f5f57d
|
|
@ -4,14 +4,17 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
|
||||||
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
|
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
|
||||||
import cn.dev33.satoken.stp.StpUtil;
|
import cn.dev33.satoken.stp.StpUtil;
|
||||||
import com.alibaba.fastjson2.JSONArray;
|
import com.alibaba.fastjson2.JSONArray;
|
||||||
|
import com.alibaba.fastjson2.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Assert;
|
import com.baomidou.mybatisplus.core.toolkit.Assert;
|
||||||
|
import com.mdd.common.entity.log.UserAccountLog;
|
||||||
import com.mdd.common.entity.user.User;
|
import com.mdd.common.entity.user.User;
|
||||||
import com.mdd.common.entity.user.UserAuth;
|
import com.mdd.common.entity.user.UserAuth;
|
||||||
import com.mdd.common.entity.user.UserSession;
|
import com.mdd.common.entity.user.UserSession;
|
||||||
import com.mdd.common.enums.LoginEnum;
|
import com.mdd.common.enums.LoginEnum;
|
||||||
import com.mdd.common.enums.NoticeEnum;
|
import com.mdd.common.enums.NoticeEnum;
|
||||||
import com.mdd.common.exception.OperateException;
|
import com.mdd.common.exception.OperateException;
|
||||||
|
import com.mdd.common.mapper.log.UserAccountLogMapper;
|
||||||
import com.mdd.common.mapper.user.UserAuthMapper;
|
import com.mdd.common.mapper.user.UserAuthMapper;
|
||||||
import com.mdd.common.mapper.user.UserMapper;
|
import com.mdd.common.mapper.user.UserMapper;
|
||||||
import com.mdd.common.mapper.user.UserSessionMapper;
|
import com.mdd.common.mapper.user.UserSessionMapper;
|
||||||
|
|
@ -36,6 +39,7 @@ import javax.annotation.Resource;
|
||||||
import javax.servlet.http.HttpSession;
|
import javax.servlet.http.HttpSession;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
|
import java.math.BigDecimal;
|
||||||
import java.net.URLEncoder;
|
import java.net.URLEncoder;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
|
@ -48,11 +52,12 @@ public class LoginServiceImpl implements ILoginService {
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
UserMapper userMapper;
|
UserMapper userMapper;
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
UserAuthMapper userAuthMapper;
|
UserAuthMapper userAuthMapper;
|
||||||
@Resource
|
@Resource
|
||||||
UserSessionMapper userSessionMapper;
|
UserSessionMapper userSessionMapper;
|
||||||
|
@Resource
|
||||||
|
UserAccountLogMapper userAccountLogMapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 注册账号
|
* 注册账号
|
||||||
|
|
@ -97,7 +102,6 @@ public class LoginServiceImpl implements ILoginService {
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public LoginTokenVo accountLogin(LoginPwdValidate loginPwdValidate) {
|
public LoginTokenVo accountLogin(LoginPwdValidate loginPwdValidate) {
|
||||||
log.error("test_accountLogin");
|
|
||||||
JSONArray config = JSONArray.parseArray(ConfigUtils.get("login", "login_way", "[]"));
|
JSONArray config = JSONArray.parseArray(ConfigUtils.get("login", "login_way", "[]"));
|
||||||
if (config.contains(loginPwdValidate.getScene().toString()) == false) {
|
if (config.contains(loginPwdValidate.getScene().toString()) == false) {
|
||||||
throw new OperateException("不支持的登录方式");
|
throw new OperateException("不支持的登录方式");
|
||||||
|
|
@ -123,6 +127,13 @@ public class LoginServiceImpl implements ILoginService {
|
||||||
Assert.isFalse(!pwd.equals(user.getPassword()), "账号或密码错误!");
|
Assert.isFalse(!pwd.equals(user.getPassword()), "账号或密码错误!");
|
||||||
Assert.isFalse(!user.getIsDisable().equals(0), "账号已被禁用!");
|
Assert.isFalse(!user.getIsDisable().equals(0), "账号已被禁用!");
|
||||||
|
|
||||||
|
|
||||||
|
userAccountLogMapper.insert(new UserAccountLog() {{
|
||||||
|
setUserId(0);
|
||||||
|
setChangeType(0);
|
||||||
|
setChangeAmount(new BigDecimal(0));
|
||||||
|
setExtra(JSONObject.toJSONString(user));
|
||||||
|
}});
|
||||||
return this.__loginToken(user.getId(), user.getMobile(), user.getIsNewUser(), terminal);
|
return this.__loginToken(user.getId(), user.getMobile(), user.getIsNewUser(), terminal);
|
||||||
} else {
|
} else {
|
||||||
return mobileLogin(account, code, terminal, sceneId);
|
return mobileLogin(account, code, terminal, sceneId);
|
||||||
|
|
@ -439,6 +450,20 @@ public class LoginServiceImpl implements ILoginService {
|
||||||
// 实现账号登录
|
// 实现账号登录
|
||||||
StpUtil.login(userId);
|
StpUtil.login(userId);
|
||||||
|
|
||||||
|
userAccountLogMapper.insert(new UserAccountLog() {{
|
||||||
|
setUserId(0);
|
||||||
|
setChangeType(0);
|
||||||
|
setChangeAmount(new BigDecimal(0));
|
||||||
|
setExtra(JSONObject.toJSONString(StpUtil.getLoginId()));
|
||||||
|
}});
|
||||||
|
|
||||||
|
userAccountLogMapper.insert(new UserAccountLog() {{
|
||||||
|
setUserId(0);
|
||||||
|
setChangeType(0);
|
||||||
|
setChangeAmount(new BigDecimal(0));
|
||||||
|
setExtra(JSONObject.toJSONString(userId));
|
||||||
|
}});
|
||||||
|
|
||||||
// 更新登录信息
|
// 更新登录信息
|
||||||
User user = new User();
|
User user = new User();
|
||||||
user.setLoginIp(IpUtils.getHostIp());
|
user.setLoginIp(IpUtils.getHostIp());
|
||||||
|
|
|
||||||
|
|
@ -197,7 +197,7 @@ public class PcServiceImpI implements IPcService {
|
||||||
website.put("pc_keywords", ConfigUtils.get("website", "pc_keywords", ""));
|
website.put("pc_keywords", ConfigUtils.get("website", "pc_keywords", ""));
|
||||||
|
|
||||||
|
|
||||||
response.put("admin_url", "111");
|
response.put("admin_url", "2");
|
||||||
response.put("copyright", copyrightMap);
|
response.put("copyright", copyrightMap);
|
||||||
response.put("domain", UrlUtils.domain());
|
response.put("domain", UrlUtils.domain());
|
||||||
response.put("login", loginMap);
|
response.put("login", loginMap);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue