From bf1f98c5b741f6b523194c427cc07b484088e150 Mon Sep 17 00:00:00 2001
From: xiaodai <1318762926@qq.com>
Date: Thu, 14 Aug 2025 12:04:12 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=B9=E5=AF=86=E7=A0=81rsa=E5=AF=86=E6=96=87=E4=BC=A0?=
 =?UTF-8?q?=E8=BE=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/admin/controller/LoginController.php  | 19 +++++++++---
 .../services/system/SysAdminService.php       | 29 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/server/app/admin/controller/LoginController.php b/server/app/admin/controller/LoginController.php
index 25fcf34..68f77af 100644
--- a/server/app/admin/controller/LoginController.php
+++ b/server/app/admin/controller/LoginController.php
@@ -13,6 +13,7 @@
 namespace app\admin\controller;
 
 use app\common\services\system\SysAdminService;
+use core\cache\CacheService;
 use core\exception\handler\AdminException;
 use core\jwt\JwtToken;
 use core\utils\Json;
@@ -55,7 +56,18 @@ class LoginController extends Crud
      */
     public function getCaptchaOpenFlag(Request $request): \support\Response
     {
-        return Json::success('ok', ['flag' => config('core.captcha.app.enable', false)]);
+        try {
+            // 生成密钥对
+            $cache = Container::make(CacheService::class,[]);
+            // 使用 uniqid 增加唯一性
+            $keyId = bin2hex(random_bytes(8)) . uniqid();
+            $keys = $this->service->generateRSAKeys();
+            // 存储私钥到缓存，用于解密密码
+            $cache->set("rsa_private_key:$keyId", $keys['private'], 60); // 5分钟过期
+            return Json::success('ok', ['flag' => config('core.captcha.app.enable', false),'key_id'=>$keyId,'public_key'=>$keys['public']]);
+        } catch (\Throwable $e) {
+            return Json::fail($e->getMessage());
+        }
     }
 
     /**
@@ -113,9 +125,8 @@ class LoginController extends Crud
             $code      = $request->input('code', '');
             $uuid      = $request->input('uuid', '');
             $type      = $request->input('type', 'admin');
-            $tenantId  = $request->input('tenant_id', '');
             $grantType = $request->input('grant_type', 'default');//refresh_token   sms   default 可以自行定义拓展登录方式
-
+            $keyId     = $request->input('key_id', '');//获取公钥Id
             $service = Container::make(SysAdminService::class);
 
             $captcha = new Captcha();
@@ -139,7 +150,7 @@ class LoginController extends Crud
                 }
                 $username = $info->getData('user_name');
             }
-            $data = $service->login($username, $password, $type, $grantType, $tenantId);
+            $data = $service->login($username, $password, $type, $grantType, ['keyId'=> $keyId ?? '']);
             return Json::success('ok', $data);
         } catch (\Throwable $e) {
             return Json::fail($e->getMessage());
diff --git a/server/app/common/services/system/SysAdminService.php b/server/app/common/services/system/SysAdminService.php
index e5f3bff..390fa55 100644
--- a/server/app/common/services/system/SysAdminService.php
+++ b/server/app/common/services/system/SysAdminService.php
@@ -15,6 +15,7 @@ namespace app\common\services\system;
 use app\common\dao\system\SysAdminDao;
 use app\common\model\system\SysAdmin;
 use core\abstract\BaseService;
+use core\cache\CacheService;
 use core\casbin\Permission;
 use core\enum\system\PolicyPrefix;
 use core\exception\handler\AdminException;
@@ -244,10 +245,12 @@ class SysAdminService extends BaseService
      * @return array
      * @throws \Exception
      */
-    public function login(string $username, string $password = '', string $type = 'admin', string $grantType = 'default', string|int $tenantId = ''): array
+    public function login(string $username, string $password = '', string $type = 'admin', string $grantType = 'default', array $params = []): array
     {
         $adminInfo = $this->getAdminByName($username);
         $this->validateAdminStatus($adminInfo);
+        $decryptedPassword = $this->validateRsaKeys($params['keyId'], $password);
+        $this->validatePassword($adminInfo, $decryptedPassword, $grantType);
         $this->validatePassword($adminInfo, $password, $grantType);
         [$userInfo, $token] = $this->generateTokenData($adminInfo, $type);
         $this->emitLoginSuccessEvent(array_merge($userInfo, $token), $tenant?->id ?? null);
@@ -481,4 +484,28 @@ class SysAdminService extends BaseService
         preg_match($pattern, $url, $matches);
         return $matches[1] ?? '';
     }
+    /**
+     * 校验密钥
+     * @param $keyId
+     * @param $encryptedPassword
+     * @return string
+     * @throws AdminException
+     */
+    private function validateRsaKeys($keyId, $encryptedPassword): string
+    {
+        $cache = Container::make(CacheService::class,[]);
+        $privateKey = $cache->get("rsa_private_key:$keyId");
+        if (!$privateKey) {
+            throw new AdminException('私钥不存在或已过期，请刷新页面重试');
+        }
+        $privateKeyResource = openssl_pkey_get_private($privateKey);
+        $decrypted = '';
+        $encryptedData = base64_decode($encryptedPassword);
+        if (openssl_private_decrypt($encryptedData, $decrypted, $privateKeyResource)) {
+            $cache->delete("rsa_private_key:$keyId"); // 删除私钥，防止泄露
+            return $decrypted;
+        } else {
+            throw new AdminException('解密失败！');
+        }
+    }
 }
-- 
Gitee


From f4736d33a00082c53ea1eeec7d2dfcf34cd8c4fa Mon Sep 17 00:00:00 2001
From: xiaodai <1318762926@qq.com>
Date: Thu, 14 Aug 2025 14:25:58 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=AF=86=E7=A0=81rsa=E5=8A=A0=E5=AF=86?=
 =?UTF-8?q?=E4=BC=A0=E8=BE=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/core/authentication/login.vue | 105 +++++++++++---------
 1 file changed, 57 insertions(+), 48 deletions(-)

diff --git a/web/src/views/core/authentication/login.vue b/web/src/views/core/authentication/login.vue
index 2754f86..314500a 100644
--- a/web/src/views/core/authentication/login.vue
+++ b/web/src/views/core/authentication/login.vue
@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import type { BasicFormSchema } from '#/components/common-ui';
-import type { BasicOption } from '#/components/common/types';
 
 import { computed, markRaw, onMounted, ref, useTemplateRef } from 'vue';
 
@@ -9,7 +8,7 @@ import { $t } from '#/locale';
 
 import { useAuthStore } from '#/store';
 import { captcha, getCaptchaOpenFlag, type AuthApi } from '#/api/core';
-
+import { JSEncrypt } from 'jsencrypt';
 defineOptions({ name: 'Login' });
 
 const loginFormRef = useTemplateRef('loginFormRef');
@@ -17,13 +16,6 @@ const authStore = useAuthStore();
 const captchaFlag = ref(true);
 const refreshCaptcha = ref(false);
 
-
-const accountSetData =ref<any>({
-  tenant_enabled: false,//是否开启账套模式
-  list: [],//账套列表
-});
-
-
 // 判断是否启用图验证码
 getCaptchaOpenFlag().then((res: any) => {
   captchaFlag.value = res.flag;
@@ -36,30 +28,6 @@ onMounted(async () => {
 const formSchema = computed((): BasicFormSchema[] => {
   // 公共字段
   const commonFields = [
-    {
-      component: 'BasicSelect',
-      defaultValue: '',
-      componentProps: {
-        placeholder: '',
-        options:accountSetData.value.list?.map((item: { name: string; tenant_id: string|number; }) => ({
-          label: item.name,
-          value: item.tenant_id,
-        })),
-      },
-      fieldName: 'tenant_id',
-      rules: z.union([
-        z.string().min(1, { message: '请选择对应数据源' }),
-        z.number()
-      ]),
-      formItemClass: 'col-span-12',
-      dependencies: {
-        if: () => accountSetData.value.tenant_enabled,
-        componentProps: (_values: { tenant_id: string|number}) => {
-          return {};
-        },
-        triggerFields: ['', 'tenant_id'],
-      },
-    },
     {
       component: 'BasicInput',
       defaultValue: '',
@@ -119,25 +87,66 @@ const formSchema = computed((): BasicFormSchema[] => {
   return commonFields;
 });
 
-
-const handleSubmit = (data: any) => {
-  authStore.authLogin(data).catch(() => {
-    refreshCaptcha.value = true;
-  });
+const handleSubmit = async (data: any) => {
+  try {
+    // 获取加密相关信息（包括公钥和key_id）
+    const captchaRes: any = await getCaptchaOpenFlag();
+
+    // 检查是否返回了公钥和key_id
+    if (captchaRes.public_key && captchaRes.key_id) {
+      // 创建 JSEncrypt 实例
+      const encrypt = new JSEncrypt();
+      // 设置公钥
+      encrypt.setPublicKey(captchaRes.public_key);
+
+      // 对密码进行 RSA 加密
+      const encryptedPassword = encrypt.encrypt(data.password);
+
+      if (encryptedPassword) {
+        // 修改提交数据，添加 key_id 并替换密码为加密后的密码
+        const submitData = {
+          user_name: data.user_name,
+          password: encryptedPassword, // 使用加密后的密码
+          key_id: captchaRes.key_id    // 添加 key_id
+        };
+
+        // 如果有验证码相关字段，也添加进去
+        if (data.code) {
+          submitData.code = data.code;
+        }
+        if (data.uuid) {
+          submitData.uuid = data.uuid;
+        }
+
+        await authStore.authLogin(submitData).catch(() => {
+          refreshCaptcha.value = true;
+        });
+      } else {
+        console.error('RSA encryption failed');
+        // 可以添加用户提示
+      }
+    } else {
+      console.error('Missing public key or key_id for encryption');
+      // 可以添加用户提示
+    }
+  } catch (error) {
+    console.error('Login encryption process failed:', error);
+    // 可以添加用户提示
+  }
 };
 </script>
 
 <template>
   <AuthenticationLogin
-    ref="loginFormRef"
-    :form-schema="formSchema"
-    :loading="authStore.loginLoading"
-    :show-code-login="true"
-    :show-forget-password="false"
-    :show-qrcode-login="true"
-    :show-register="false"
-    :show-remember-me="false"
-    :show-third-party-login="false"
-    @submit="handleSubmit"
+      ref="loginFormRef"
+      :form-schema="formSchema"
+      :loading="authStore.loginLoading"
+      :show-code-login="true"
+      :show-forget-password="false"
+      :show-qrcode-login="true"
+      :show-register="false"
+      :show-remember-me="false"
+      :show-third-party-login="false"
+      @submit="handleSubmit"
   />
 </template>
-- 
Gitee


From 39af890d0ae577e3dc4451096e05394587839ca0 Mon Sep 17 00:00:00 2001
From: xiaodai <1318762926@qq.com>
Date: Thu, 14 Aug 2025 15:36:39 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81=E6=9C=AA=E5=BC=80=E5=90=AF=E4=B9=9F=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/core/authentication/login.vue | 117 ++++++++++----------
 1 file changed, 61 insertions(+), 56 deletions(-)

diff --git a/web/src/views/core/authentication/login.vue b/web/src/views/core/authentication/login.vue
index 314500a..1013e7b 100644
--- a/web/src/views/core/authentication/login.vue
+++ b/web/src/views/core/authentication/login.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { BasicFormSchema } from '#/components/common-ui';
 
-import { computed, markRaw, onMounted, ref, useTemplateRef } from 'vue';
+import { computed, nextTick, markRaw, onMounted, ref, useTemplateRef, watch } from 'vue';
 
 import { AuthenticationLogin, ImageCaptcha, z } from '#/components/common-ui';
 import { $t } from '#/locale';
@@ -15,17 +15,10 @@ const loginFormRef = useTemplateRef('loginFormRef');
 const authStore = useAuthStore();
 const captchaFlag = ref(true);
 const refreshCaptcha = ref(false);
+const formSchemaRef = ref<BasicFormSchema[]>([]); // 新增：用于存储最新的表单结构
 
-// 判断是否启用图验证码
-getCaptchaOpenFlag().then((res: any) => {
-  captchaFlag.value = res.flag;
-});
-
-onMounted(async () => {
-
-});
-
-const formSchema = computed((): BasicFormSchema[] => {
+// 更新表单结构的函数
+const updateFormSchema = (flag: boolean) => {
   // 公共字段
   const commonFields = [
     {
@@ -52,9 +45,9 @@ const formSchema = computed((): BasicFormSchema[] => {
     },
   ];
 
-  // 根据 captchaFlag 添加验证码相关字段
-  if (captchaFlag.value) {
-    return [
+  // 根据 flag 添加验证码相关字段
+  if (flag) {
+    formSchemaRef.value = [
       ...commonFields,
       {
         component: 'BasicInput',
@@ -82,56 +75,68 @@ const formSchema = computed((): BasicFormSchema[] => {
         formItemClass: 'col-span-4',
       },
     ];
+  } else {
+    formSchemaRef.value = commonFields;
   }
+};
 
-  return commonFields;
+// 判断是否启用图验证码
+getCaptchaOpenFlag().then((res: any) => {
+  captchaFlag.value = res.flag;
+  // 使用 nextTick 确保 DOM 更新
+  nextTick(() => {
+    updateFormSchema(res.flag);
+  });
+});
+
+// 监听 captchaFlag 变化
+watch(captchaFlag, (newFlag) => {
+  updateFormSchema(newFlag);
 });
 
 const handleSubmit = async (data: any) => {
   try {
-    // 获取加密相关信息（包括公钥和key_id）
-    const captchaRes: any = await getCaptchaOpenFlag();
-
-    // 检查是否返回了公钥和key_id
-    if (captchaRes.public_key && captchaRes.key_id) {
-      // 创建 JSEncrypt 实例
-      const encrypt = new JSEncrypt();
-      // 设置公钥
-      encrypt.setPublicKey(captchaRes.public_key);
-
-      // 对密码进行 RSA 加密
-      const encryptedPassword = encrypt.encrypt(data.password);
-
-      if (encryptedPassword) {
-        // 修改提交数据，添加 key_id 并替换密码为加密后的密码
-        const submitData = {
-          user_name: data.user_name,
-          password: encryptedPassword, // 使用加密后的密码
-          key_id: captchaRes.key_id    // 添加 key_id
-        };
-
-        // 如果有验证码相关字段，也添加进去
-        if (data.code) {
-          submitData.code = data.code;
-        }
-        if (data.uuid) {
-          submitData.uuid = data.uuid;
+      // 获取加密相关信息（包括公钥和key_id）
+      const captchaRes: any = await getCaptchaOpenFlag();
+
+      // 检查是否返回了公钥和key_id
+      if (captchaRes.public_key && captchaRes.key_id) {
+        // 创建 JSEncrypt 实例
+        const encrypt = new JSEncrypt();
+        // 设置公钥
+        encrypt.setPublicKey(captchaRes.public_key);
+
+        // 对密码进行 RSA 加密
+        const encryptedPassword = encrypt.encrypt(data.password);
+
+        if (encryptedPassword) {
+          // 修改提交数据，添加 key_id 并替换密码为加密后的密码
+          const submitData = {
+            user_name: data.user_name,
+            password: encryptedPassword, // 使用加密后的密码
+            key_id: captchaRes.key_id    // 添加 key_id
+          };
+
+          // 如果有验证码相关字段，也添加进去
+          if (data.code) {
+            submitData.code = data.code;
+          }
+          if (data.uuid) {
+            submitData.uuid = data.uuid;
+          }
+
+          await authStore.authLogin(submitData).catch(() => {
+            refreshCaptcha.value = true;
+          });
+        } else {
+          console.error('RSA encryption failed');
         }
-
-        await authStore.authLogin(submitData).catch(() => {
-          refreshCaptcha.value = true;
-        });
       } else {
-        console.error('RSA encryption failed');
-        // 可以添加用户提示
+        console.error('Missing public key or key_id for encryption');
       }
-    } else {
-      console.error('Missing public key or key_id for encryption');
-      // 可以添加用户提示
-    }
+
   } catch (error) {
-    console.error('Login encryption process failed:', error);
-    // 可以添加用户提示
+    console.error('Login process failed:', error);
   }
 };
 </script>
@@ -139,7 +144,7 @@ const handleSubmit = async (data: any) => {
 <template>
   <AuthenticationLogin
       ref="loginFormRef"
-      :form-schema="formSchema"
+      :form-schema="formSchemaRef"
       :loading="authStore.loginLoading"
       :show-code-login="true"
       :show-forget-password="false"
@@ -149,4 +154,4 @@ const handleSubmit = async (data: any) => {
       :show-third-party-login="false"
       @submit="handleSubmit"
   />
-</template>
+</template>
\ No newline at end of file
-- 
Gitee


From 29e2ca9014653c6e478724df8f2df8b3055c754e Mon Sep 17 00:00:00 2001
From: xiaodai <1318762926@qq.com>
Date: Thu, 14 Aug 2025 17:40:16 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E8=BF=9B=E8=A1=8Crsa=E5=8A=A0=E5=AF=86?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/core/authentication/login.vue | 166 ++++++++++----------
 1 file changed, 79 insertions(+), 87 deletions(-)

diff --git a/web/src/views/core/authentication/login.vue b/web/src/views/core/authentication/login.vue
index 1013e7b..a04a414 100644
--- a/web/src/views/core/authentication/login.vue
+++ b/web/src/views/core/authentication/login.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup>
 import type { BasicFormSchema } from '#/components/common-ui';
 
-import { computed, nextTick, markRaw, onMounted, ref, useTemplateRef, watch } from 'vue';
+import { computed, markRaw, onMounted, ref, useTemplateRef } from 'vue';
 
 import { AuthenticationLogin, ImageCaptcha, z } from '#/components/common-ui';
 import { $t } from '#/locale';
 
 import { useAuthStore } from '#/store';
-import { captcha, getCaptchaOpenFlag, type AuthApi } from '#/api/core';
+import { captcha, getCaptchaOpenFlag } from '#/api/core';
+
 import { JSEncrypt } from 'jsencrypt';
 defineOptions({ name: 'Login' });
 
@@ -15,39 +16,57 @@ const loginFormRef = useTemplateRef('loginFormRef');
 const authStore = useAuthStore();
 const captchaFlag = ref(true);
 const refreshCaptcha = ref(false);
-const formSchemaRef = ref<BasicFormSchema[]>([]); // 新增：用于存储最新的表单结构
-
-// 更新表单结构的函数
-const updateFormSchema = (flag: boolean) => {
-  // 公共字段
-  const commonFields = [
-    {
-      component: 'BasicInput',
-      defaultValue: '',
-      componentProps: {
-        placeholder: $t('authentication.usernameTip'),
-      },
-      fieldName: 'user_name',
-      label: $t('authentication.username'),
-      rules: z.string().min(1, { message: $t('authentication.usernameTip') }),
-      formItemClass: 'col-span-12',
+const captchaData = ref<any>(null);
+const isCaptchaLoaded = ref(false); // 添加加载状态
+
+// 公共字段（用户名和密码）
+const commonFields = [
+  {
+    component: 'BasicInput',
+    defaultValue: '',
+    componentProps: {
+      placeholder: $t('authentication.usernameTip'),
     },
-    {
-      component: 'BasicInputPassword',
-      defaultValue: '',
-      componentProps: {
-        placeholder: $t('authentication.password'),
-      },
-      fieldName: 'password',
-      label: $t('authentication.password'),
-      rules: z.string().min(1, { message: $t('authentication.passwordTip') }),
-      formItemClass: 'col-span-12',
+    fieldName: 'user_name',
+    label: $t('authentication.username'),
+    rules: z.string().min(1, { message: $t('authentication.usernameTip') }),
+    formItemClass: 'col-span-12',
+  },
+  {
+    component: 'BasicInputPassword',
+    defaultValue: '',
+    componentProps: {
+      placeholder: $t('authentication.password'),
     },
-  ];
+    fieldName: 'password',
+    label: $t('authentication.password'),
+    rules: z.string().min(1, { message: $t('authentication.passwordTip') }),
+    formItemClass: 'col-span-12',
+  },
+];
+
+// 判断是否启用图验证码
+onMounted(async () => {
+  try {
+    const res: any = await getCaptchaOpenFlag();
+    captchaData.value = res;
+    captchaFlag.value = res.flag;
+    isCaptchaLoaded.value = true; // 标记加载完成
+  } catch (error) {
+    isCaptchaLoaded.value = true; // 即使失败也标记加载完成
+  }
+});
 
-  // 根据 flag 添加验证码相关字段
-  if (flag) {
-    formSchemaRef.value = [
+const formSchema = computed((): BasicFormSchema[] => {
+  // 在配置加载完成前，先返回基础字段（用户名和密码）
+  if (!isCaptchaLoaded.value) {
+    return commonFields;
+  }
+
+  // 根据 captchaFlag 添加验证码相关字段
+  if (captchaFlag.value) {
+
+    return [
       ...commonFields,
       {
         component: 'BasicInput',
@@ -75,66 +94,39 @@ const updateFormSchema = (flag: boolean) => {
         formItemClass: 'col-span-4',
       },
     ];
-  } else {
-    formSchemaRef.value = commonFields;
   }
-};
 
-// 判断是否启用图验证码
-getCaptchaOpenFlag().then((res: any) => {
-  captchaFlag.value = res.flag;
-  // 使用 nextTick 确保 DOM 更新
-  nextTick(() => {
-    updateFormSchema(res.flag);
-  });
-});
-
-// 监听 captchaFlag 变化
-watch(captchaFlag, (newFlag) => {
-  updateFormSchema(newFlag);
+  return commonFields;
 });
 
-const handleSubmit = async (data: any) => {
+const handleSubmit = (data: any) => {
   try {
-      // 获取加密相关信息（包括公钥和key_id）
-      const captchaRes: any = await getCaptchaOpenFlag();
-
-      // 检查是否返回了公钥和key_id
-      if (captchaRes.public_key && captchaRes.key_id) {
-        // 创建 JSEncrypt 实例
-        const encrypt = new JSEncrypt();
-        // 设置公钥
-        encrypt.setPublicKey(captchaRes.public_key);
-
-        // 对密码进行 RSA 加密
-        const encryptedPassword = encrypt.encrypt(data.password);
-
-        if (encryptedPassword) {
-          // 修改提交数据，添加 key_id 并替换密码为加密后的密码
-          const submitData = {
-            user_name: data.user_name,
-            password: encryptedPassword, // 使用加密后的密码
-            key_id: captchaRes.key_id    // 添加 key_id
-          };
-
-          // 如果有验证码相关字段，也添加进去
-          if (data.code) {
-            submitData.code = data.code;
-          }
-          if (data.uuid) {
-            submitData.uuid = data.uuid;
-          }
-
-          await authStore.authLogin(submitData).catch(() => {
-            refreshCaptcha.value = true;
-          });
-        } else {
-          console.error('RSA encryption failed');
-        }
+    const currentCaptchaData = captchaData.value;
+    const { public_key, key_id } = currentCaptchaData;
+    if (public_key && key_id) {
+      const encrypt = new JSEncrypt();
+      encrypt.setPublicKey(public_key);
+      const encryptedPassword = encrypt.encrypt(data.password);
+
+      if (encryptedPassword) {
+        const submitData = {
+          user_name: data.user_name,
+          password: encryptedPassword,
+          key_id,
+        };
+
+        if (captchaFlag.value && data.code) submitData.code = data.code;
+        if (captchaFlag.value && data.uuid) submitData.uuid = data.uuid;
+
+        authStore.authLogin(submitData).catch(() => {
+          refreshCaptcha.value = true;
+        });
       } else {
-        console.error('Missing public key or key_id for encryption');
+        console.error('RSA encryption failed');
       }
-
+    } else {
+      console.error('Missing public key or key_id for encryption');
+    }
   } catch (error) {
     console.error('Login process failed:', error);
   }
@@ -144,7 +136,7 @@ const handleSubmit = async (data: any) => {
 <template>
   <AuthenticationLogin
       ref="loginFormRef"
-      :form-schema="formSchemaRef"
+      :form-schema="formSchema"
       :loading="authStore.loginLoading"
       :show-code-login="true"
       :show-forget-password="false"
@@ -154,4 +146,4 @@ const handleSubmit = async (data: any) => {
       :show-third-party-login="false"
       @submit="handleSubmit"
   />
-</template>
\ No newline at end of file
+</template>
-- 
Gitee


From cec53e199f7cc7ff379f78a23853a251f15f6686 Mon Sep 17 00:00:00 2001
From: xiaodai <1318762926@qq.com>
Date: Fri, 15 Aug 2025 07:52:22 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=9A=84=E5=8A=A0=E5=AF=86=E4=BB=A3=E7=A0=81=E5=92=8Cpnpm?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=86=E5=BA=93=E5=8C=85=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/app/common/services/system/SysAdminService.php | 1 -
 web/package.json                                      | 1 +
 web/pnpm-lock.yaml                                    | 3 +++
 web/src/api/core/auth.ts                              | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/app/common/services/system/SysAdminService.php b/server/app/common/services/system/SysAdminService.php
index 390fa55..81a4e71 100644
--- a/server/app/common/services/system/SysAdminService.php
+++ b/server/app/common/services/system/SysAdminService.php
@@ -251,7 +251,6 @@ class SysAdminService extends BaseService
         $this->validateAdminStatus($adminInfo);
         $decryptedPassword = $this->validateRsaKeys($params['keyId'], $password);
         $this->validatePassword($adminInfo, $decryptedPassword, $grantType);
-        $this->validatePassword($adminInfo, $password, $grantType);
         [$userInfo, $token] = $this->generateTokenData($adminInfo, $type);
         $this->emitLoginSuccessEvent(array_merge($userInfo, $token), $tenant?->id ?? null);
         return $token ?? [];
diff --git a/web/package.json b/web/package.json
index e4ee023..59db538 100644
--- a/web/package.json
+++ b/web/package.json
@@ -39,6 +39,7 @@
     "dotenv": "^16.4.7",
     "echarts": "^5.6.0",
     "epic-designer": "^1.0.1",
+    "jsencrypt": "^3.5.4",
     "lodash-es": "^4.17.21",
     "lodash.clonedeep": "^4.5.0",
     "lodash.get": "^4.4.2",
diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
index a61c676..510e477 100644
--- a/web/pnpm-lock.yaml
+++ b/web/pnpm-lock.yaml
@@ -86,6 +86,9 @@ importers:
       epic-designer:
         specifier: ^1.0.1
         version: 1.0.1(ant-design-vue@4.2.6(vue@3.5.13(typescript@5.7.3)))(element-plus@2.9.9(vue@3.5.13(typescript@5.7.3)))(monaco-editor@0.52.2)(naive-ui@2.41.0(vue@3.5.13(typescript@5.7.3)))(vue@3.5.13(typescript@5.7.3))
+      jsencrypt:
+        specifier: ^3.5.4
+        version: 3.5.4
       lodash-es:
         specifier: ^4.17.21
         version: 4.17.21
diff --git a/web/src/api/core/auth.ts b/web/src/api/core/auth.ts
index 23ea35a..5662519 100644
--- a/web/src/api/core/auth.ts
+++ b/web/src/api/core/auth.ts
@@ -7,6 +7,7 @@ export namespace AuthApi {
     user_name?: string;
     uuid?:string;
     code?:string;
+    key_id?:string;
     mobile_phone?:number|string;
   }
 
@@ -26,7 +27,6 @@ export namespace AuthApi {
 
   export interface AccountSet {
     id: number|string;
-    tenant_id:string|number;
     name: string;
   }
 
-- 
Gitee


From 81a5f4514a1917e7760bfe7df6afb15475f8c709 Mon Sep 17 00:00:00 2001
From: xiaodai <1318762926@qq.com>
Date: Sat, 16 Aug 2025 10:41:31 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=BA=95=E5=B1=82=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E9=80=82=E9=85=8Din=20not=20=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/abstract/BaseDao.php | 718 ++++++++++++++++++++++++++-----
 1 file changed, 611 insertions(+), 107 deletions(-)

diff --git a/server/core/abstract/BaseDao.php b/server/core/abstract/BaseDao.php
index e7dd000..f72c5e8 100644
--- a/server/core/abstract/BaseDao.php
+++ b/server/core/abstract/BaseDao.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *+------------------
  * madong
@@ -9,15 +10,21 @@
  *+------------------
  * Official Website: http://www.madong.tech
  */
-
 namespace core\abstract;
 
+use Exception;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Pagination\LengthAwarePaginator;
 use madong\helper\Arr;
+use ReflectionException;
 use support\Db;
+use Throwable;
 
 /**
  * @method count(array $where = [], bool $search = true)
- * @method selectList(array $where, string $field = '*', int $page = 0, int $limit = 0, string $order = '', array $with = [], bool $search = false)
+ * @method selectList(array $where, array|string $field = '*', int $page = 0, int $limit = 0, string $order = '', array $with = [], bool $search = false)
  * @method selectModel(array $where, string $field = '*', int $page = 0, int $limit = 0, string $order = '', array $with = [], bool $search = false)
  * @method getCount(array $where)
  * @method getDistinctCount(array $where, $field, bool $search = true)
@@ -69,7 +76,7 @@ abstract class BaseDao
      * @param bool  $search
      *
      * @return int
-     * @throws \Exception
+     * @throws Exception
      */
     public function count(array $where = [], bool $search = false): int
     {
@@ -78,61 +85,97 @@ abstract class BaseDao
         if ($search) {
             $query = $this->search($where); // search 返回的是一个查询构建器
         } else {
-            $query->where($where); // 应用 where 条件
+            $whereInConditions = [];
+            foreach ($where as $key => $condition) {
+                if (is_array($condition) && count($condition) === 3) {
+                    $operator = strtolower($condition[1]);
+                    if ($operator === 'in' || $operator === 'not in') {
+                        $whereInConditions[] = $condition;
+                        unset($where[$key]);//移除分离后的条件
+                    }
+                }
+            }
+            //普通条件格式直接传入构建
+            if (!empty($where)) {
+                $query->where($where);
+            }
+
+            //特殊条件格式额外处理
+            foreach ($whereInConditions as $condition) {
+                if (empty($condition[2])) {
+                    continue;
+                }
+                $operator = strtolower($condition[1]);
+                $value = Arr::normalize($condition[2]);
+                if ($operator === 'in') {
+                    $query->whereIn($condition[0], $value);
+                } elseif ($operator === 'not in') {
+                    $query->whereNotIn($condition[0], $value);
+                }
+            }
         }
 
         // 返回满足条件的记录数量
         return $query->count();
     }
 
+
     /**
      * 查询列表
      *
-     * @param array      $where
-     * @param string     $field
-     * @param int        $page
-     * @param int        $limit
-     * @param string     $order
-     * @param array      $with
-     * @param bool       $search
+     * @param array $where
+     * @param string|array $field
+     * @param int $page
+     * @param int $limit
+     * @param string $order
+     * @param array $with
+     * @param bool $search
      * @param array|null $withoutScopes
      *
-     * @return \Illuminate\Database\Eloquent\Collection|null
-     * @throws \Exception
+     * @return Collection|null
+     * @throws Exception
      */
-    public function selectList(array $where, string $field = '*', int $page = 0, int $limit = 0, string $order = '', array $with = [], bool $search = false, ?array $withoutScopes = null): ?\Illuminate\Database\Eloquent\Collection
+    public function selectList(array $where, string|array $field = '*', int $page = 0, int $limit = 0, string $order = '', array $with = [], bool $search = false, ?array $withoutScopes = null): ?Collection
     {
         // 使用 selectModel 方法获取查询构建器
         $query = $this->selectModel($where, $field, $page, $limit, $order, $with, $search, $withoutScopes);
 
-        // 如果字段不是 '*'，则应用 selectRaw()
-        if ($field !== '*') {
-            $query->selectRaw($field); // 确保在查询构建器上调用
+        // 如果字段不是 '*' 或 ['*']，则应用 selectRaw()
+        $isWildcard = ($field === '*' || ($field === ['*']));
+        if (!$isWildcard) {
+            if (is_array($field)) {
+                // 如果是数组，转换为字符串
+                $field = implode(',', $field);
+            }
+            $query->selectRaw($field);
         }
+
         // 应用分页
         if ($page > 0 && $limit > 0) {
             // 只返回数据部分
             return $query->paginate($limit, ['*'], 'page', $page)->getCollection();
         }
+        // var_dump($query->toSql());die;
         return $query->get(); // 返回所有数据
     }
 
+
     /**
      * 获取某些条件数据
      *
-     * @param array      $where
-     * @param string     $field
-     * @param int        $page
-     * @param int        $limit
-     * @param string     $order
-     * @param array      $with
-     * @param bool       $search
+     * @param array $where
+     * @param array|string $field
+     * @param int $page
+     * @param int $limit
+     * @param string $order
+     * @param array $with
+     * @param bool $search
      * @param array|null $withoutScopes
      *
-     * @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder|\Illuminate\Pagination\LengthAwarePaginator|null
-     * @throws \Exception
+     * @return Builder|\Illuminate\Database\Query\Builder|LengthAwarePaginator|null
+     * @throws Exception
      */
-    public function selectModel(array $where, string $field = '*', int $page = 0, int $limit = 0, string $order = '', array $with = [], bool $search = false, ?array $withoutScopes = null): \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder|\Illuminate\Pagination\LengthAwarePaginator|null
+    public function selectModel(array $where, array|string $field = '*', int $page = 0, int $limit = 0, string $order = '', array $with = [], bool $search = false, ?array $withoutScopes = null): Builder|\Illuminate\Database\Query\Builder|LengthAwarePaginator|null
     {
         // 获取模型的查询构建器
         $query = $this->getModel()->query();
@@ -146,12 +189,14 @@ abstract class BaseDao
         if ($search) {
             $query = $this->search($where); // search 返回的是一个查询构建器
         } else {
-//            $query->where($where); // 应用 where 条件
             $whereInConditions = [];
             foreach ($where as $key => $condition) {
-                if (is_array($condition) && count($condition) === 3 && ($condition[1] === 'in' || $condition[1] === 'IN')) {
-                    $whereInConditions[] = $condition;
-                    unset($where[$key]);//移除分离后的条件
+                if (is_array($condition) && count($condition) === 3) {
+                    $operator = strtolower($condition[1]);
+                    if ($operator === 'in' || $operator === 'not in') {
+                        $whereInConditions[] = $condition;
+                        unset($where[$key]);//移除分离后的条件
+                    }
                 }
             }
             //普通条件格式直接传入构建
@@ -164,13 +209,28 @@ abstract class BaseDao
                 if (empty($condition[2])) {
                     continue;
                 }
+                $operator = strtolower($condition[1]);
                 $value = Arr::normalize($condition[2]);
-                $query->whereIn($condition[0], $value);
+                if ($operator === 'in') {
+                    $query->whereIn($condition[0], $value);
+                } elseif ($operator === 'not in') {
+                    $query->whereNotIn($condition[0], $value);
+                }
             }
         }
+
         // 应用字段选择
-        if ($field !== '*') {
-            $query->selectRaw($field); // 在这里应用 selectRaw
+        $isWildcard = ($field === '*' || ($field === ['*']));
+        if (!$isWildcard) {
+            if (is_array($field)) {
+                // 过滤空值并合并为字符串
+                $field = array_filter($field, function($f) { return !empty($f); });
+                $field = implode(',', $field);
+            }
+
+            if (!empty($field)) {
+                $query->selectRaw($field);
+            }
         }
         // 应用分页和其他查询条件
         if ($page > 0 && $limit > 0) {
@@ -191,11 +251,43 @@ abstract class BaseDao
      * @param array $where
      *
      * @return int
-     * @throws \Exception
+     * @throws Exception
      */
     public function getCount(array $where): int
     {
-        return $this->getModel()->where($where)->count();
+        // 获取模型的查询构建器
+        $query = $this->getModel()->query();
+
+        $whereInConditions = [];
+        foreach ($where as $key => $condition) {
+            if (is_array($condition) && count($condition) === 3) {
+                $operator = strtolower($condition[1]);
+                if ($operator === 'in' || $operator === 'not in') {
+                    $whereInConditions[] = $condition;
+                    unset($where[$key]);//移除分离后的条件
+                }
+            }
+        }
+        //普通条件格式直接传入构建
+        if (!empty($where)) {
+            $query->where($where);
+        }
+
+        //特殊条件格式额外处理
+        foreach ($whereInConditions as $condition) {
+            if (empty($condition[2])) {
+                continue;
+            }
+            $operator = strtolower($condition[1]);
+            $value = Arr::normalize($condition[2]);
+            if ($operator === 'in') {
+                $query->whereIn($condition[0], $value);
+            } elseif ($operator === 'not in') {
+                $query->whereNotIn($condition[0], $value);
+            }
+        }
+
+        return $query->count();
     }
 
     /**
@@ -206,41 +298,67 @@ abstract class BaseDao
      * @param bool   $search
      *
      * @return int
-     * @throws \Exception
+     * @throws Exception
      */
     public function getDistinctCount(array $where, string $field, bool $search = true): int
     {
         // 构建查询
-        $query = $this->getModel();
+        $query = $this->getModel()->query();
+
         // 应用搜索条件
         if ($search) {
-            $query = $this->search($query, $where);
+            $query = $this->search($where);
         } else {
-            $query = $query->where($where);
+            $whereInConditions = [];
+            foreach ($where as $key => $condition) {
+                if (is_array($condition) && count($condition) === 3) {
+                    $operator = strtolower($condition[1]);
+                    if ($operator === 'in' || $operator === 'not in') {
+                        $whereInConditions[] = $condition;
+                        unset($where[$key]);//移除分离后的条件
+                    }
+                }
+            }
+            //普通条件格式直接传入构建
+            if (!empty($where)) {
+                $query->where($where);
+            }
+
+            //特殊条件格式额外处理
+            foreach ($whereInConditions as $condition) {
+                if (empty($condition[2])) {
+                    continue;
+                }
+                $operator = strtolower($condition[1]);
+                $value = Arr::normalize($condition[2]);
+                if ($operator === 'in') {
+                    $query->whereIn($condition[0], $value);
+                } elseif ($operator === 'not in') {
+                    $query->whereNotIn($condition[0], $value);
+                }
+            }
         }
         // 获取唯一计数
         return $query->distinct()->count($field);
     }
 
+
     /**
      * 获取模型
      *
      * @return mixed
-     * @throws \Exception
+     * @throws Exception
      */
     public function getModel(): mixed
     {
         try {
             $className = $this->setModel();
-            if (is_object($className)) {
-                return $className;
-            }
             if (!class_exists($className)) {
-                throw new \Exception($className . ' 不是一个有效的模型类');
+                throw new Exception($className . ' 不是一个有效的模型类');
             }
             return new $className();
-        } catch (\Throwable $e) {
-            throw new \Exception($className . ' 未知模型: ' . $e->getMessage());
+        } catch (Throwable $e) {
+            throw new Exception($className . ' 未知模型: ' . $e->getMessage());
         }
     }
 
@@ -248,7 +366,7 @@ abstract class BaseDao
      * 获取模型主键
      *
      * @return string
-     * @throws \Exception
+     * @throws Exception
      */
     public function getPk(): string
     {
@@ -259,7 +377,7 @@ abstract class BaseDao
      * 获取表名
      *
      * @return string
-     * @throws \ReflectionException|\Exception
+     * @throws ReflectionException|Exception
      */
     public function getTableName(): string
     {
@@ -270,18 +388,48 @@ abstract class BaseDao
      * 获取一条数据
      *
      * @param            $id
-     * @param array|null $field
+     * @param string|array|null $field
      * @param array|null $with
-     * @param string     $order
+     * @param string $order
      * @param array|null $withoutScopes
      *
-     * @return \Illuminate\Database\Eloquent\Model|null
-     * @throws \Exception
+     * @return Model|null
+     * @throws Exception
      */
-    public function get($id, ?array $field = null, ?array $with = [], string $order = '', ?array $withoutScopes = null): ?\Illuminate\Database\Eloquent\Model
+    public function get($id, string|array $field = null, ?array $with = [], string $order = '', ?array $withoutScopes = null): ?Model
     {
         $where = is_array($id) ? $id : [$this->getPk() => $id];
-        $query = $this->getModel()->where($where);
+        $query = $this->getModel()->query();
+
+        $whereInConditions = [];
+        foreach ($where as $key => $condition) {
+            if (is_array($condition) && count($condition) === 3) {
+                $operator = strtolower($condition[1]);
+                if ($operator === 'in' || $operator === 'not in') {
+                    $whereInConditions[] = $condition;
+                    unset($where[$key]);//移除分离后的条件
+                }
+            }
+        }
+        //普通条件格式直接传入构建
+        if (!empty($where)) {
+            $query->where($where);
+        }
+
+        //特殊条件格式额外处理
+        foreach ($whereInConditions as $condition) {
+            if (empty($condition[2])) {
+                continue;
+            }
+            $operator = strtolower($condition[1]);
+            $value = Arr::normalize($condition[2]);
+            if ($operator === 'in') {
+                $query->whereIn($condition[0], $value);
+            } elseif ($operator === 'not in') {
+                $query->whereNotIn($condition[0], $value);
+            }
+        }
+
         $this->applyScopeRemoval($query, $withoutScopes);
         // 添加关联加载
         if (!empty($with)) {
@@ -294,6 +442,7 @@ abstract class BaseDao
         return $query->select($field ?? ['*'])->first();
     }
 
+
     /**
      * 查询一条数据是否存在
      *
@@ -301,7 +450,7 @@ abstract class BaseDao
      * @param string $field
      *
      * @return bool
-     * @throws \Exception
+     * @throws Exception
      */
     public function be($map, string $field = ''): bool
     {
@@ -314,9 +463,41 @@ abstract class BaseDao
         $map = !is_array($map) ? [$field => $map] : $map;
 
         // 使用 Eloquent 查询构建器检查记录是否存在
-        return $this->getModel()->where($map)->exists();
+        $query = $this->getModel()->query();
+
+        $whereInConditions = [];
+        foreach ($map as $key => $condition) {
+            if (is_array($condition) && count($condition) === 3) {
+                $operator = strtolower($condition[1]);
+                if ($operator === 'in' || $operator === 'not in') {
+                    $whereInConditions[] = $condition;
+                    unset($map[$key]);//移除分离后的条件
+                }
+            }
+        }
+        //普通条件格式直接传入构建
+        if (!empty($map)) {
+            $query->where($map);
+        }
+
+        //特殊条件格式额外处理
+        foreach ($whereInConditions as $condition) {
+            if (empty($condition[2])) {
+                continue;
+            }
+            $operator = strtolower($condition[1]);
+            $value = Arr::normalize($condition[2]);
+            if ($operator === 'in') {
+                $query->whereIn($condition[0], $value);
+            } elseif ($operator === 'not in') {
+                $query->whereNotIn($condition[0], $value);
+            }
+        }
+
+        return $query->exists();
     }
 
+
     /**
      * 根据条件获取一条数据
      *
@@ -324,17 +505,55 @@ abstract class BaseDao
      * @param string|null $field
      * @param array       $with
      *
-     * @return \Illuminate\Database\Eloquent\Model|null
-     * @throws \Exception
+     * @return Model|null
+     * @throws Exception
      */
-    public function getOne(array $where, ?string $field = '*', array $with = []): ?\Illuminate\Database\Eloquent\Model
+    public function getOne(array $where, ?string $field = '*', array $with = []): ?Model
     {
         // 将字段字符串转换为数组
         $fieldArray = $field === '*' ? ['*'] : explode(',', $field);
+
         // 使用 Eloquent 查询构建器获取一条数据
-        return $this->getModel()->with($with)->where($where)->select($fieldArray)->first();
+        $query = $this->getModel()->query();
+
+        $whereInConditions = [];
+        foreach ($where as $key => $condition) {
+            if (is_array($condition) && count($condition) === 3) {
+                $operator = strtolower($condition[1]);
+                if ($operator === 'in' || $operator === 'not in') {
+                    $whereInConditions[] = $condition;
+                    unset($where[$key]);//移除分离后的条件
+                }
+            }
+        }
+        //普通条件格式直接传入构建
+        if (!empty($where)) {
+            $query->where($where);
+        }
+
+        //特殊条件格式额外处理
+        foreach ($whereInConditions as $condition) {
+            if (empty($condition[2])) {
+                continue;
+            }
+            $operator = strtolower($condition[1]);
+            $value = Arr::normalize($condition[2]);
+            if ($operator === 'in') {
+                $query->whereIn($condition[0], $value);
+            } elseif ($operator === 'not in') {
+                $query->whereNotIn($condition[0], $value);
+            }
+        }
+
+        // 添加关联加载
+        if (!empty($with)) {
+            $query->with($with);
+        }
+
+        return $query->select($fieldArray)->first();
     }
 
+
     /**
      * 获取某字段的值
      *
@@ -342,16 +561,48 @@ abstract class BaseDao
      * @param string|null $field
      *
      * @return mixed
-     * @throws \Exception
+     * @throws Exception
      */
     public function value($where, ?string $field = null): mixed
     {
-        $pk    = $this->getPk(); // 获取主键
-        $query = $this->getModel()->where($this->setWhere($where)); // 设置查询条件
+        $pk = $this->getPk(); // 获取主键
+        $where = $this->setWhere($where); // 设置查询条件
+
+        $query = $this->getModel()->query();
+
+        $whereInConditions = [];
+        foreach ($where as $key => $condition) {
+            if (is_array($condition) && count($condition) === 3) {
+                $operator = strtolower($condition[1]);
+                if ($operator === 'in' || $operator === 'not in') {
+                    $whereInConditions[] = $condition;
+                    unset($where[$key]);//移除分离后的条件
+                }
+            }
+        }
+        //普通条件格式直接传入构建
+        if (!empty($where)) {
+            $query->where($where);
+        }
+
+        //特殊条件格式额外处理
+        foreach ($whereInConditions as $condition) {
+            if (empty($condition[2])) {
+                continue;
+            }
+            $operator = strtolower($condition[1]);
+            $value = Arr::normalize($condition[2]);
+            if ($operator === 'in') {
+                $query->whereIn($condition[0], $value);
+            } elseif ($operator === 'not in') {
+                $query->whereNotIn($condition[0], $value);
+            }
+        }
 
         return $query->value($field ?? $pk); // 返回指定字段的值，默认为主键
     }
 
+
     /**
      * 获取某个字段数组
      *
@@ -360,7 +611,7 @@ abstract class BaseDao
      * @param string $key
      *
      * @return array
-     * @throws \ReflectionException|\Exception
+     * @throws ReflectionException|Exception
      */
     public function getColumn(array $where, string $field, string $key = ''): array
     {
@@ -369,9 +620,12 @@ abstract class BaseDao
 
         $whereInConditions = [];
         foreach ($where as $k => $condition) {
-            if (is_array($condition) && count($condition) === 3 && ($condition[1] === 'in' || $condition[1] === 'IN')) {
-                $whereInConditions[] = $condition;
-                unset($where[$k]);//移除分离后的条件
+            if (is_array($condition) && count($condition) === 3) {
+                $operator = strtolower($condition[1]);
+                if ($operator === 'in' || $operator === 'not in') {
+                    $whereInConditions[] = $condition;
+                    unset($where[$k]);//移除分离后的条件
+                }
             }
         }
         //普通条件格式直接传入构建
@@ -384,10 +638,16 @@ abstract class BaseDao
             if (empty($condition[2])) {
                 continue;
             }
+            $operator = strtolower($condition[1]);
             $value = Arr::normalize($condition[2]);
-            $query->whereIn($condition[0], $value);
+            if ($operator === 'in') {
+                $query->whereIn($condition[0], $value);
+            } elseif ($operator === 'not in') {
+                $query->whereNotIn($condition[0], $value);
+            }
         }
 
+
         // 如果指定了键，则使用 keyBy 方法
         if ($key) {
             return $query->pluck($field, $key)->toArray();
@@ -404,7 +664,7 @@ abstract class BaseDao
      * @param string|null      $key
      *
      * @return mixed
-     * @throws \Exception
+     * @throws Exception
      */
     public function delete(array|int|string $id, ?string $key = null): int
     {
@@ -427,8 +687,8 @@ abstract class BaseDao
                 $model->delete();//触发事件
             }
             return $models->count();
-        } catch (\Exception $e) {
-            throw new \Exception("删除失败:" . $e->getMessage(), $e->getCode(), $e);
+        } catch (Exception $e) {
+            throw new Exception("删除失败:" . $e->getMessage(), $e->getCode(), $e);
         }
     }
 
@@ -439,7 +699,7 @@ abstract class BaseDao
      * @param bool  $force
      *
      * @return bool
-     * @throws \Exception
+     * @throws Exception
      */
     public function destroy(mixed $id, bool $force = false): bool
     {
@@ -455,7 +715,7 @@ abstract class BaseDao
      * @param string|null      $key
      *
      * @return mixed
-     * @throws \Exception
+     * @throws Exception
      */
     public function update(string|int|array $id, array $data, ?string $key = null): mixed
     {
@@ -486,15 +746,19 @@ abstract class BaseDao
             $query->where($where);
         }
 
-        // 处理 IN 条件
+        // 处理 IN/NOT IN 条件
         foreach ($whereInConditions as $condition) {
             list($column, $operator, $value) = $condition;
             $normalizedValue = is_array($value) ? $value : [$value];
             $query->where(function ($q) use ($column, $operator, $normalizedValue) {
-                $q->whereIn($column, $normalizedValue);
+                $op = strtolower($operator);
+                if ($op === 'in') {
+                    $q->whereIn($column, $normalizedValue);
+                } elseif ($op === 'not in') {
+                    $q->whereNotIn($column, $normalizedValue);
+                }
             });
         }
-
         return $query->update($data);
     }
 
@@ -505,7 +769,7 @@ abstract class BaseDao
      * @param string|null $key
      *
      * @return array
-     * @throws \Exception
+     * @throws Exception
      */
     protected function setWhere($where, ?string $key = null): array
     {
@@ -524,7 +788,7 @@ abstract class BaseDao
      * @param string|null $key
      *
      * @return mixed
-     * @throws \Exception
+     * @throws Exception
      */
     public function batchUpdate(array $ids, array $data, ?string $key = null): bool
     {
@@ -536,10 +800,10 @@ abstract class BaseDao
      *
      * @param array $data
      *
-     * @return \Illuminate\Database\Eloquent\Model|null
-     * @throws \Exception
+     * @return Model|null
+     * @throws Exception
      */
-    public function save(array $data): ?\Illuminate\Database\Eloquent\Model
+    public function save(array $data): ?Model
     {
         return $this->getModel()->create($data);
     }
@@ -572,7 +836,7 @@ abstract class BaseDao
             });
 
             return $savedAll;
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             return false;
         }
     }
@@ -586,7 +850,7 @@ abstract class BaseDao
      * @param array|null  $where
      *
      * @return mixed
-     * @throws \Exception
+     * @throws Exception
      */
     public function getFieldValue($value, string $field, ?string $valueKey = null, ?array $where = []): mixed
     {
@@ -596,17 +860,50 @@ abstract class BaseDao
         } else {
             $where[$this->getPk()] = $value; // 默认使用主键作为条件
         }
+
         // 使用 Eloquent 查询构建器获取字段值
-        return $this->getModel()->where($where)->value($field);
+        $query = $this->getModel()->query();
+
+        $whereInConditions = [];
+        foreach ($where as $key => $condition) {
+            if (is_array($condition) && count($condition) === 3) {
+                $operator = strtolower($condition[1]);
+                if ($operator === 'in' || $operator === 'not in') {
+                    $whereInConditions[] = $condition;
+                    unset($where[$key]);//移除分离后的条件
+                }
+            }
+        }
+        //普通条件格式直接传入构建
+        if (!empty($where)) {
+            $query->where($where);
+        }
+
+        //特殊条件格式额外处理
+        foreach ($whereInConditions as $condition) {
+            if (empty($condition[2])) {
+                continue;
+            }
+            $operator = strtolower($condition[1]);
+            $value = Arr::normalize($condition[2]);
+            if ($operator === 'in') {
+                $query->whereIn($condition[0], $value);
+            } elseif ($operator === 'not in') {
+                $query->whereNotIn($condition[0], $value);
+            }
+        }
+
+        return $query->value($field);
     }
 
+
     /**
      * 获取搜索器和搜索条件key,以及不在搜索器的条件数组
      *
      * @param array $where
      *
      * @return array[]
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     private function getSearchData(array $where): array
     {
@@ -642,7 +939,7 @@ abstract class BaseDao
      * @param bool  $search
      *
      * @return \Illuminate\Database\Query\Builder
-     * @throws \Exception
+     * @throws Exception
      */
     protected function withSearchSelect(array $where, bool $search): mixed
     {
@@ -670,7 +967,7 @@ abstract class BaseDao
      * @param array $where
      *
      * @return array
-     * @throws \Exception
+     * @throws Exception
      */
     protected function filterWhere(array $where = []): array
     {
@@ -691,7 +988,7 @@ abstract class BaseDao
      * @param bool  $search
      *
      * @return mixed
-     * @throws \Exception
+     * @throws Exception
      */
     public function search(array $where = [], bool $search = true): mixed
     {
@@ -710,22 +1007,50 @@ abstract class BaseDao
      * @param bool   $search
      *
      * @return float
-     * @throws \Exception
+     * @throws Exception
      */
     public function sum(array $where, string $field, bool $search = false): float
     {
         // 构建查询
-        $query = $this->getModel();
+        $query = $this->getModel()->query();
         // 应用搜索条件
         if ($search) {
-            $query = $this->search($query, $where);
+            $query = $this->search($where);
         } else {
-            $query = $query->where($where);
+            $whereInConditions = [];
+            foreach ($where as $key => $condition) {
+                if (is_array($condition) && count($condition) === 3) {
+                    $operator = strtolower($condition[1]);
+                    if ($operator === 'in' || $operator === 'not in') {
+                        $whereInConditions[] = $condition;
+                        unset($where[$key]);//移除分离后的条件
+                    }
+                }
+            }
+            //普通条件格式直接传入构建
+            if (!empty($where)) {
+                $query->where($where);
+            }
+
+            //特殊条件格式额外处理
+            foreach ($whereInConditions as $condition) {
+                if (empty($condition[2])) {
+                    continue;
+                }
+                $operator = strtolower($condition[1]);
+                $value = Arr::normalize($condition[2]);
+                if ($operator === 'in') {
+                    $query->whereIn($condition[0], $value);
+                } elseif ($operator === 'not in') {
+                    $query->whereNotIn($condition[0], $value);
+                }
+            }
         }
         // 计算总和并返回
         return (float)$query->sum($field);
     }
 
+
     /**
      * 高精度加法（修正精度问题）
      *
@@ -736,7 +1061,7 @@ abstract class BaseDao
      * @param int $acc 精度（小数位数）
      *
      * @return bool
-     * @throws \Exception
+     * @throws Exception
      */
     public function bcInc(mixed $key, string $incField, string $inc, string $keyField = null, int $acc = 2): bool
     {
@@ -758,7 +1083,7 @@ abstract class BaseDao
      * @param int         $acc
      *
      * @return bool
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function bcDec($key, string $decField, string $dec, string $keyField = null, int $acc = 2): bool
     {
@@ -776,7 +1101,7 @@ abstract class BaseDao
      * @param int         $acc
      *
      * @return bool
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function bc($key, string $field, string $value, string $keyField = null, int $type = 1, int $acc = 2): bool
     {
@@ -807,13 +1132,64 @@ abstract class BaseDao
      * @param string $sales
      *
      * @return bool
-     * @throws \Exception
+     * @throws Exception
      */
     public function decStockIncSales(array $where, int $num, string $stock = 'stock', string $sales = 'sales'): bool
     {
-        $product = $this->getModel()->where($where)->first();
+        $query = $this->getModel()->query();
+
+        $whereInConditions = [];
+        foreach ($where as $key => $condition) {
+            if (is_array($condition) && count($condition) === 3) {
+                $operator = strtolower($condition[1]);
+                if ($operator === 'in' || $operator === 'not in') {
+                    $whereInConditions[] = $condition;
+                    unset($where[$key]);//移除分离后的条件
+                }
+            }
+        }
+        //普通条件格式直接传入构建
+        if (!empty($where)) {
+            $query->where($where);
+        }
+
+        //特殊条件格式额外处理
+        foreach ($whereInConditions as $condition) {
+            if (empty($condition[2])) {
+                continue;
+            }
+            $operator = strtolower($condition[1]);
+            $value = Arr::normalize($condition[2]);
+            if ($operator === 'in') {
+                $query->whereIn($condition[0], $value);
+            } elseif ($operator === 'not in') {
+                $query->whereNotIn($condition[0], $value);
+            }
+        }
+
+        $product = $query->first();
         if ($product) {
-            return $this->getModel()->where($where)->decrement($stock, $num)->increment($sales, $num);
+            // 重新构建查询以执行更新操作
+            $updateQuery = $this->getModel()->query();
+
+            // 重新应用条件
+            if (!empty($where)) {
+                $updateQuery->where($where);
+            }
+            foreach ($whereInConditions as $condition) {
+                if (empty($condition[2])) {
+                    continue;
+                }
+                $operator = strtolower($condition[1]);
+                $value = Arr::normalize($condition[2]);
+                if ($operator === 'in') {
+                    $updateQuery->whereIn($condition[0], $value);
+                } elseif ($operator === 'not in') {
+                    $updateQuery->whereNotIn($condition[0], $value);
+                }
+            }
+
+            return $updateQuery->decrement($stock, $num)->increment($sales, $num);
         }
         return false;
     }
@@ -827,15 +1203,72 @@ abstract class BaseDao
      * @param string $sales
      *
      * @return bool
-     * @throws \Exception
+     * @throws Exception
      */
     public function incStockDecSales(array $where, int $num, string $stock = 'stock', string $sales = 'sales'): bool
     {
-        $product = $this->getModel()->where($where)->first();
+        $query = $this->getModel()->query();
+
+        $whereInConditions = [];
+        foreach ($where as $key => $condition) {
+            if (is_array($condition) && count($condition) === 3) {
+                $operator = strtolower($condition[1]);
+                if ($operator === 'in' || $operator === 'not in') {
+                    $whereInConditions[] = $condition;
+                    unset($where[$key]);//移除分离后的条件
+                }
+            }
+        }
+        //普通条件格式直接传入构建
+        if (!empty($where)) {
+            $query->where($where);
+        }
+
+        //特殊条件格式额外处理
+        foreach ($whereInConditions as $condition) {
+            if (empty($condition[2])) {
+                continue;
+            }
+            $operator = strtolower($condition[1]);
+            $value = Arr::normalize($condition[2]);
+            if ($operator === 'in') {
+                $query->whereIn($condition[0], $value);
+            } elseif ($operator === 'not in') {
+                $query->whereNotIn($condition[0], $value);
+            }
+        }
+
+        $product = $query->first();
         if ($product) {
-            return $this->getModel()->where($where)->increment($stock, $num)->decrement($sales, $num);
+            // 重新构建查询以执行更新操作
+            $updateQuery1 = $this->getModel()->query();
+            $updateQuery2 = $this->getModel()->query();
+
+            // 重新应用条件
+            if (!empty($where)) {
+                $updateQuery1->where($where);
+                $updateQuery2->where($where);
+            }
+            foreach ($whereInConditions as $condition) {
+                if (empty($condition[2])) {
+                    continue;
+                }
+                $operator = strtolower($condition[1]);
+                $value = Arr::normalize($condition[2]);
+                if ($operator === 'in') {
+                    $updateQuery1->whereIn($condition[0], $value);
+                    $updateQuery2->whereIn($condition[0], $value);
+                } elseif ($operator === 'not in') {
+                    $updateQuery1->whereNotIn($condition[0], $value);
+                    $updateQuery2->whereNotIn($condition[0], $value);
+                }
+            }
+
+            $updateQuery1->increment($stock, $num);
+            $updateQuery2->decrement($sales, $num);
+            return true;
         }
-        return true;
+        return false;
     }
 
     /**
@@ -845,11 +1278,42 @@ abstract class BaseDao
      * @param string $field
      *
      * @return mixed
-     * @throws \Exception
+     * @throws Exception
      */
     public function getMax(array $where = [], string $field = ''): mixed
     {
-        return $this->getModel()->where($where)->max($field);
+        $query = $this->getModel()->query();
+
+        $whereInConditions = [];
+        foreach ($where as $key => $condition) {
+            if (is_array($condition) && count($condition) === 3) {
+                $operator = strtolower($condition[1]);
+                if ($operator === 'in' || $operator === 'not in') {
+                    $whereInConditions[] = $condition;
+                    unset($where[$key]);//移除分离后的条件
+                }
+            }
+        }
+        //普通条件格式直接传入构建
+        if (!empty($where)) {
+            $query->where($where);
+        }
+
+        //特殊条件格式额外处理
+        foreach ($whereInConditions as $condition) {
+            if (empty($condition[2])) {
+                continue;
+            }
+            $operator = strtolower($condition[1]);
+            $value = Arr::normalize($condition[2]);
+            if ($operator === 'in') {
+                $query->whereIn($condition[0], $value);
+            } elseif ($operator === 'not in') {
+                $query->whereNotIn($condition[0], $value);
+            }
+        }
+
+        return $query->max($field);
     }
 
     /**
@@ -859,11 +1323,42 @@ abstract class BaseDao
      * @param string $field
      *
      * @return mixed
-     * @throws \Exception
+     * @throws Exception
      */
     public function getMin(array $where = [], string $field = ''): mixed
     {
-        return $this->getModel()->where($where)->min($field);
+        $query = $this->getModel()->query();
+
+        $whereInConditions = [];
+        foreach ($where as $key => $condition) {
+            if (is_array($condition) && count($condition) === 3) {
+                $operator = strtolower($condition[1]);
+                if ($operator === 'in' || $operator === 'not in') {
+                    $whereInConditions[] = $condition;
+                    unset($where[$key]);//移除分离后的条件
+                }
+            }
+        }
+        //普通条件格式直接传入构建
+        if (!empty($where)) {
+            $query->where($where);
+        }
+
+        //特殊条件格式额外处理
+        foreach ($whereInConditions as $condition) {
+            if (empty($condition[2])) {
+                continue;
+            }
+            $operator = strtolower($condition[1]);
+            $value = Arr::normalize($condition[2]);
+            if ($operator === 'in') {
+                $query->whereIn($condition[0], $value);
+            } elseif ($operator === 'not in') {
+                $query->whereNotIn($condition[0], $value);
+            }
+        }
+
+        return $query->min($field);
     }
 
     private function studly(string $string): string
@@ -911,5 +1406,14 @@ abstract class BaseDao
         return count($condition) === 3
             && in_array(strtolower($condition[1] ?? ''), ['in', 'not in'], true);
     }
+    /**
+     * 检测表是否存在
+     * @param $table
+     * @return bool
+     */
+    public function tableExists($table): bool
+    {
+        return Db::schema()->hasTable($table);
+    }
 }
 
-- 
Gitee