From dd663d0ac783755d889e270eee57ee58630c88c8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:46:52 +0800
Subject: [PATCH] 冥想2.0新增代码

---
 xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/inner/InnerAppUserController.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/inner/InnerAppUserController.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/inner/InnerAppUserController.java
index cb76bbc..a3f47a1 100644
--- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/inner/InnerAppUserController.java
+++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/inner/InnerAppUserController.java
@@ -6,7 +6,7 @@
 import com.xinquan.system.api.model.AppLoginUser;
 import com.xinquan.system.api.model.AppVerifyCellPhoneBody;
 import com.xinquan.system.api.model.AppWXLoginBody;
-import com.xinquan.user.api.domain.AppUser;
+import com.xinquan.system.api.domain.AppUser;
 import com.xinquan.user.api.domain.dto.AppUserDTO;
 import com.xinquan.user.service.AppUserService;
 import java.util.Collection;
@@ -42,6 +42,11 @@
     R<Optional<AppUser>> getUserByCondition(@RequestBody AppUserDTO dto) {
         return R.ok(appUserService.getUserByCondition(dto));
     }
+    @InnerAuth
+    @PostMapping("/getUserByCondition1")
+    R<Optional<AppUser>> getUserByCondition1(@RequestBody AppUserDTO dto) {
+        return R.ok(appUserService.getUserByCondition1(dto));
+    }
 
     /**
      * APP用户注册
@@ -75,8 +80,8 @@
      */
     @InnerAuth
     @PostMapping("/appleLogin")
-    R<AppLoginUser> appleLogin(@RequestParam("appleId") String appleId) {
-        return R.ok(appUserService.appleLogin(appleId));
+    R<AppLoginUser> appleLogin(@RequestParam("appleId") String appleId,@RequestParam("device") String device) {
+        return R.ok(appUserService.appleLogin(appleId,device));
     }
 
     /**

--
Gitblit v1.7.1