From c87eefbc4d96caa458f527e403311ce0b57ebd81 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Tue, 13 Jul 2021 19:11:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.4=E3=80=91=E3=80=90auth=E3=80=91?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=BC=94=E7=A4=BA=E6=A8=A1=E5=BC=8F=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kernel-d-auth/auth-sdk/pom.xml                     |  7 +++++++
 .../roses/kernel/auth/auth/AuthServiceImpl.java    | 14 +++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/kernel-d-auth/auth-sdk/pom.xml b/kernel-d-auth/auth-sdk/pom.xml
index 654f72335..addcf4c36 100644
--- a/kernel-d-auth/auth-sdk/pom.xml
+++ b/kernel-d-auth/auth-sdk/pom.xml
@@ -17,6 +17,13 @@
 
     <dependencies>
 
+        <!--demo api-->
+        <dependency>
+            <groupId>cn.stylefeng.roses</groupId>
+            <artifactId>demo-api</artifactId>
+            <version>${roses.version}</version>
+        </dependency>
+
         <!--auth本模块的api-->
         <dependency>
             <groupId>cn.stylefeng.roses</groupId>
diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java
index 76a79a896..bb3c93b5f 100644
--- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java
+++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/AuthServiceImpl.java
@@ -47,6 +47,7 @@ import cn.stylefeng.roses.kernel.auth.api.pojo.auth.LoginRequest;
 import cn.stylefeng.roses.kernel.auth.api.pojo.auth.LoginResponse;
 import cn.stylefeng.roses.kernel.auth.api.pojo.auth.LoginWithTokenRequest;
 import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser;
+import cn.stylefeng.roses.kernel.demo.expander.DemoConfigExpander;
 import cn.stylefeng.roses.kernel.jwt.JwtTokenOperator;
 import cn.stylefeng.roses.kernel.jwt.api.context.JwtContext;
 import cn.stylefeng.roses.kernel.jwt.api.exception.JwtException;
@@ -332,12 +333,15 @@ public class AuthServiceImpl implements AuthServiceApi {
             }
         }
 
-        // 12. 更新用户登录时间和ip
-        String ip = HttpServletUtil.getRequestClientIp(HttpServletUtil.getRequest());
-        userServiceApi.updateUserLoginInfo(loginUser.getUserId(), new Date(), ip);
+        // 演示环境，跳过记录日志
+        if (!DemoConfigExpander.getDemoEnvFlag()) {
+            // 12. 更新用户登录时间和ip
+            String ip = HttpServletUtil.getRequestClientIp(HttpServletUtil.getRequest());
+            userServiceApi.updateUserLoginInfo(loginUser.getUserId(), new Date(), ip);
 
-        // 13.登录成功日志
-        loginLogServiceApi.loginSuccess(loginUser.getUserId());
+            // 13.登录成功日志
+            loginLogServiceApi.loginSuccess(loginUser.getUserId());
+        }
 
         // 14. 组装返回结果
         return new LoginResponse(loginUser, jwtToken, defaultJwtPayload.getExpirationDate());