新增

2025-07-09 17:58:30 +08:00
parent 4ddf4921b2
commit 396e92ac1b
22 changed files with 1120 additions and 1068 deletions
@@ -9,6 +9,23 @@ use support\Request;
 class AuthController extends BaseController
 {

+    /**
+     * 不需要头信息的方法
+     */
+    protected $noNeedHeader = ['feishuAuth'];
+
+
+    // 调试
+    public function feishuAuth(Request $request)
+    {
+        try {
+            $code = $request->all();
+            return $this->success($code);
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
    public function feishuScope(Request $request)
    {
        try {
@@ -22,7 +39,7 @@ class AuthController extends BaseController
    public function login(Request $request)
    {
        try {
-            $data = $this->validate(new UserValidate(), $request->post(), 'upwd_login');
+            $data = $this->validate(new UserValidate(), $this->requestData($request), $request->login_type.'_login');
            $result = (new AuthService())->login($data);
            return $this->success($result, '登录成功');
        } catch (\Throwable $e) {
@@ -33,11 +50,11 @@ class AuthController extends BaseController
    public function register(Request $request)
    {
        try {
-            $data = $this->validate(new UserValidate(), $request->post(), 'upwd_register');
+            $data = $this->validate(new UserValidate(), $this->requestData($request), $request->login_type.'_register');
            $result = (new AuthService())->register($data);
            return $this->success($result, '注册成功');
        } catch (\Throwable $e) {
-            return $this->error($e->getMessage().'|'.$e->getFile().'|'.$e->getLine());
+            return $this->error($e->getMessage());
        }
    }

@@ -5,6 +5,7 @@ namespace app\common\controller;
 use support\exception\BusinessException;
 use app\common\traits\ResponseTrait;
 use think\Validate;
+use support\Request;

 abstract class BaseController
 {
@@ -35,4 +36,12 @@ abstract class BaseController
        // 验证成功，返回原始数据
        return $data;
    }
+
+    /**
+     * 参数处理
+     */
+    public function requestData(Request $request)
+    {
+        return $request->all() + $request->basic_data;
+    }
 }