From fa94667c0f500ccbcc9371f7d409cd4f930bf97a Mon Sep 17 00:00:00 2001 From: xupei Date: Mon, 23 Dec 2024 16:07:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B8=B8=E5=AE=A2=E5=88=B0=E6=9C=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8D=E7=BD=AE=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/service/impl/AccountServiceImpl.java | 4 +++- src/main/resources/mapper/primary/AccountMapper.xml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 5840852e..204cd2d5 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -1488,12 +1488,14 @@ public class AccountServiceImpl extends ServiceImpl impl // 将新增用户添加到AiDA，身份为游客 if (!newUsersInfo.isEmpty()){ newUsersInfo.forEach(userInfo -> { + long epochMilli = Instant.now().toEpochMilli(); Account account = new Account(); account.setUserEmail(userInfo.get("email")); account.setUserName(userInfo.get("username")); account.setUserPassword("Third-000000"); account.setLanguage(Language.ENGLISH.name()); - account.setValidStartTime(Instant.now().toEpochMilli()); + account.setValidStartTime(epochMilli); + account.setValidEndTime(epochMilli); account.setCreateDate(new Date()); account.setIsTrial(0); account.setIsBeginner(1); diff --git a/src/main/resources/mapper/primary/AccountMapper.xml b/src/main/resources/mapper/primary/AccountMapper.xml index 643624d5..b9c76324 100644 --- a/src/main/resources/mapper/primary/AccountMapper.xml +++ b/src/main/resources/mapper/primary/AccountMapper.xml @@ -25,7 +25,7 @@ update t_account - set valid_end_time = null, is_trial = 0, credits = 0, system_user = 0, update_date = #{date} + set is_trial = 0, credits = 0, system_user = 0, update_date = #{date} where id = #{id} From 468ad385d7b9985843accde64c64bc7cb0a87811 Mon Sep 17 00:00:00 2001 From: xupei Date: Mon, 23 Dec 2024 17:29:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=B8=8D=E6=A0=A1=E9=AA=8C=E6=B8=B8=E5=AE=A2?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=9C=89=E6=95=88=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/service/impl/AccountServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 204cd2d5..95645efd 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -236,6 +236,9 @@ public class AccountServiceImpl extends ServiceImpl impl private void validateUserValidaExpire(Account account) { Long currentTime = new Date().getTime(); + if (account.getSystemUser().equals(0)){ + return; + } if (Objects.nonNull(account.getValidStartTime())) { if (currentTime < account.getValidStartTime()) { throw new BusinessException("user.expired"); @@ -243,7 +246,9 @@ public class AccountServiceImpl extends ServiceImpl impl } if (Objects.nonNull(account.getValidEndTime())) { if (currentTime > account.getValidEndTime()) { - throw new BusinessException("user.expired"); + toVisitor(account); + return; +// throw new BusinessException("user.expired"); } } }