From eb434732cf341bab2ba0acf957d3adf5ba8ea6e7 Mon Sep 17 00:00:00 2001
From: tangfudong <280620913@qq.com>
Date: Thu, 4 Jan 2024 17:35:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E7=9A=84=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iotkit/web/controller/AuthController.java   | 17 +++++++++++++++++
 .../cc/iotkit/web/service/SysLoginService.java  |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/iot-starter/src/main/java/cc/iotkit/web/controller/AuthController.java b/iot-starter/src/main/java/cc/iotkit/web/controller/AuthController.java
index 54ed8b9e..260f7d72 100644
--- a/iot-starter/src/main/java/cc/iotkit/web/controller/AuthController.java
+++ b/iot-starter/src/main/java/cc/iotkit/web/controller/AuthController.java
@@ -19,6 +19,7 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.collection.CollUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -69,6 +70,22 @@ public class AuthController {
         return loginVo;
     }
 
+    /**
+     * 小程序登录(示例)
+     *
+     * @param xcxCode 小程序code
+     * @return 结果
+     */
+    @ApiOperation("小程序登录")
+    @PostMapping("/xcxLogin")
+    public LoginVo xcxLogin(@NotBlank(message = "{xcx.appId.not.blank}") String appId,@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
+        LoginVo loginVo = new LoginVo();
+        // 生成令牌
+        String token = loginService.xcxLogin(appId,xcxCode);
+        loginVo.setToken(token);
+        return loginVo;
+    }
+
 
     /**
      * 退出登录
diff --git a/iot-starter/src/main/java/cc/iotkit/web/service/SysLoginService.java b/iot-starter/src/main/java/cc/iotkit/web/service/SysLoginService.java
index 8fad215f..9e8b1a69 100644
--- a/iot-starter/src/main/java/cc/iotkit/web/service/SysLoginService.java
+++ b/iot-starter/src/main/java/cc/iotkit/web/service/SysLoginService.java
@@ -172,7 +172,7 @@ public class SysLoginService {
         // 生成token
         LoginHelper.loginByDevice(loginUser, DeviceType.XCX);
 
-//        recordLoginInfo(loginUser.getTenantId(), user.getNickName(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
+        recordLoginInfo(loginUser.getTenantId(), user.getNickName(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
 //        recordLoginInfo(user.getId());
         return StpUtil.getTokenValue();
     }