From 9275db50bbb355d3acbfa5fc016e1d89cc3f7b20 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 16 Sep 2022 14:23:40 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B0=83=E6=95=B4sql=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/install.sql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sql/install.sql b/sql/install.sql index fffbe2a1..e384bee5 100644 --- a/sql/install.sql +++ b/sql/install.sql @@ -502,13 +502,13 @@ CREATE TABLE `la_user` ( -- ---------------------------- DROP TABLE IF EXISTS `la_user_auth`; CREATE TABLE `la_user_auth` ( - `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', - `user_id` int(11) NOT NULL COMMENT '用户ID', - `openid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Openid', - `unionid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT 'Unionid', + `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', + `user_id` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '用户ID', + `openid` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Openid', + `unionid` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'Unionid', `client` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '客户端类型: [1=微信小程序, 2=微信公众号, 3=手机H5, 4=电脑PC, 5=苹果APP, 6=安卓APP]', - `create_time` int(10) UNSIGNED NULL DEFAULT 0 COMMENT '创建时间', - `update_time` int(10) UNSIGNED NULL DEFAULT 0 COMMENT '更新时间', + `create_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建时间', + `update_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `openid`(`openid`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户授权表' ROW_FORMAT = Dynamic; From 88f58f2be36413311798b6f39ded7b4d0e6cc90e Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 16 Sep 2022 14:46:02 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mdd/front/service/impl/LoginServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 b9c06d79..525b602e 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 @@ -2,6 +2,7 @@ package com.mdd.front.service.impl; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.mdd.common.config.GlobalConfig; @@ -93,18 +94,22 @@ public class LoginServiceImpl implements ILoginService { Integer client = Integer.parseInt(params.getOrDefault("client", "1")); try { + log.error("来登录了"); WxMaService wxMaService = WeChatUtil.mnp(); WxMaJscode2SessionResult sessionResult = wxMaService.getUserService().getSessionInfo(code); String openId = sessionResult.getOpenid(); String uniId = sessionResult.getUnionid(); String unionId = uniId == null ? "0" : uniId; + log.error("内容啊"); + log.error(String.valueOf(sessionResult)); UserAuth userAuth = userAuthMapper.selectOne(new QueryWrapper() .nested(wq->wq .eq("openid", openId).or() .eq("unionid", unionId) ).last("limit 1")); - + log.error("有接口公共"); + log.error(userAuth); User user = null; Integer userId; if (StringUtil.isNotNull(userAuth)) { @@ -161,7 +166,7 @@ public class LoginServiceImpl implements ILoginService { user.setLastLoginTime(System.currentTimeMillis() / 1000); userMapper.updateById(user); } - +log.error("能来码"); String token = ToolsUtil.makeToken(); RedisUtil.set(FrontConfig.frontendTokenKey+token, userId, 7200); From 11aac78bdff218f4a81ee8f941903c864d5d8320 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 16 Sep 2022 14:48:00 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mdd/front/service/impl/LoginServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 525b602e..a904600c 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 @@ -109,7 +109,7 @@ public class LoginServiceImpl implements ILoginService { .eq("unionid", unionId) ).last("limit 1")); log.error("有接口公共"); - log.error(userAuth); + log.error(String.valueOf(userAuth)); User user = null; Integer userId; if (StringUtil.isNotNull(userAuth)) { From b88815e4960c8e8c5aaa6800bce2c97922b50109 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 16 Sep 2022 15:07:29 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mdd/front/service/impl/LoginServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) 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 a904600c..c98e099e 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 @@ -167,6 +167,10 @@ public class LoginServiceImpl implements ILoginService { userMapper.updateById(user); } log.error("能来码"); + log.error(String.valueOf(user)); + log.error(user.getMobile()); + + String token = ToolsUtil.makeToken(); RedisUtil.set(FrontConfig.frontendTokenKey+token, userId, 7200); From 7b99dc180633d1449a5f34d3714a5bd0788d5aa2 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 16 Sep 2022 15:10:55 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdd/front/service/impl/LoginServiceImpl.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 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 c98e099e..68a5d4c3 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 @@ -94,22 +94,18 @@ public class LoginServiceImpl implements ILoginService { Integer client = Integer.parseInt(params.getOrDefault("client", "1")); try { - log.error("来登录了"); WxMaService wxMaService = WeChatUtil.mnp(); WxMaJscode2SessionResult sessionResult = wxMaService.getUserService().getSessionInfo(code); String openId = sessionResult.getOpenid(); String uniId = sessionResult.getUnionid(); String unionId = uniId == null ? "0" : uniId; - log.error("内容啊"); - log.error(String.valueOf(sessionResult)); UserAuth userAuth = userAuthMapper.selectOne(new QueryWrapper() .nested(wq->wq .eq("openid", openId).or() .eq("unionid", unionId) ).last("limit 1")); - log.error("有接口公共"); - log.error(String.valueOf(userAuth)); + User user = null; Integer userId; if (StringUtil.isNotNull(userAuth)) { @@ -166,17 +162,15 @@ public class LoginServiceImpl implements ILoginService { user.setLastLoginTime(System.currentTimeMillis() / 1000); userMapper.updateById(user); } -log.error("能来码"); - log.error(String.valueOf(user)); - log.error(user.getMobile()); - String token = ToolsUtil.makeToken(); RedisUtil.set(FrontConfig.frontendTokenKey+token, userId, 7200); + String mobile = StringUtil.isNull(user.getMobile()) ? "" : user.getMobile(); + Map response = new LinkedHashMap<>(); response.put("id", userId); - response.put("isBindMobile", !user.getMobile().equals("")); + response.put("isBindMobile", !mobile.equals("")); response.put("token", token); return response; } catch (WxErrorException e) { From ba3c608e6dc96439cba4f44b3c93222ce7d263e9 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 16 Sep 2022 15:16:04 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mdd/admin/service/user/impl/UserServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/user/impl/UserServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/user/impl/UserServiceImpl.java index 823cf0f4..d8f199b1 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/user/impl/UserServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/user/impl/UserServiceImpl.java @@ -124,8 +124,12 @@ public class UserServiceImpl implements IUserService { vo.setSex(user.getSex()); vo.setAvatar(UrlUtil.toAbsoluteUrl(user.getAvatar())); vo.setChannel(ClientEnum.getMsgByCode(user.getChannel())); - vo.setLastLoginTime(TimeUtil.timestampToDate(user.getLastLoginTime())); vo.setCreateTime(TimeUtil.timestampToDate(user.getCreateTime())); + if (user.getLastLoginTime() <= 0) { + vo.setLastLoginTime("无"); + } else { + vo.setLastLoginTime(TimeUtil.timestampToDate(user.getLastLoginTime())); + } return vo; }