From 8a26a4aeece53f43c11e1f975f1890a0f7d01e40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sun, 15 Dec 2024 11:32:04 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dpure=E8=8B=A5?=
 =?UTF-8?q?=E5=B9=B2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Operlog/OperLogGlobalAttribute.cs         | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Operlog/OperLogGlobalAttribute.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Operlog/OperLogGlobalAttribute.cs
index a2f0ac0c..3fe445b7 100644
--- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Operlog/OperLogGlobalAttribute.cs
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Operlog/OperLogGlobalAttribute.cs
@@ -6,6 +6,7 @@ using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Uow;
 using Volo.Abp.Users;
 using Yi.Framework.Core.Extensions;
 using Yi.Framework.Core.Helper;
@@ -18,12 +19,15 @@ namespace Yi.Framework.Rbac.Domain.Operlog
         private ILogger<OperLogGlobalAttribute> _logger;
         private IRepository<OperationLogEntity> _repository;
         private ICurrentUser _currentUser;
+
+        private IUnitOfWorkManager _unitOfWorkManager;
         //注入一个日志服务
-        public OperLogGlobalAttribute(ILogger<OperLogGlobalAttribute> logger, IRepository<OperationLogEntity> repository, ICurrentUser currentUser)
+        public OperLogGlobalAttribute(ILogger<OperLogGlobalAttribute> logger, IRepository<OperationLogEntity> repository, ICurrentUser currentUser, IUnitOfWorkManager unitOfWorkManager)
         {
             _logger = logger;
             _repository = repository;
             _currentUser = currentUser;
+            _unitOfWorkManager = unitOfWorkManager;
         }
 
         public override async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
@@ -35,8 +39,9 @@ namespace Yi.Framework.Rbac.Domain.Operlog
             if (resultContext.ActionDescriptor is not ControllerActionDescriptor controllerActionDescriptor) return;
 
             //查找标签，获取标签对象
-            OperLogAttribute? operLogAttribute = controllerActionDescriptor.MethodInfo.GetCustomAttributes(inherit: true)
-                  .FirstOrDefault(a => a.GetType().Equals(typeof(OperLogAttribute))) as OperLogAttribute;
+            OperLogAttribute? operLogAttribute = controllerActionDescriptor.MethodInfo
+                .GetCustomAttributes(inherit: true)
+                .FirstOrDefault(a => a.GetType().Equals(typeof(OperLogAttribute))) as OperLogAttribute;
             //空对象直接返回
             if (operLogAttribute is null) return;
 
@@ -48,7 +53,7 @@ namespace Yi.Framework.Rbac.Domain.Operlog
             //获取Ip
             string ip = resultContext.HttpContext.GetClientIp();
 
-             //根据ip获取地址
+            //根据ip获取地址
             string location = "";
             try
             {
@@ -78,6 +83,7 @@ namespace Yi.Framework.Rbac.Domain.Operlog
                 {
                     logEntity.RequestResult = result.Content?.Replace("\r\n", "").Trim();
                 }
+
                 if (resultContext.Result is JsonResult result2)
                 {
                     logEntity.RequestResult = result2.Value?.ToString();
@@ -92,14 +98,13 @@ namespace Yi.Framework.Rbac.Domain.Operlog
 
             if (operLogAttribute.IsSaveRequestData)
             {
-                //不建议保存，吃性能
-                //保存请求参数
                 logEntity.RequestParam = JsonConvert.SerializeObject(context.ActionArguments);
             }
 
-            await _repository.InsertAsync(logEntity);
-
-
+            using (var uow = _unitOfWorkManager.Begin())
+            {
+                await _repository.InsertAsync(logEntity);
+            }
         }
 
     }

From fb0edc0ee09ac6433874242ce7ee79a551415a99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sun, 15 Dec 2024 11:32:41 +0800
Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dpure=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Pure.Vue3/src/views/system/config/form.vue | 47 +++++++++---
 .../src/views/system/config/index.vue         | 76 +++++++++++++++----
 .../src/views/system/config/utils/hook.tsx    | 53 +++++++------
 .../src/views/system/config/utils/types.ts    |  2 +-
 .../src/views/system/user/form/index.vue      |  6 +-
 .../src/views/system/user/utils/hook.tsx      | 12 +--
 .../src/views/system/user/utils/rule.ts       |  1 +
 7 files changed, 139 insertions(+), 58 deletions(-)

diff --git a/Yi.Pure.Vue3/src/views/system/config/form.vue b/Yi.Pure.Vue3/src/views/system/config/form.vue
index 7ffe926d..e8eb515e 100644
--- a/Yi.Pure.Vue3/src/views/system/config/form.vue
+++ b/Yi.Pure.Vue3/src/views/system/config/form.vue
@@ -12,7 +12,8 @@ const props = withDefaults(defineProps<FormProps>(), {
     configValue: "",
     configKey: "",
     configType: "",
-    remark: ""
+    remark: "",
+    creationTime: ""
   })
 });
 const ruleFormRef = ref();
@@ -28,38 +29,62 @@ defineExpose({ getRef });
 
 <template>
   <el-form
-  ref="ruleFormRef" 
-  :model="newFormInline" 
-  :rules="formRules" 
-  label-width="82px">
+    ref="ruleFormRef"
+    :model="newFormInline"
+    :rules="formRules"
+    label-width="82px"
+  >
     <el-row :gutter="30">
       <re-col :value="12" :xs="24" :sm="24">
         <el-form-item label="参数名称" prop="configName">
-          <el-input v-model="newFormInline.configName" clearable placeholder="请输入参数名称" />
+          <el-input
+            v-model="newFormInline.configName"
+            clearable
+            placeholder="请输入参数名称"
+          />
         </el-form-item>
       </re-col>
 
       <re-col :value="12" :xs="24" :sm="24">
         <el-form-item label="参数键名" prop="configKey">
-          <el-input v-model="newFormInline.configKey" clearable placeholder="请输入参数键名" />
+          <el-input
+            v-model="newFormInline.configKey"
+            clearable
+            placeholder="请输入参数键名"
+          />
         </el-form-item>
       </re-col>
 
       <re-col :value="12" :xs="24" :sm="24">
         <el-form-item label="参数键值" prop="configValue">
-          <el-input v-model="newFormInline.configValue" clearable placeholder="请输入参数键值" />
+          <el-input
+            v-model="newFormInline.configValue"
+            clearable
+            placeholder="请输入参数键值"
+          />
         </el-form-item>
       </re-col>
       <re-col :value="12" :xs="24" :sm="24">
         <el-form-item label="系统内置">
-          <el-switch v-model="newFormInline.configType" inline-prompt :active-value="true" :inactive-value="false"
-            active-text="是" inactive-text="否" :style="switchStyle" />
+          <el-switch
+            v-model="newFormInline.configType"
+            inline-prompt
+            :active-value="true"
+            :inactive-value="false"
+            active-text="是"
+            inactive-text="否"
+            :style="switchStyle"
+          />
         </el-form-item>
       </re-col>
 
       <re-col>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="newFormInline.remark" placeholder="请输入备注信息" type="textarea" />
+          <el-input
+            v-model="newFormInline.remark"
+            placeholder="请输入备注信息"
+            type="textarea"
+          />
         </el-form-item>
       </re-col>
     </el-row>
diff --git a/Yi.Pure.Vue3/src/views/system/config/index.vue b/Yi.Pure.Vue3/src/views/system/config/index.vue
index d5aa3898..15a3f860 100644
--- a/Yi.Pure.Vue3/src/views/system/config/index.vue
+++ b/Yi.Pure.Vue3/src/views/system/config/index.vue
@@ -32,23 +32,46 @@ const {
 
 <template>
   <div class="main">
-    <el-form ref="formRef" :inline="true"
-     :model="form"
-      class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px] overflow-auto">
+    <el-form
+      ref="formRef"
+      :inline="true"
+      :model="form"
+      class="search-form bg-bg_color w-[99/100] pl-8 pt-[12px] overflow-auto"
+    >
       <el-form-item label="参数名称：" prop="name">
-        <el-input v-model="form.configName" placeholder="请输入参数名称" clearable class="!w-[180px]" />
+        <el-input
+          v-model="form.configName"
+          placeholder="请输入参数名称"
+          clearable
+          class="!w-[180px]"
+        />
       </el-form-item>
       <el-form-item label="参数键名:" prop="key">
-        <el-input v-model="form.configKey" placeholder="请输入参数名称" clearable class="!w-[180px]" />
+        <el-input
+          v-model="form.configKey"
+          placeholder="请输入参数名称"
+          clearable
+          class="!w-[180px]"
+        />
       </el-form-item>
       <el-form-item label="是否内置：" prop="state">
-        <el-select v-model="form.configType" placeholder="" clearable class="!w-[180px]">
+        <el-select
+          v-model="form.configType"
+          placeholder=""
+          clearable
+          class="!w-[180px]"
+        >
           <el-option label="是" :value="true" />
           <el-option label="否" :value="false" />
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" :icon="useRenderIcon('ri:search-line')" :loading="loading" @click="onSearch">
+        <el-button
+          type="primary"
+          :icon="useRenderIcon('ri:search-line')"
+          :loading="loading"
+          @click="onSearch"
+        >
           搜索
         </el-button>
         <el-button :icon="useRenderIcon(Refresh)" @click="resetForm(formRef)">
@@ -57,9 +80,18 @@ const {
       </el-form-item>
     </el-form>
 
-    <PureTableBar title="参数设置" :columns="columns" :tableRef="tableRef?.getTableRef()" @refresh="onSearch" >
+    <PureTableBar
+      title="参数设置"
+      :columns="columns"
+      :tableRef="tableRef?.getTableRef()"
+      @refresh="onSearch"
+    >
       <template #buttons>
-        <el-button type="primary" :icon="useRenderIcon(AddFill)" @click="openDialog()">
+        <el-button
+          type="primary"
+          :icon="useRenderIcon(AddFill)"
+          @click="openDialog()"
+        >
           新增参数
         </el-button>
       </template>
@@ -80,15 +112,31 @@ const {
             background: 'var(--el-fill-color-light)',
             color: 'var(--el-text-color-primary)'
           }"
-          @selection-change="handleSelectionChange">
+          @selection-change="handleSelectionChange"
+        >
           <template #operation="{ row }">
-            <el-button class="reset-margin" link type="primary" :size="size" :icon="useRenderIcon(EditPen)"
-              @click="openDialog('修改', row)">
+            <el-button
+              class="reset-margin"
+              link
+              type="primary"
+              :size="size"
+              :icon="useRenderIcon(EditPen)"
+              @click="openDialog('修改', row)"
+            >
               修改
             </el-button>
-            <el-popconfirm :title="`是否确认删除 ? 参数: ${row.configName}`" @confirm="handleDelete(row)">
+            <el-popconfirm
+              :title="`是否确认删除 ? 参数: ${row.configName}`"
+              @confirm="handleDelete(row)"
+            >
               <template #reference>
-                <el-button class="reset-margin" link type="primary" :size="size" :icon="useRenderIcon(Delete)">
+                <el-button
+                  class="reset-margin"
+                  link
+                  type="primary"
+                  :size="size"
+                  :icon="useRenderIcon(Delete)"
+                >
                   删除
                 </el-button>
               </template>
diff --git a/Yi.Pure.Vue3/src/views/system/config/utils/hook.tsx b/Yi.Pure.Vue3/src/views/system/config/utils/hook.tsx
index 817ee937..9639841f 100644
--- a/Yi.Pure.Vue3/src/views/system/config/utils/hook.tsx
+++ b/Yi.Pure.Vue3/src/views/system/config/utils/hook.tsx
@@ -1,20 +1,23 @@
 import editForm from "../form.vue";
-import { handleTree } from "@/utils/tree";
 import { message } from "@/utils/message";
-import { usePublicHooks } from "../../hooks";
 import { addDialog } from "@/components/ReDialog";
 import { reactive, ref, onMounted, h, toRaw } from "vue";
 import type { FormItemProps } from "../utils/types";
 import type { PaginationProps } from "@pureadmin/table";
-import { cloneDeep, isAllEmpty, deviceDetection } from "@pureadmin/utils";
-import { addConfig, delConfig, getConfig, getConfigList, updateConfig } from "@/api/system/config";
-import { getPlatformConfig } from "@/config/index";
+import { deviceDetection } from "@pureadmin/utils";
+import {
+  addConfig,
+  delConfig,
+  getConfig,
+  getConfigList,
+  updateConfig
+} from "@/api/system/config";
 
 export function useConfig() {
   const form = reactive({
     configName: "",
-    configKey:"",
-    configType:"",
+    configKey: "",
+    configType: ""
   });
 
   const pagination = reactive<PaginationProps>({
@@ -24,19 +27,18 @@ export function useConfig() {
     background: true
   });
 
-    /** 高亮当前权限选中行 */
-    function rowStyle({ row: { id } }) {
-      return {
-        cursor: "pointer",
-        background: id === curRow.value?.id ? "var(--el-fill-color-light)" : ""
-      };
-    }
+  /** 高亮当前权限选中行 */
+  function rowStyle({ row: { id } }) {
+    return {
+      cursor: "pointer",
+      background: id === curRow.value?.id ? "var(--el-fill-color-light)" : ""
+    };
+  }
 
   const curRow = ref();
   const formRef = ref();
   const dataList = ref([]);
   const loading = ref(true);
-  const { tagStyle } = usePublicHooks();
 
   const columns: TableColumnList = [
     {
@@ -107,7 +109,6 @@ export function useConfig() {
     loading.value = false;
   }
 
-
   async function openDialog(title = "新增", row?: FormItemProps) {
     let data: any = null;
     if (title == "修改") {
@@ -118,11 +119,11 @@ export function useConfig() {
       title: `${title}参数`,
       props: {
         formInline: {
-          configName:data?.configName?? "",
-          configKey:data?.configKey?? "",
-          configValue:data?.configValue?? "",
-          configTYpe:data?.configType?? "",
-          remark:data?.remark?? "",
+          configName: data?.configName ?? "",
+          configKey: data?.configKey ?? "",
+          configValue: data?.configValue ?? "",
+          configTYpe: data?.configType ?? "",
+          remark: data?.remark ?? ""
         }
       },
       width: "40%",
@@ -146,13 +147,13 @@ export function useConfig() {
             // 表单规则校验通过
             if (title === "新增") {
               // 实际开发先调用新增接口，再进行下面操作
-              console.log('新增参数');
+              console.log("新增参数");
               await addConfig(curData);
               chores();
             } else {
               // 实际开发先调用修改接口，再进行下面操作
-              curData.id = row.id
-              curData.creationTime = row.creationTime
+              curData.id = row.id;
+              curData.creationTime = row.creationTime;
               await updateConfig(row.id, curData);
               chores();
             }
@@ -164,7 +165,9 @@ export function useConfig() {
 
   async function handleDelete(row) {
     await delConfig([row.id]);
-    message(`您删除了参数名称为 ${row.configName} 的这条数据`, { type: "success" });
+    message(`您删除了参数名称为 ${row.configName} 的这条数据`, {
+      type: "success"
+    });
     onSearch();
   }
 
diff --git a/Yi.Pure.Vue3/src/views/system/config/utils/types.ts b/Yi.Pure.Vue3/src/views/system/config/utils/types.ts
index ebc7a3ac..24f7f093 100644
--- a/Yi.Pure.Vue3/src/views/system/config/utils/types.ts
+++ b/Yi.Pure.Vue3/src/views/system/config/utils/types.ts
@@ -5,7 +5,7 @@ interface FormItemProps {
   configKey: string;
   configType: string;
   remark: string;
-  creationTime:string;
+  creationTime: string;
 }
 interface FormProps {
   formInline: FormItemProps;
diff --git a/Yi.Pure.Vue3/src/views/system/user/form/index.vue b/Yi.Pure.Vue3/src/views/system/user/form/index.vue
index c11794fd..bcbb406b 100644
--- a/Yi.Pure.Vue3/src/views/system/user/form/index.vue
+++ b/Yi.Pure.Vue3/src/views/system/user/form/index.vue
@@ -9,7 +9,7 @@ const props = withDefaults(defineProps<FormProps>(), {
   formInline: () => ({
     title: "新增",
     higherDeptOptions: [],
-    deptId: "",
+    deptId: null,
     nick: "",
     userName: "",
     password: "",
@@ -31,6 +31,10 @@ const sexOptions = [
   {
     value: "Woman",
     label: "女"
+  },
+  {
+    value: "Unknown",
+    label: "未知"
   }
 ];
 const ruleFormRef = ref();
diff --git a/Yi.Pure.Vue3/src/views/system/user/utils/hook.tsx b/Yi.Pure.Vue3/src/views/system/user/utils/hook.tsx
index 0a36e58e..94e37dcb 100644
--- a/Yi.Pure.Vue3/src/views/system/user/utils/hook.tsx
+++ b/Yi.Pure.Vue3/src/views/system/user/utils/hook.tsx
@@ -303,13 +303,13 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
   const resetForm = formEl => {
     if (!formEl) return;
     formEl.resetFields();
-    form.deptId = "";
+    form.deptId = null;
     treeRef.value.onTreeReset();
     onSearch();
   };
 
   function onTreeSelect({ id, selected }) {
-    form.deptId = selected ? id : "";
+    form.deptId = selected ? id : null;
     onSearch();
   }
 
@@ -338,13 +338,13 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
         formInline: {
           title,
           higherDeptOptions: formatHigherDeptOptions(higherDeptOptions.value),
-          deptId: data?.deptId ?? 0,
+          deptId: data?.deptId ?? null,
           nick: data?.nick ?? "",
           userName: data?.userName ?? "",
           password: data?.password ?? "",
-          phone: data?.phone ?? "",
+          phone: data?.phone ?? null,
           email: data?.email ?? "",
-          sex: data?.sex ?? "",
+          sex: data?.sex ?? "Unknown",
           state: data?.state ?? true,
           remark: data?.remark ?? "",
           roleIds: data?.roles?.map(r => r.id),
@@ -362,7 +362,7 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
         const curData = options.props.formInline as FormItemProps;
 
         function chores() {
-          message(`您${title}了用户名称为${curData.userName}的这条数据`, {
+          message(`您${title}了用户名称为${curData.userName}的用户`, {
             type: "success"
           });
           done(); // 关闭弹框
diff --git a/Yi.Pure.Vue3/src/views/system/user/utils/rule.ts b/Yi.Pure.Vue3/src/views/system/user/utils/rule.ts
index bdb8d1b6..9c23052c 100644
--- a/Yi.Pure.Vue3/src/views/system/user/utils/rule.ts
+++ b/Yi.Pure.Vue3/src/views/system/user/utils/rule.ts
@@ -8,6 +8,7 @@ export const formRules = reactive(<FormRules>{
   userName: [{ required: true, message: "用户名称为必填项", trigger: "blur" }],
   password: [{ required: true, message: "用户密码为必填项", trigger: "blur" }],
   phone: [
+    { required: true, message: "手机号为必填项", trigger: "blur" },
     {
       validator: (rule, value, callback) => {
         if (value === "") {

From da0e207b442cb59a3a0203d02088e0d187e055ec Mon Sep 17 00:00:00 2001
From: canye <11887822+yefacan@user.noreply.gitee.com>
Date: Sun, 15 Dec 2024 17:02:36 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=87=8D=E5=A4=8D=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                   |   1 +
 Yi.RuoYi.Vue3/src/views/system/dict/data.vue | 143 +------------------
 2 files changed, 2 insertions(+), 142 deletions(-)

diff --git a/.gitignore b/.gitignore
index 89d8631b..c01ac3e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -275,3 +275,4 @@ database_backup
 /Yi.Abp.Net8/src/Yi.Abp.Web/logs/
 /Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db
 
+package-lock.json
diff --git a/Yi.RuoYi.Vue3/src/views/system/dict/data.vue b/Yi.RuoYi.Vue3/src/views/system/dict/data.vue
index ec513e78..3f6a2d9b 100644
--- a/Yi.RuoYi.Vue3/src/views/system/dict/data.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/dict/data.vue
@@ -230,149 +230,8 @@
           ></el-input>
         </el-form-item>
       </el-form>
+    </el-dialog>
 
-      <el-row :gutter="10" class="mb8">
-         <el-col :span="1.5">
-            <el-button
-               type="primary"
-               plain
-               icon="Plus"
-               @click="handleAdd"
-               v-hasPermi="['system:dict:add']"
-            >新增</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="success"
-               plain
-               icon="Edit"
-               :disabled="single"
-               @click="handleUpdate"
-               v-hasPermi="['system:dict:edit']"
-            >修改</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               :disabled="multiple"
-               @click="handleDelete"
-               v-hasPermi="['system:dict:remove']"
-            >删除</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="warning"
-               plain
-               icon="Download"
-               @click="handleExport"
-               v-hasPermi="['system:dict:export']"
-            >导出</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="warning"
-               plain
-               icon="Close"
-               @click="handleClose"
-            >关闭</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-
-      <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="字典编码" align="center" prop="id" />
-         <el-table-column label="字典标签" align="center" prop="dictLabel">
-            <template #default="scope">
-               <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{ scope.row.dictLabel }}</span>
-               <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{ scope.row.dictLabel }}</el-tag>
-            </template>
-         </el-table-column>
-         <el-table-column label="字典键值" align="center" prop="dictValue" />
-         <el-table-column label="字典排序" align="center" prop="orderNum" />
-         <el-table-column label="状态" align="center" prop="state">
-            <template #default="scope">
-               <dict-tag :options="sys_normal_disable" :value="scope.row.state" />
-            </template>
-         </el-table-column>
-         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-         <el-table-column label="创建时间" align="center" prop="creationTime" width="180">
-            <template #default="scope">
-               <span>{{ parseTime(scope.row.creationTime) }}</span>
-            </template>
-         </el-table-column>
-         <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
-            <template #default="scope">
-               <el-button
-                  link
-                  icon="Edit"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['system:dict:edit']"
-               >修改</el-button>
-               <el-button
-                  link
-                  icon="Delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="['system:dict:remove']"
-               >删除</el-button>
-            </template>
-         </el-table-column>
-      </el-table>
-
-      <pagination
-         v-show="total > 0"
-         :total="Number(total)"
-         v-model:page="queryParams.skipCount"
-         v-model:limit="queryParams.maxResultCount"
-         @pagination="getList"
-      />
-
-      <!-- 添加或修改参数配置对话框 -->
-      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-         <el-form ref="dataRef" :model="form" :rules="rules" label-width="80px">
-            <el-form-item label="字典类型">
-               <el-input v-model="form.dictType" :disabled="true" />
-            </el-form-item>
-            <el-form-item label="数据标签" prop="dictLabel">
-               <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
-            </el-form-item>
-            <el-form-item label="数据键值" prop="dictValue">
-               <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
-            </el-form-item>
-            <el-form-item label="样式属性" prop="cssClass">
-               <el-input v-model="form.cssClass" placeholder="请输入样式属性" />
-            </el-form-item>
-            <el-form-item label="显示排序" prop="dictSort">
-               <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
-            </el-form-item>
-            <el-form-item label="回显样式" prop="listClass">
-               <el-select v-model="form.listClass">
-                  <el-option
-                     v-for="item in listClassOptions"
-                     :key="item.value"
-                     :label="item.label + '(' + item.value + ')'"
-                     :value="item.value"
-                  ></el-option>
-               </el-select>
-            </el-form-item>
-            <el-form-item label="状态" prop="state">
-               <el-radio-group v-model="form.state">
-                  <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="JSON.parse(dict.value)">{{dict.label}}</el-radio>
-               </el-radio-group>
-            </el-form-item>
-            <el-form-item label="备注" prop="remark">
-               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="submitForm">确 定</el-button>
-               <el-button @click="cancel">取 消</el-button>
-            </div>
-         </template>
-      </el-dialog>
    </div>
 </template>
 

From 2cd8b73aa3d25ea50d12cf4a52462cdc5c62b8d0 Mon Sep 17 00:00:00 2001
From: "fengxian.guo" <fenngmr@outlook.com>
Date: Sat, 21 Dec 2024 08:37:10 +0800
Subject: [PATCH 4/8] =?UTF-8?q?feat:=20docker=20=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=8Adocker=E6=9E=84=E5=BB=BA=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Abp.Net8/src/Yi.Abp.Web/Dockerfile         |  2 ++
 .../src/Yi.Abp.Web/README-DOCKER-BUILD.md     | 22 +++++++++++++++++++
 Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj  |  4 ++++
 3 files changed, 28 insertions(+)
 create mode 100644 Yi.Abp.Net8/src/Yi.Abp.Web/README-DOCKER-BUILD.md

diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/Dockerfile b/Yi.Abp.Net8/src/Yi.Abp.Web/Dockerfile
index 91301637..21592fb0 100644
--- a/Yi.Abp.Net8/src/Yi.Abp.Web/Dockerfile
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Dockerfile
@@ -8,6 +8,8 @@ EXPOSE 8080
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
+
+COPY ./common.props ./
 COPY ["src/Yi.Abp.Web/Yi.Abp.Web.csproj", "src/Yi.Abp.Web/"]
 COPY ["framework/Yi.Framework.AspNetCore.Authentication.OAuth/Yi.Framework.AspNetCore.Authentication.OAuth.csproj", "framework/Yi.Framework.AspNetCore.Authentication.OAuth/"]
 COPY ["framework/Yi.Framework.AspNetCore/Yi.Framework.AspNetCore.csproj", "framework/Yi.Framework.AspNetCore/"]
diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/README-DOCKER-BUILD.md b/Yi.Abp.Net8/src/Yi.Abp.Web/README-DOCKER-BUILD.md
new file mode 100644
index 00000000..aba1e37f
--- /dev/null
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/README-DOCKER-BUILD.md
@@ -0,0 +1,22 @@
+# Docker 构建说明
+
+## 执行命令
+
+```shell
+# 在Yi.Abp.Net8 目录下执行
+docker build -t xxx-xxx:${BUILD_NUMBER} -f ./src/Yi.Abp.Web/Dockerfile . 
+
+```
+
+## 注意
+
+NuGet 源国内访问有时候会报错，可以考虑切换成华为源，加上参数
+
+```shell
+RUN dotnet restore --source https://repo.huaweicloud.com/repository/nuget/v3/index.json "./src/Yi.Abp.Web/./Yi.Abp.Web.csproj"
+
+RUN dotnet build --source https://repo.huaweicloud.com/repository/nuget/v3/index.json "./Yi.Abp.Web.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+RUN dotnet publish --source https://repo.huaweicloud.com/repository/nuget/v3/index.json "./Yi.Abp.Web.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+```
\ No newline at end of file
diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj b/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj
index 2623b61f..5be942ee 100644
--- a/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj
@@ -10,6 +10,10 @@
   <ItemGroup>
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.8.1.1" />
     <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.9.4" />
+    <!-- 解决 docker 构建冲突问题，冲突版本信息如下 -->
+    <!-- Yi.Abp.Web -> Hangfire.Redis.StackExchange 1.9.4 -> Hangfire.Core (>= 1.8.7)  -->
+    <!-- Yi.Abp.Web -> Yi.Abp.Application -> Yi.Framework.Rbac.Application -> Volo.Abp.BackgroundJobs.HangFire 0.4.1 -> Volo.Abp.HangFire 0.4.1 -> Hangfire.AspNetCore 1.6.19 -> Hangfire.Core (= 1.6.19). -->
+    <PackageReference Include="Hangfire.Core" Version="1.8.14" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.3" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />

From fe97ba1c19abc5f2d7b604d716d173b47f7db932 Mon Sep 17 00:00:00 2001
From: "fengxian.guo" <fenngmr@outlook.com>
Date: Sat, 21 Dec 2024 08:57:23 +0800
Subject: [PATCH 5/8] =?UTF-8?q?feat:=20docker=20=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=8Adocker=E6=9E=84=E5=BB=BA=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Yi.Abp.Web/README-DOCKER-BUILD.md     |  2 +-
 Yi.RuoYi.Vue3/Dockerfile                      | 19 ++++++
 Yi.RuoYi.Vue3/README-DOCKER-BUILD.md          | 13 +++++
 Yi.RuoYi.Vue3/nginx.conf                      | 58 +++++++++++++++++++
 4 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 Yi.RuoYi.Vue3/Dockerfile
 create mode 100644 Yi.RuoYi.Vue3/README-DOCKER-BUILD.md
 create mode 100644 Yi.RuoYi.Vue3/nginx.conf

diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/README-DOCKER-BUILD.md b/Yi.Abp.Net8/src/Yi.Abp.Web/README-DOCKER-BUILD.md
index aba1e37f..5589c57c 100644
--- a/Yi.Abp.Net8/src/Yi.Abp.Web/README-DOCKER-BUILD.md
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/README-DOCKER-BUILD.md
@@ -4,7 +4,7 @@
 
 ```shell
 # 在Yi.Abp.Net8 目录下执行
-docker build -t xxx-xxx:${BUILD_NUMBER} -f ./src/Yi.Abp.Web/Dockerfile . 
+docker build -t admin-server:${BUILD_NUMBER} -f ./src/Yi.Abp.Web/Dockerfile . 
 
 ```
 
diff --git a/Yi.RuoYi.Vue3/Dockerfile b/Yi.RuoYi.Vue3/Dockerfile
new file mode 100644
index 00000000..e2e186bb
--- /dev/null
+++ b/Yi.RuoYi.Vue3/Dockerfile
@@ -0,0 +1,19 @@
+FROM node:18-alpine AS build
+
+WORKDIR /app
+
+COPY package.json yarn.lock ./
+
+RUN yarn cache clean
+RUN rm -rf node_modules
+RUN yarn install --registry=https://registry.npmmirror.com
+
+COPY . .
+
+# RUN node --max-old-space-size=4096
+RUN yarn build:prod
+
+FROM nginx:alpine
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY --from=build /app/dist /usr/share/nginx/html
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/Yi.RuoYi.Vue3/README-DOCKER-BUILD.md b/Yi.RuoYi.Vue3/README-DOCKER-BUILD.md
new file mode 100644
index 00000000..63246145
--- /dev/null
+++ b/Yi.RuoYi.Vue3/README-DOCKER-BUILD.md
@@ -0,0 +1,13 @@
+# Docker 构建说明
+
+## 执行命令
+
+```shell
+# 在Yi.RuoYi.Vue3 目录下执行
+docker build -t rouoyi-web:${BUILD_NUMBER} .
+
+```
+
+## 注意
+
+nginx.conf 中替换为自己服务器后端地址
\ No newline at end of file
diff --git a/Yi.RuoYi.Vue3/nginx.conf b/Yi.RuoYi.Vue3/nginx.conf
new file mode 100644
index 00000000..8ddec0d3
--- /dev/null
+++ b/Yi.RuoYi.Vue3/nginx.conf
@@ -0,0 +1,58 @@
+worker_processes 1;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    server {
+        listen 80;
+
+        server_name _;
+
+        root /usr/share/nginx/html;
+        index index.html index.htm;
+  
+        location /prod-api/ {
+            # 替换成自己的后端服务地址
+            proxy_pass http://localhost:19001/api/app/;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header Authorization $http_authorization;
+            proxy_set_header Cookie $http_cookie;
+        }
+
+        location /prod-ws/ {
+            # 替换成自己的后端服务地址
+            proxy_pass http://localhost:19001/hub/;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection 'upgrade';
+            # rewrite ^/prod-ws(/.*)$ $1 break;
+        }
+
+        location / {
+            try_files $uri $uri/ /index.html;
+        }
+
+
+        error_page 404 /404.html;
+        location = /404.html {
+            root /usr/share/nginx/html;
+        }
+
+        location ~* \.(jpg|jpeg|png|gif|ico|css|js)$ {
+            expires 1y;
+            add_header Cache-Control "public, no-transform";
+        }
+    }
+}

From ea134f52be5de634fe420f665fe840521343dda1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E7=BA=A7CV=E5=B7=A5=E7=A8=8B=E5=B8=88?=
 <2535688890@qq.com>
Date: Sat, 21 Dec 2024 03:33:37 +0000
Subject: [PATCH 6/8] =?UTF-8?q?options=20=E6=8B=BC=E5=86=99=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 高级CV工程师 <2535688890@qq.com>
---
 Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs
index bcf35ec9..d148f226 100644
--- a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.Text;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
@@ -97,10 +97,10 @@ namespace Yi.Abp.Web
             var service = context.Services;
 
             //请求日志
-            Configure<AbpAuditingOptions>(optios =>
+            Configure<AbpAuditingOptions>(options =>
             {
                 //默认关闭，开启会有大量的审计日志
-                optios.IsEnabled = true;
+                options.IsEnabled = true;
             });
             //忽略审计日志路径
             Configure<AbpAspNetCoreAuditingOptions>(options =>

From 4e6676203603bcf2a0430fad8be81462448b13ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sat, 21 Dec 2024 14:49:51 +0800
Subject: [PATCH 7/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Pure.Vue3/src/store/modules/user.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Yi.Pure.Vue3/src/store/modules/user.ts b/Yi.Pure.Vue3/src/store/modules/user.ts
index e5f10379..8c389d9d 100644
--- a/Yi.Pure.Vue3/src/store/modules/user.ts
+++ b/Yi.Pure.Vue3/src/store/modules/user.ts
@@ -94,6 +94,7 @@ export const useUserStore = defineStore({
                 storeData.avatar = resInfo.data.user.icon;
                 storeData.nickname = resInfo.data.user.nick;
                 storeData.roles = resInfo.data.roleCodes;
+                storeData.permissions = resInfo.data.permissions;
                 setToken(storeData);
                 resolve(resInfo);
               });

From 48dc89c43dfe69497d5715d48e827dc4112575fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sat, 21 Dec 2024 15:04:54 +0800
Subject: [PATCH 8/8] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=AF=B9?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84guid?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../YiFrameworkSqlSugarCoreModule.cs          | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/YiFrameworkSqlSugarCoreModule.cs b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/YiFrameworkSqlSugarCoreModule.cs
index 7cc138ac..4d83a783 100644
--- a/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/YiFrameworkSqlSugarCoreModule.cs
+++ b/Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/YiFrameworkSqlSugarCoreModule.cs
@@ -9,6 +9,7 @@ using SqlSugar;
 using Volo.Abp.Data;
 using Volo.Abp.Domain;
 using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Guids;
 using Yi.Framework.SqlSugarCore.Abstractions;
 using Yi.Framework.SqlSugarCore.Repositories;
 using Yi.Framework.SqlSugarCore.Uow;
@@ -24,7 +25,32 @@ namespace Yi.Framework.SqlSugarCore
             var configuration = service.GetConfiguration();
             var section = configuration.GetSection("DbConnOptions");
             Configure<DbConnOptions>(section);
+            var dbConnOptions = new DbConnOptions();
+            section.Bind(dbConnOptions);
 
+            //很多人遗漏了这一点，不同的数据库，对于主键的使用规约不一样，需要根据数据库进行判断
+            SequentialGuidType guidType;
+            switch (dbConnOptions.DbType)
+            {
+                case DbType.MySql:
+                case DbType.PostgreSQL:
+                    guidType= SequentialGuidType.SequentialAsString;
+                    break;
+                case DbType.SqlServer:
+                    guidType = SequentialGuidType.SequentialAtEnd;
+                    break;
+                case DbType.Oracle:
+                    guidType = SequentialGuidType.SequentialAsBinary;
+                    break;
+                default:
+                    guidType = SequentialGuidType.SequentialAtEnd;
+                    break;
+            }
+            Configure<AbpSequentialGuidGeneratorOptions>(options =>
+            {
+                options.DefaultSequentialGuidType = guidType;
+            });
+            
             service.TryAddScoped<ISqlSugarDbContext, SqlSugarDbContextFactory>();
 
             //不开放sqlsugarClient