From 2f22341e165797f1bb9b757f480e7f792f08c0f9 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 20 Mar 2025 16:57:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/core/auth/oauth/controller/AuthController.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/oauth/controller/AuthController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/oauth/controller/AuthController.java
index 305cf813..cebe7e60 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/oauth/controller/AuthController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/oauth/controller/AuthController.java
@@ -162,8 +162,8 @@ public class AuthController {
 
    @ApiOperation("设备认证")
    @PostMapping({"/device/login"})
-   public AjaxResult deviceLogin(@RequestHeader Map<String, String> header, @RequestBody String request) {
-      String deviceSn = SmUtils.decryptBySm2(request);
+   public AjaxResult deviceLogin(@RequestHeader Map<String, String> header, @RequestParam String encryptedDeviceSn) {
+      String deviceSn = SmUtils.decryptBySm2(encryptedDeviceSn);
       String encryptKey = HeaderFetchUtil.getValueFromHeadersIgnoreCase(header, this.secureProperties.getSecurity().getServerEncryptedClientKeyHeaderName());
       String clientKey = SmUtils.decryptBySm4WithServerKey(encryptKey);
       if (CharSequenceUtil.isEmpty(deviceSn)) {

From 481834f7ac6962c89553b2b0866e8b5c5686c862 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 20 Mar 2025 18:16:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/core/auth/oauth/controller/AuthController.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/oauth/controller/AuthController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/oauth/controller/AuthController.java
index cebe7e60..3dd83f11 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/oauth/controller/AuthController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/auth/oauth/controller/AuthController.java
@@ -14,6 +14,7 @@ import com.bonus.canteen.core.auth.user.dto.UserLoginDTO;
 import com.bonus.canteen.core.common.utils.TenantContextHolder;
 import com.bonus.canteen.core.config.*;
 import com.bonus.canteen.core.customer.model.PigxUser;
+import com.bonus.canteen.core.device.manage.model.DeviceInfo;
 import com.bonus.canteen.core.device.mq.MacMessageService;
 import com.bonus.canteen.core.merchant.entity.MercMerchant;
 import com.bonus.canteen.core.open.modules.auth.constants.CheckEnum;
@@ -169,7 +170,7 @@ public class AuthController {
       if (CharSequenceUtil.isEmpty(deviceSn)) {
          return AjaxResult.success();
       } else {
-         DeviceInfoInSystem deviceInfo = this.deviceInfoService.getBySnInSys(deviceSn);
+         DeviceInfo deviceInfo = this.deviceInfoService.getBySn(deviceSn);
          if (ObjectUtil.isNull(deviceInfo)) {
             return AjaxResult.success();
          } else {