diff --git a/docker_env/nginx/my.conf b/docker_env/nginx/my.conf
index 94fe805e744b5b5455a56f14710d64a525bf5627..30fa2108d1ae318b5841bfb237d389444a241ad1 100644
--- a/docker_env/nginx/my.conf
+++ b/docker_env/nginx/my.conf
@@ -28,6 +28,6 @@ server {
         proxy_send_timeout 600s;
         real_ip_header X-Forwarded-For;
         rewrite ^/api/(.*)$ /$1 break;  #重写
-        proxy_pass http://178.10.0.12:8000/; # 设置代理服务器的协议和地址
+        proxy_pass http://177.8.0.12:8000/; # 设置代理服务器的协议和地址
      }
  }
diff --git a/web/.env.production b/web/.env.production
index 70cd18d579ea1b477f8fd6956eed1b8dcaaf5dab..998aa5e15fe3f7cd5a3765c4c1b82dd2a629b2f0 100644
--- a/web/.env.production
+++ b/web/.env.production
@@ -2,7 +2,7 @@
 ENV = 'production'
 
 # 线上环境接口地址
-VITE_API_URL = ''
+VITE_API_URL = '/api' # docker-compose部署不需要修改，nginx容器自动代理了这个地址
 
 # 是否启用按钮权限
 VITE_PM_ENABLED = true
diff --git a/web/package.json b/web/package.json
index 4349cde8648a36bbca061ff9b058bce7c0b54ef4..345af77ca283cd8d7dd8cc813c37868988b1809a 100644
--- a/web/package.json
+++ b/web/package.json
@@ -10,10 +10,10 @@
 	},
 	"dependencies": {
 		"@element-plus/icons-vue": "^2.0.10",
-		"@fast-crud/fast-crud": "^1.11.10",
-		"@fast-crud/fast-extends": "^1.11.10",
-		"@fast-crud/ui-element": "^1.11.10",
-		"@fast-crud/ui-interface": "^1.11.9",
+		"@fast-crud/fast-crud": "^1.13.2",
+		"@fast-crud/fast-extends": "^1.13.2",
+		"@fast-crud/ui-element": "^1.13.2",
+		"@fast-crud/ui-interface": "^1.13.2",
 		"@vitejs/plugin-vue-jsx": "^3.0.0",
 		"@wangeditor/editor": "^5.1.23",
 		"@wangeditor/editor-for-vue": "^5.1.12",
diff --git a/web/src/settings.ts b/web/src/settings.ts
index 588a6a058d1eb260556e63c1b6de2620278da85d..b43526eb571a2474527e161d52751449aa98e9e5 100644
--- a/web/src/settings.ts
+++ b/web/src/settings.ts
@@ -7,8 +7,9 @@ import { setLogger } from '@fast-crud/fast-crud';
 import ui from '@fast-crud/ui-element';
 import { request } from '/@/utils/service';
 //扩展包
-import { FsExtendsEditor } from '@fast-crud/fast-extends';
+import { FsExtendsEditor,FsExtendsUploader } from '@fast-crud/fast-extends';
 import '@fast-crud/fast-extends/dist/style.css';
+import { successMessage, successNotification } from '/@/utils/message';
 export default {
 	async install(app: any, options: any) {
 		// 先安装ui
@@ -18,7 +19,10 @@ export default {
 			//i18n, //i18n配置，可选，默认使用中文，具体用法请看demo里的 src/i18n/index.js 文件
 			// 此处配置公共的dictRequest（字典请求）
 			async dictRequest({ dict }: any) {
-				return await request({ url: dict.url, params: dict.params || {} }); //根据dict的url，异步返回一个字典数组
+				//根据dict的url，异步返回一个字典数组
+				return await request({ url: dict.url, params: dict.params || {} }).then((res:any)=>{
+					return res.data
+				});
 			},
 			//公共crud配置
 			commonOptions() {
@@ -40,6 +44,14 @@ export default {
 							return { records: res.data, currentPage: res.page, pageSize: res.limit, total: res.total };
 						},
 					},
+					form: {
+						afterSubmit(ctx: any) {
+							// 增加crud提示
+							if (ctx.res.code == 2000) {
+								successNotification(ctx.res.msg);
+							}
+						},
+					},
 					/* search: {
 						layout: 'multi-line',
 						collapse: true,
@@ -63,6 +75,39 @@ export default {
 				width: 300,
 			},
 		});
+		// 文件上传
+		app.use(FsExtendsUploader, {
+			defaultType: "form",
+			form: {
+				action: `/api/system/file/`,
+				name: "file",
+				withCredentials: false,
+				uploadRequest: async ({ action, file, onProgress }) => {
+					// @ts-ignore
+					const data = new FormData();
+					data.append("file", file);
+					return await request({
+						url: action,
+						method: "post",
+						timeout: 60000,
+						headers: {
+							"Content-Type": "multipart/form-data"
+						},
+						data,
+						onUploadProgress: (p) => {
+							onProgress({ percent: Math.round((p.loaded / p.total) * 100) });
+						}
+					});
+				},
+				successHandle(ret) {
+					// 上传完成后的结果处理， 此处应返回格式为{url:xxx,key:xxx}
+					return {
+						url: getBaseURL() + ret.data.url,
+						key: ret.data.id
+					};
+				}
+			}
+		})
 		setLogger({ level: 'error' });
 		// 设置自动染色
 		const dictComponentList = ['dict-cascader', 'dict-checkbox', 'dict-radio', 'dict-select', 'dict-switch', 'dict-tree'];
diff --git a/web/src/utils/baseUrl.ts b/web/src/utils/baseUrl.ts
index 617e9f9ec2965477ca3fdaee8c0b03cbc6556f31..c22daa83ff86972834bad25c1d701ebb6f56787b 100644
--- a/web/src/utils/baseUrl.ts
+++ b/web/src/utils/baseUrl.ts
@@ -1,61 +1,67 @@
+import { pluginsAll } from '/@/views/plugins/index';
+
 /**
  * @description 校验是否为租户模式。租户模式把域名替换成 域名 加端口
  */
 export const getBaseURL = function () {
-    var baseURL = import.meta.env.VITE_API_URL as any
-    var param = baseURL.split('/')[3] || ''
-    if (window.pluginsAll && window.pluginsAll.indexOf('dvadmin-tenants-web') !== -1 && (!param || baseURL.startsWith('/'))) {
-        // 1.把127.0.0.1 替换成和前端一样域名
-        // 2.把 ip 地址替换成和前端一样域名
-        // 3.把 /api 或其他类似的替换成和前端一样域名
-        // document.domain
-        var host = baseURL.split('/')[2]
-        if (host) {
-            var prot = baseURL.split(':')[2] || 80
-            if (prot === 80 || prot === 443) {
-                host = document.domain
-            } else {
-                host = document.domain + ':' + prot
-            }
-            baseURL = baseURL.split('/')[0] + '//' + baseURL.split('/')[1] + host + '/' + param
-        } else {
-            baseURL = location.protocol + '//' + location.hostname + (location.port ? ':' : '') + location.port + baseURL
-        }
-    }
-    if (!baseURL.endsWith('/')) {
-        baseURL += '/'
-    }
-    return baseURL
-}
+	var baseURL = import.meta.env.VITE_API_URL as any;
+	var param = baseURL.split('/')[3] || '';
+	// @ts-ignore
+	if (pluginsAll && pluginsAll.indexOf('dvadmin3-tenants-web') !== -1 && (!param || baseURL.startsWith('/'))) {
+		// 1.把127.0.0.1 替换成和前端一样域名
+		// 2.把 ip 地址替换成和前端一样域名
+		// 3.把 /api 或其他类似的替换成和前端一样域名
+		// document.domain
+
+		var host = baseURL.split('/')[2];
+		if (host) {
+			var port = baseURL.split(':')[2] || 80;
+			if (port === 80 || port === 443) {
+				host = document.domain;
+			} else {
+				host = document.domain + ':' + port;
+			}
+			baseURL = baseURL.split('/')[0] + '//' + baseURL.split('/')[1] + host + '/' + param;
+		} else {
+			baseURL = location.protocol + '//' + location.hostname + (location.port ? ':' : '') + location.port + baseURL;
+		}
+	}
+	if (!baseURL.endsWith('/')) {
+		baseURL += '/';
+	}
+	return baseURL;
+};
 
 export const getWsBaseURL = function () {
-    let baseURL = import.meta.env.VITE_API_URL as any
-    let param = baseURL.split('/')[3] || ''
-    if (window.pluginsAll && window.pluginsAll.indexOf('dvadmin-tenants-web') !== -1 && (!param || baseURL.startsWith('/'))) {
-        // 1.把127.0.0.1 替换成和前端一样域名
-        // 2.把 ip 地址替换成和前端一样域名
-        // 3.把 /api 或其他类似的替换成和前端一样域名
-        // document.domain
-        var host = baseURL.split('/')[2]
-        if (host) {
-            var prot = baseURL.split(':')[2] || 80
-            if (prot === 80 || prot === 443) {
-                host = document.domain
-            } else {
-                host = document.domain + ':' + prot
-            }
-            baseURL = baseURL.split('/')[0] + '//' + baseURL.split('/')[1] + host + '/' + param
-        } else {
-            baseURL = location.protocol + '//' + location.hostname + (location.port ? ':' : '') + location.port + baseURL
-        }
-    } else if (param !== '' || baseURL.startsWith('/')) {
-        baseURL = (location.protocol === 'https:' ? 'wss://' : 'ws://') + location.hostname + (location.port ? ':' : '') + location.port + baseURL
-    }
-    if (!baseURL.endsWith('/')) {
-        baseURL += '/'
-    }
-    if (baseURL.startsWith('http')) { // https 也默认会被替换成 wss
-        baseURL = baseURL.replace('http', 'ws')
-    }
-    return baseURL
-}
+	let baseURL = import.meta.env.VITE_API_URL as any;
+	let param = baseURL.split('/')[3] || '';
+	// @ts-ignore
+	if (pluginsAll && pluginsAll.indexOf('dvadmin3-tenants-web') !== -1 && (!param || baseURL.startsWith('/'))) {
+		// 1.把127.0.0.1 替换成和前端一样域名
+		// 2.把 ip 地址替换成和前端一样域名
+		// 3.把 /api 或其他类似的替换成和前端一样域名
+		// document.domain
+		var host = baseURL.split('/')[2];
+		if (host) {
+			var port = baseURL.split(':')[2] || 80;
+			if (port === 80 || port === 443) {
+				host = document.domain;
+			} else {
+				host = document.domain + ':' + port;
+			}
+			baseURL = baseURL.split('/')[0] + '//' + baseURL.split('/')[1] + host + '/' + param;
+		} else {
+			baseURL = location.protocol + '//' + location.hostname + (location.port ? ':' : '') + location.port + baseURL;
+		}
+	} else if (param !== '' || baseURL.startsWith('/')) {
+		baseURL = (location.protocol === 'https:' ? 'wss://' : 'ws://') + location.hostname + (location.port ? ':' : '') + location.port + baseURL;
+	}
+	if (!baseURL.endsWith('/')) {
+		baseURL += '/';
+	}
+	if (baseURL.startsWith('http')) {
+		// https 也默认会被替换成 wss
+		baseURL = baseURL.replace('http', 'ws');
+	}
+	return baseURL;
+};
diff --git a/web/src/utils/message.ts b/web/src/utils/message.ts
index 0e3bc4b133884b7c48e025c8d4fa896946e65538..a022c0ba5b4ff7c06f0804e3632fce85871c0497 100644
--- a/web/src/utils/message.ts
+++ b/web/src/utils/message.ts
@@ -1,10 +1,10 @@
-import { ElMessage, MessageOptions } from 'element-plus';
+import { ElMessage, ElNotification, MessageOptions } from 'element-plus';
 
 export function message(message: string, option?: MessageOptions) {
 	ElMessage({ message, ...option });
 }
 export function successMessage(message: string, option?: MessageOptions) {
-	ElMessage({ message, ...option, type: 'success' });
+	ElMessage({ message, type: 'success' });
 }
 export function warningMessage(message: string, option?: MessageOptions) {
 	ElMessage({ message, ...option, type: 'warning' });
@@ -15,3 +15,19 @@ export function errorMessage(message: string, option?: MessageOptions) {
 export function infoMessage(message: string, option?: MessageOptions) {
 	ElMessage({ message, ...option, type: 'info' });
 }
+
+export function notification(message: string) {
+	ElNotification({ message });
+}
+export function successNotification(message: string) {
+	ElNotification({ message, type: 'success' });
+}
+export function warningNotification(message: string) {
+	ElNotification({ message, type: 'warning' });
+}
+export function errorNotification(message: string) {
+	ElNotification({ message, type: 'error' });
+}
+export function infoNotification(message: string) {
+	ElNotification({ message, type: 'info' });
+}
diff --git a/web/src/utils/service.ts b/web/src/utils/service.ts
index c3b46446fcfbe4f02ab0b09219eba8c3a22b9cfb..023f268a2eccb54c2d202d7cdf144439080befca 100644
--- a/web/src/utils/service.ts
+++ b/web/src/utils/service.ts
@@ -1,7 +1,7 @@
 import axios from 'axios';
 import { get } from 'lodash-es';
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { Action } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus';
+import type { Action } from 'element-plus';
 
 // @ts-ignore
 import { errorLog, errorCreate } from './tools.ts';
@@ -9,6 +9,7 @@ import { errorLog, errorCreate } from './tools.ts';
 // import { useUserStore } from "../store/modules/user";
 import { Local, Session } from '/@/utils/storage';
 import qs from 'qs';
+import { getBaseURL } from './baseUrl';
 /**
  * @description 创建请求实例
  */
@@ -17,16 +18,19 @@ function createService() {
 	const service = axios.create({
 		timeout: 20000,
 		headers: {
-			'Content-Type': 'application/json;charset=utf-8'
+			'Content-Type': 'application/json;charset=utf-8',
 		},
 		paramsSerializer: {
 			serialize(params) {
-				return qs.stringify(params, {  indices: false,encoder: (val:string) => {
+				return qs.stringify(params, {
+					indices: false,
+					encoder: (val: string) => {
 						if (typeof val === 'boolean') {
 							return val ? 1 : 0;
 						}
 						return val;
-					} });
+					},
+				});
 			},
 		},
 	});
@@ -76,7 +80,7 @@ function createService() {
 							callback: (action: Action) => {
 								window.location.reload();
 							},
-						})
+						});
 						errorCreate(`${dataAxios.msg}: ${response.config.url}`);
 						break;
 					case 2000:
@@ -108,7 +112,7 @@ function createService() {
 						callback: (action: Action) => {
 							window.location.reload();
 						},
-					})
+					});
 					break;
 				case 403:
 					error.message = '拒绝访问';
@@ -162,7 +166,7 @@ function createRequestFunction(service: any) {
 				'Content-Type': get(config, 'headers.Content-Type', 'application/json'),
 			},
 			timeout: 5000,
-			baseURL: import.meta.env.VITE_API_URL as any,
+			baseURL: getBaseURL(),
 			data: {},
 		};
 
diff --git a/web/src/views/plugins/index.ts b/web/src/views/plugins/index.ts
index fe9b889c5ee795855ba37a5f64f479a48e3607eb..7ba8bf9e3e32686bc51b1c9f80357432fa80ab22 100644
--- a/web/src/views/plugins/index.ts
+++ b/web/src/views/plugins/index.ts
@@ -1,5 +1,5 @@
 import { defineAsyncComponent, AsyncComponentLoader } from 'vue';
-
+export let pluginsAll: any = [];
 // 扫描插件目录并注册插件
 export const scanAndInstallPlugins = (app: any) => {
 	const components = import.meta.glob('./**/*.vue');
@@ -11,5 +11,6 @@ export const scanAndInstallPlugins = (app: any) => {
 		const pluginsName = key.match(/\/([^\/]*)\//)?.[1];
 		pluginNames.add(pluginsName);
 	}
-	console.log('已发现插件：', Array.from(pluginNames));
+	pluginsAll = Array.from(pluginNames);
+	console.log('已发现插件：', pluginsAll);
 };
diff --git a/web/src/views/system/config/components/addContent.vue b/web/src/views/system/config/components/addContent.vue
index 6284a181f176c0551fdf904ef96f3ab9ef504340..e7e9e4d0545fe35bc85ffed9023dc959b5791bdc 100644
--- a/web/src/views/system/config/components/addContent.vue
+++ b/web/src/views/system/config/components/addContent.vue
@@ -40,7 +40,7 @@
 				<el-input-number v-model="form.sort" :min="0" :max="99"></el-input-number>
 			</el-form-item>
 			<el-form-item>
-				<el-button type="primary" @click="onSubmit">立即创建</el-button>
+				<el-button type="primary" @click="onSubmit(formRef)">立即创建</el-button>
 			</el-form-item>
 		</el-form>
 	</div>
@@ -49,7 +49,7 @@
 <script setup lang="ts">
 import * as api from '../api';
 import associationTable from './components/associationTable.vue';
-import { ref, reactive, onMounted } from 'vue';
+import {ref, reactive, onMounted, inject} from 'vue';
 import type { FormInstance, FormRules } from 'element-plus';
 import { successMessage } from '/@/utils/message';
 import { dictionary } from '/@/utils/dictionary';
@@ -118,12 +118,17 @@ const getParent = () => {
 			parentOptions.value = res.data;
 		});
 };
+
+const refreshView:any = inject('refreshView')
 const onSubmit = async (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	await formEl.validate((valid, fields) => {
 		if (valid) {
 			api.AddObj(form).then((res: any) => {
-				if (res.code == 2000) successMessage('新增成功');
+				if (res.code == 2000) {
+          successMessage('新增成功');
+          refreshView()
+        }
 			});
 		} else {
 			console.log('error submit!', fields);
diff --git a/web/src/views/system/config/components/addTabs.vue b/web/src/views/system/config/components/addTabs.vue
index 024595d41a6f006c4187ace31a299502e6060f2c..eef90180742262def4b8fd9327c7d94fd8e1ea25 100644
--- a/web/src/views/system/config/components/addTabs.vue
+++ b/web/src/views/system/config/components/addTabs.vue
@@ -17,9 +17,10 @@
 
 <script setup lang="ts">
 import * as api from '../api';
-import { ref, reactive } from 'vue';
+import {ref, reactive, inject} from 'vue';
 import type { FormInstance, FormRules } from 'element-plus';
 import { successMessage } from '/@/utils/message';
+
 let form = reactive({
 	title: null,
 	key: null,
@@ -43,12 +44,19 @@ const rules = reactive<FormRules>({
 		},
 	],
 });
+
+
+const refreshView:any = inject('refreshView')
 const onSubmit = async (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
 	await formEl.validate((valid, fields) => {
 		if (valid) {
 			api.AddObj(form).then((res: any) => {
-				if (res.code == 2000) successMessage('新增成功');
+				if (res.code == 2000) {
+          successMessage('新增成功');
+          refreshView()
+        }
+
 			});
 		} else {
 			console.log('error submit!', fields);
diff --git a/web/src/views/system/config/components/formContent.vue b/web/src/views/system/config/components/formContent.vue
index d00c3f66da008f937d250c3c5022552567793ffe..845e90f5bf5d5e78bd99bf738b852a99d4f5baef 100644
--- a/web/src/views/system/config/components/formContent.vue
+++ b/web/src/views/system/config/components/formContent.vue
@@ -85,6 +85,7 @@
               :key="index + 6"
               v-else-if="item.form_item_type_label === 'switch'"
               v-model="formData[item.key]"
+              :inactive-value="false"
               active-color="#13ce66"
               inactive-color="#ff4949"
           >
@@ -274,7 +275,7 @@ const validRules = reactive<FormRules>({
   ],
 });
 const formRef =  ref<FormInstance>()
-let uploadUrl = ref(getBaseURL + 'api/system/file/');
+let uploadUrl = ref(getBaseURL() + 'api/system/file/');
 let uploadHeaders = ref({
   Authorization: 'JWT ' + Session.get('token'),
 });
@@ -296,7 +297,7 @@ const getInit = () => {
         if ([5, 12, 14].indexOf(item.form_item_type) !== -1) {
           _formData[key] = [];
         } else {
-          _formData[key] = undefined;
+          _formData[key] = item.value;
         }
       }
       if (item.form_item_type_label === 'array') {
diff --git a/web/src/views/system/fileList/api.ts b/web/src/views/system/fileList/api.ts
index 06c64995722f66966294749782624dd04793aadf..7c5708b1b8db7c49cea171aee36ced8297935a06 100644
--- a/web/src/views/system/fileList/api.ts
+++ b/web/src/views/system/fileList/api.ts
@@ -6,7 +6,7 @@ export function GetList(query: UserPageQuery) {
 	return request({
 		url: apiPrefix,
 		method: 'get',
-		data: query,
+		params: query,
 	});
 }
 export function GetObj(id: InfoReq) {
diff --git a/web/src/views/system/log/loginLog/api.ts b/web/src/views/system/log/loginLog/api.ts
index 71575dd2c236a0a9cd853e932757ec265df5188e..defefc49441777cb5a1c1768fdd3fd7d7a6718f8 100644
--- a/web/src/views/system/log/loginLog/api.ts
+++ b/web/src/views/system/log/loginLog/api.ts
@@ -6,7 +6,7 @@ export function GetList(query: UserPageQuery) {
 	return request({
 		url: apiPrefix,
 		method: 'get',
-		data: query,
+		params: query,
 	});
 }
 export function GetObj(id: InfoReq) {
diff --git a/web/src/views/system/login/component/account.vue b/web/src/views/system/login/component/account.vue
index 585cf4c117841869fb1c7b7a3d1dcdc3e10609f2..908f77d1bfc2f0a2a64254430b8e4bee5e46c800 100644
--- a/web/src/views/system/login/component/account.vue
+++ b/web/src/views/system/login/component/account.vue
@@ -12,7 +12,6 @@
 				:type="isShowPassword ? 'text' : 'password'"
 				:placeholder="$t('message.account.accountPlaceholder2')"
 				v-model="ruleForm.password"
-				autocomplete="off"
 			>
 				<template #prefix>
 					<el-icon class="el-input__icon"><ele-Unlock /></el-icon>
@@ -50,7 +49,7 @@
 			</el-col>
 		</el-form-item>
 		<el-form-item class="login-animation4">
-			<el-button type="primary" class="login-content-submit" round @click="loginClick" :loading="loading.signIn">
+			<el-button type="primary" class="login-content-submit" round @click.enter="loginClick" :loading="loading.signIn">
 				<span>{{ $t('message.account.accountBtnText') }}</span>
 			</el-button>
 		</el-form-item>
@@ -182,10 +181,10 @@ export default defineComponent({
 			getCaptcha();
 			//获取系统配置
 			SystemConfigStore().getSystemConfigs();
-			window.addEventListener('keyup', enterClickLogin, false);
+			// window.addEventListener('keyup', enterClickLogin, false);
 		});
 		onUnmounted(() => {
-			window.removeEventListener('keyup', enterClickLogin, false);
+			// window.removeEventListener('keyup', enterClickLogin, false);
 		});
 
 		return {
diff --git a/web/src/views/system/menu/components/menuButton/crud.tsx b/web/src/views/system/menu/components/menuButton/crud.tsx
index 50c79df5a24baedae4f27b65b730818d70d0c984..0ab209558ff0691faf0ad89b89462ab4791a74d0 100644
--- a/web/src/views/system/menu/components/menuButton/crud.tsx
+++ b/web/src/views/system/menu/components/menuButton/crud.tsx
@@ -16,7 +16,6 @@ import { request } from '/@/utils/service';
 //此处为crudOptions配置
 export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
 	const pageRequest = async (query: UserPageQuery) => {
-		console.log(context!.selectOptions);
 		return await api.GetList({ menu: context!.selectOptions.value.id } as any);
 	};
 	const editRequest = async ({ form, row }: EditReq) => {
@@ -27,7 +26,7 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 		return await api.DelObj(row.id);
 	};
 	const addRequest = async ({ form }: AddReq) => {
-		return await api.AddObj(form);
+		return await api.AddObj({ ...form, ...{ menu: context!.selectOptions.value.id } });
 	};
 	return {
 		crudOptions: {
diff --git a/web/src/views/system/menu/index.vue b/web/src/views/system/menu/index.vue
index 0eadbe7f1e59d03051f791822c628ba07ecbb843..30849c0abaf15583f0995c16a1d8a7afd4250b1f 100644
--- a/web/src/views/system/menu/index.vue
+++ b/web/src/views/system/menu/index.vue
@@ -6,29 +6,23 @@
 					<p class="font-mono font-black text-center text-xl pb-5">
 						菜单列表
 						<el-tooltip effect="dark" :content="content" placement="right">
-							<el-icon> <QuestionFilled /> </el-icon>
+							<el-icon>
+								<QuestionFilled />
+							</el-icon>
 						</el-tooltip>
 					</p>
 					<el-input v-model="filterText" :placeholder="placeholder" />
-					<el-tree
-						ref="treeRef"
-						class="font-mono font-bold leading-6 text-7xl"
-						:data="data"
-						:props="treeProps"
-						:filter-node-method="filterNode"
-						:load="loadNode"
-						:allow-drag="allowDrag"
-						:allow-drop="allowDrop"
-						@node-drop="nodeDrop"
-						lazy
-						icon="ArrowRightBold"
-						:indent="12"
-						draggable
-						@node-click="handleNodeClick"
-					>
+					<el-tree ref="treeRef" class="font-mono font-bold leading-6 text-7xl" :data="data" :props="treeProps"
+						:filter-node-method="filterNode" :load="loadNode" :allow-drag="allowDrag" :allow-drop="allowDrop"
+						@node-drop="nodeDrop" lazy icon="ArrowRightBold" :indent="12" draggable
+						@node-click="handleNodeClick">
 						<template #default="{ node, data }">
-							<span v-if="data.status" class="text-center font-black text-xl"><SvgIcon :name="node.data.icon" />&nbsp;{{ node.label }}</span>
-							<span v-else class="text-center font-black text-xl text-red-700"><SvgIcon :name="node.data.icon" />&nbsp;{{ node.label }}</span>
+							<span v-if="data.status" class="text-center font-black text-xl">
+								<SvgIcon :name="node.data.icon" />&nbsp;{{ node.label }}
+							</span>
+							<span v-else class="text-center font-black text-xl text-red-700">
+								<SvgIcon :name="node.data.icon" />&nbsp;{{ node.label }}
+							</span>
 						</template>
 					</el-tree>
 				</el-card>
@@ -42,29 +36,26 @@
 						</el-divider>
 						<el-row>
 							<el-col :span="10">
-								<el-form-item label="菜单ID" prop="id"> <el-input v-model="form.id" disabled /> </el-form-item>
+								<el-form-item label="菜单ID" prop="id"> <el-input v-model="form.id" disabled />
+								</el-form-item>
 							</el-col>
 							<el-col :span="10">
 								<el-form-item label="父级ID" prop="parent"> <el-input v-model="form.parent" /> </el-form-item>
 							</el-col>
 							<el-col :span="10">
-								<el-form-item required label="菜单名称" prop="name"> <el-input v-model="form.name" /> </el-form-item>
+								<el-form-item required label="菜单名称" prop="name"> <el-input v-model="form.name" />
+								</el-form-item>
 							</el-col>
 							<el-col :span="10">
 								<el-form-item label="组件地址" prop="component">
-									<el-autocomplete
-										class="w-full"
-										v-model="form.component"
-										:fetch-suggestions="querySearch"
-										:trigger-on-focus="false"
-										clearable
-										debounce="100"
-										placeholder="输入组件地址"
-									/>
+									<el-autocomplete class="w-full" v-model="form.component"
+										:fetch-suggestions="querySearch" :trigger-on-focus="false" clearable debounce="100"
+										placeholder="输入组件地址" />
 								</el-form-item>
 							</el-col>
 							<el-col :span="10">
-								<el-form-item required label="Url" prop="web_path"> <el-input v-model="form.web_path" /> </el-form-item>
+								<el-form-item required label="Url" prop="web_path"> <el-input v-model="form.web_path" />
+								</el-form-item>
 							</el-col>
 							<el-col :span="10">
 								<el-form-item label="排序" prop="sort">
@@ -79,6 +70,14 @@
 									</el-radio-group>
 								</el-form-item>
 							</el-col>
+							<el-col :span="10">
+								<el-form-item label="侧边可见">
+									<el-radio-group v-model="form.visible">
+										<el-radio :label="true">启用</el-radio>
+										<el-radio :label="false">禁用</el-radio>
+									</el-radio-group>
+								</el-form-item>
+							</el-col>
 
 							<el-col :span="20">
 								<el-form-item label="图标" prop="icon">
@@ -97,7 +96,9 @@
 						</el-row>
 						<el-row>
 							<el-col class="h-full">
-								<el-card :body-style="{ height: '100%' }" class="mt-10"><menuButton :select-menu="form" /></el-card>
+								<el-card :body-style="{ height: '100%' }" class="mt-10">
+									<menuButton :select-menu="form" />
+								</el-card>
 							</el-col>
 						</el-row>
 					</el-form>
@@ -240,6 +241,7 @@ let form: Form<any> = reactive({
 	is_catalog: false,
 	permission: '',
 	icon: '',
+	visible: ''
 });
 
 let menuPermissonList = ref([]);
diff --git a/web/src/views/system/personal/index.vue b/web/src/views/system/personal/index.vue
index a84fddfd9939a0feddbd35344843666ec6ac3059..b87fbcb41f2aacb3ba312befa223ae507f24cd61 100644
--- a/web/src/views/system/personal/index.vue
+++ b/web/src/views/system/personal/index.vue
@@ -84,9 +84,10 @@
 							<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
 								<el-form-item label="性别">
 									<el-select v-model="state.personalForm.gender" placeholder="请选择性别" clearable class="w100">
-										<el-option label="男" :value="1"></el-option>
-										<el-option label="女" :value="0"></el-option>
-										<el-option label="保密" :value="2"></el-option>
+<!--										<el-option label="男" :value="1"></el-option>-->
+<!--										<el-option label="女" :value="0"></el-option>-->
+<!--										<el-option label="保密" :value="2"></el-option>-->
+                    <el-option v-for="(item,index) in genderList" :key="index" :label="item.label" :value="item.value"></el-option>
 									</el-select>
 								</el-form-item>
 							</el-col>
@@ -180,6 +181,7 @@ import { Session } from '/@/utils/storage';
 import { useRouter } from 'vue-router';
 import { useUserInfo } from '/@/stores/userInfo';
 import { successMessage } from '/@/utils/message';
+import {dictionary} from "/@/utils/dictionary";
 
 // 头像裁剪组件
 const avatarSelector = defineAsyncComponent(() => import('/@/components/avatarSelector/index.vue'));
@@ -226,12 +228,14 @@ const msgMore = () => {
 	route.push({ path: '/messageCenter' });
 };
 
+const genderList = ref();
 /**
  * 获取用户个人信息
  */
 const getUserInfo = function () {
 	api.GetUserInfo({}).then((res: any) => {
 		const { data } = res;
+    genderList.value = dictionary('gender')
 		state.personalForm.avatar = data.avatar || '';
 		state.personalForm.username = data.username || '';
 		state.personalForm.name = data.name || '';
diff --git a/web/src/views/system/rolePermission/index.vue b/web/src/views/system/rolePermission/index.vue
index fe5e9ba6e04e0339b74b54dc53fcbe0707b59014..724d5a51b6bc8bd909929a9fdd34daca699e555f 100644
--- a/web/src/views/system/rolePermission/index.vue
+++ b/web/src/views/system/rolePermission/index.vue
@@ -323,7 +323,8 @@ const onSaveButtonForm = async () => {
   await buttonFormRef.value.validate((valid, fields) => {
     if (valid) {
       api.CreatePermission(form).then((res: any) => {
-        buttonPermissionData.value.push(form)
+        const {data} = res
+        buttonPermissionData.value.push(data)
         dialogFormVisible.value = false
         ElMessage({
           type: 'success',
@@ -353,7 +354,7 @@ const onDeleteBtn = (scope: any) => {
         type: 'warning',
       }
   ).then(() => {
-    api.DeletePermission({id: row.id}).then(res => {
+    api.DeletePermission({id: row.id}).then((res:any) => {
       buttonPermissionData.value.splice($index, 1)
       ElMessage({
         type: 'success',
diff --git a/web/src/views/system/user/crud.tsx b/web/src/views/system/user/crud.tsx
index b5be3cbf4855ebba00daa55fb9a209f5b73fed8e..088707442fe8d0b8e7d1b96ca3a97e5c66d2fb01 100644
--- a/web/src/views/system/user/crud.tsx
+++ b/web/src/views/system/user/crud.tsx
@@ -21,7 +21,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 	};
 
 	//权限判定
-	const hasPermissions = inject('$hasPermissions');
+	const hasPermissions:any = inject('$hasPermissions');
 
 	return {
 		crudOptions: {
@@ -36,6 +36,14 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
 				editRequest,
 				delRequest,
 			},
+			actionbar: {
+				buttons: {
+					add: {
+						show: hasPermissions('user:Create')
+						// show:true
+					}
+				}
+			},
 			rowHandle: {
 				//固定右侧
 				fixed: 'right',
diff --git a/web/src/views/system/whiteList/api.ts b/web/src/views/system/whiteList/api.ts
index 3be27dbbec624d2dee063340d5a2e0675276d733..9b7e7f1f5c9d652a985e5fa33845892e77ed486a 100644
--- a/web/src/views/system/whiteList/api.ts
+++ b/web/src/views/system/whiteList/api.ts
@@ -6,7 +6,7 @@ export function GetList(query: UserPageQuery) {
 	return request({
 		url: apiPrefix,
 		method: 'get',
-		data: query,
+		params: query,
 	});
 }
 export function GetObj(id: InfoReq) {
diff --git a/web/yarn.lock b/web/yarn.lock
index 71ad5c135f3bf4efd2cc331ea9b774ed3cc40b92..53c5d0b3fe79588804e2eed9d37ca0129ffe7d88 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -1433,18 +1433,18 @@
   resolved "https://registry.npmjs.org/@eslint/js/-/js-8.36.0.tgz#9837f768c03a1e4a30bd304a64fb8844f0e72efe"
   integrity sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==
 
-"@fast-crud/fast-crud@^1.11.10":
-  version "1.11.10"
-  resolved "https://registry.npmjs.org/@fast-crud/fast-crud/-/fast-crud-1.11.10.tgz#9316346c424275e0706c801de90c091c17091577"
-  integrity sha512-TIfetITnXRsIh5ETDmlvzjK5Rjhgoizf5lYBO2HdUV7JxqQiULKh0TpYebFbgYABfcFjNz2XbgEmngFWZ+Qc3w==
+"@fast-crud/fast-crud@^1.13.2":
+  version "1.13.2"
+  resolved "https://registry.npmjs.org/@fast-crud/fast-crud/-/fast-crud-1.13.2.tgz#8e7e83c05f2d78a7053a029350dc808d21dcece9"
+  integrity sha512-ANvAeBtxGctdKXkyVRAxXq886BJriTODaSUONPJsc5e3RcSXK99MBeiwImBwiyq0kg5JT+AlN6DuV1In7vsuYQ==
   dependencies:
     lru-cache "^8.0.3"
     vuedraggable-es "^4.1.1"
 
-"@fast-crud/fast-extends@^1.11.10":
-  version "1.11.10"
-  resolved "https://registry.npmjs.org/@fast-crud/fast-extends/-/fast-extends-1.11.10.tgz#1f0342e677bccc86245d0e40b531d16cbaed7364"
-  integrity sha512-aYaMshrUwE9yuAzwwaXA94r7gGFd385/sSE3Q6M7OLnW0uysjMt9WkdvwKtEPh14hpVdvKyYRo0G5DvLz383xg==
+"@fast-crud/fast-extends@^1.13.2":
+  version "1.13.2"
+  resolved "https://registry.npmjs.org/@fast-crud/fast-extends/-/fast-extends-1.13.2.tgz#7e0e044dd7f2a25eff4d2a6c88966071d7282719"
+  integrity sha512-VgVkU4lta52h/Cv1eIIICz0pNs5nHACHVtQr07PYwcxZDkgLFbjf9j0gdegSYq22MpJ1kp9hZ35WDXvVRzrx+Q==
   dependencies:
     "@aws-sdk/client-s3" "^3.292.0"
     "@aws-sdk/s3-request-presigner" "^3.292.0"
@@ -1464,15 +1464,15 @@
     quill "^1.3.7"
     vue-cropperjs "^5.0.0"
 
-"@fast-crud/ui-element@^1.11.10":
-  version "1.11.10"
-  resolved "https://registry.npmjs.org/@fast-crud/ui-element/-/ui-element-1.11.10.tgz#25ce805ced2020d54a7b2c19f1df73fd39227a1f"
-  integrity sha512-lZNhIx7E6jkGrjEz3+ChJc8z53f1GFxmYWBoKDkJilfE6HhF+gmuV3nZiuRixjbSqWhVRHStMd+/7kDys7htZg==
+"@fast-crud/ui-element@^1.13.2":
+  version "1.13.2"
+  resolved "https://registry.npmjs.org/@fast-crud/ui-element/-/ui-element-1.13.2.tgz#d012b4a382a241dbec4354963661f085575a772e"
+  integrity sha512-11aQ+EQRr/w3VdCmZCn8nZC9+aqGE2goYH9jsy1DoDLNKL5MMAyxfalTxkWGsgVTyJPjq1OgITCa1D4WoyVQQw==
 
-"@fast-crud/ui-interface@^1.11.9":
-  version "1.11.9"
-  resolved "https://registry.npmjs.org/@fast-crud/ui-interface/-/ui-interface-1.11.9.tgz#df6d4732a020e7df06daf0b3763adb91a5e70f25"
-  integrity sha512-WFGWWleM7Uy2eWcbFxiKK1FZ/mtEoKVImfbxCPvNFkGgZS2NGA5zPXkJNY5/PntwCcgAvxvSYzLrtKfOlOHnpQ==
+"@fast-crud/ui-interface@^1.13.2":
+  version "1.13.2"
+  resolved "https://registry.npmjs.org/@fast-crud/ui-interface/-/ui-interface-1.13.2.tgz#263f26e21d1014623f7dbfd36628aaf5bb5bab17"
+  integrity sha512-lNsJSyPK+ssugsVGJDCV0xjrQ08d0BfPgwSN5z7DNrfOHJILrYDebyKq8WnUFLnDIPtXBwlP83s93is/EIsofw==
   dependencies:
     lodash-es "^4.17.21"