From 7354f5f57d0ad92495f4fb47bd1312fd1defb955 Mon Sep 17 00:00:00 2001
From: damonyuan <404054358@qq.com>
Date: Sat, 9 Nov 2024 12:01:47 +0800
Subject: [PATCH] debug

---
 .../front/service/impl/LoginServiceImpl.java  | 29 +++++++++++++++++--
 .../mdd/front/service/impl/PcServiceImpI.java |  2 +-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java
index 89648b28..28bfda48 100644
--- a/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java
@@ -4,14 +4,17 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.UserAuth;
 import com.mdd.common.entity.user.UserSession;
 import com.mdd.common.enums.LoginEnum;
 import com.mdd.common.enums.NoticeEnum;
 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.UserMapper;
 import com.mdd.common.mapper.user.UserSessionMapper;
@@ -36,6 +39,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.util.Map;
 
@@ -48,11 +52,12 @@ public class LoginServiceImpl implements ILoginService {
 
     @Resource
     UserMapper userMapper;
-
     @Resource
     UserAuthMapper userAuthMapper;
     @Resource
     UserSessionMapper userSessionMapper;
+    @Resource
+    UserAccountLogMapper userAccountLogMapper;
 
     /**
      * 注册账号
@@ -97,7 +102,6 @@ public class LoginServiceImpl implements ILoginService {
      */
     @Override
     public LoginTokenVo accountLogin(LoginPwdValidate loginPwdValidate) {
-        log.error("test_accountLogin");
         JSONArray config = JSONArray.parseArray(ConfigUtils.get("login", "login_way", "[]"));
         if (config.contains(loginPwdValidate.getScene().toString()) == false) {
             throw new OperateException("不支持的登录方式");
@@ -123,6 +127,13 @@ public class LoginServiceImpl implements ILoginService {
             Assert.isFalse(!pwd.equals(user.getPassword()), "账号或密码错误!");
             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);
         } else {
             return mobileLogin(account, code, terminal, sceneId);
@@ -439,6 +450,20 @@ public class LoginServiceImpl implements ILoginService {
         // 实现账号登录
         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.setLoginIp(IpUtils.getHostIp());
diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/PcServiceImpI.java b/server/like-front/src/main/java/com/mdd/front/service/impl/PcServiceImpI.java
index dc5fcd78..7f677158 100644
--- a/server/like-front/src/main/java/com/mdd/front/service/impl/PcServiceImpI.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/impl/PcServiceImpI.java
@@ -197,7 +197,7 @@ public class PcServiceImpI implements IPcService {
         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("domain", UrlUtils.domain());
         response.put("login", loginMap);