fix(system): 纠正Redis CURD批量获取方法参数传递问题

- 修正了RedisCURD.mget调用时传递keys参数的方式,去除多余的展开运算符
- 删除了无用的UpdateSystemParamsSchema定义,简化参数模型代码
- 更新系统初始化配置获取逻辑,统一修正mget的keys传递方式
- 调整系统初始化配置json数据,完善帮助文档、隐私政策、用户协议等字段
- 修改开发环境数据库配置,切换为PostgreSQL并更新相应端口及用户信息
- 删除冗余MySQL数据库备份脚本,避免版本管理中的重复和混乱
This commit is contained in:
zhangtao
2025-10-08 04:15:25 +08:00
parent e669722706
commit e1ce533d17
11 changed files with 942 additions and 367 deletions
+1
View File
@@ -226,6 +226,7 @@ export interface InfoFormState {
email: string;
username: string;
dept_name: string;
dept: deptTreeType;
positions: positionSelectorType[];
roles: roleSelectorType[];
avatar: string;
+19 -10
View File
@@ -2,18 +2,27 @@ import { store } from "@/store";
import ParamsAPI, { ConfigTable } from "@/api/system/params";
interface ConfigState {
sys_git_code: ConfigTable;
sys_help_doc: ConfigTable;
sys_keep_record: ConfigTable;
sys_login_background: ConfigTable;
sys_web_clause: ConfigTable;
sys_web_copyright: ConfigTable;
sys_web_description: ConfigTable;
sys_web_favicon: ConfigTable;
sys_web_logo: ConfigTable;
sys_web_privacy: ConfigTable;
// 网站信息
sys_web_title: ConfigTable;
sys_web_version: ConfigTable;
sys_web_description: ConfigTable;
// 网站图标
sys_login_background: ConfigTable;
sys_web_favicon: ConfigTable;
sys_web_logo: ConfigTable;
// 安全隐私配置
sys_keep_record: ConfigTable;
sys_web_clause: ConfigTable;
sys_web_copyright: ConfigTable;
sys_web_privacy: ConfigTable;
sys_git_code: ConfigTable;
sys_help_doc: ConfigTable;
// 接口安全配置
white_api_list_path: ConfigTable;
ip_black_list: ConfigTable;
// 演示环境配置
demo_enable: ConfigTable;
ip_white_list: ConfigTable;
}
export const useConfigStore = defineStore("config", {
+2 -1
View File
@@ -68,7 +68,7 @@
</el-icon>
<span style="vertical-align: middle;">部门</span>
</template>
<span style="vertical-align: middle;">{{ infoFormState.dept_name }}</span>
<span style="vertical-align: middle;">{{ infoFormState.dept.name }}</span>
</el-descriptions-item>
<el-descriptions-item>
<template #label>
@@ -233,6 +233,7 @@ const infoFormState = reactive<InfoFormState>({
email: '',
username: '',
dept_name: '',
dept: {},
positions: [],
roles: [],
avatar: '',
@@ -1,41 +1,243 @@
<template>
<el-drawer v-model="drawerVisible" title="配置中心" :size="drawerSize">
<el-form :model="configState" label-suffix=":" label-width="auto" label-position="right">
<!-- 系统配置 -->
<el-divider>系统配置</el-divider>
<div v-for="(item, key) in systemConfigs" :key="key">
<el-form-item :label="item.config_name">
<span class="flex items-center gap-2 w-full">
<el-input
v-model="item.config_value"
:placeholder="t('common.inputText')"
clearable
style="width: 100%"
@input="markModified(key)"
/>
</span>
</el-form-item>
</div>
<!-- logo配置 -->
<el-divider>logo配置</el-divider>
<div v-for="(item, key) in logoConfigs" :key="key">
<el-form-item :label="item.config_name">
<div class="flex items-center gap-2 w-full">
<SingleImageUpload
v-model="item.config_value"
:data="{ type: key }"
:name="'file'"
:max-file-size="item.maxFileSize"
@on-success="(fileInfo: UploadFilePath) => handleUploadSuccess(fileInfo, key)"
@on-error="handleUploadError"
@input="markModified(key)"
/>
<el-tabs v-model="activeTabRef" type="border-card" >
<!-- 网站配置 -->
<el-tab-pane label="网站配置" name="website">
<el-form :model="configState" label-suffix=":" label-width="auto" label-position="right">
<!-- 系统配置 -->
<el-divider>网站配置</el-divider>
<div v-for="(item, key) in systemConfigs" :key="key">
<el-form-item :label="item.config_name">
<span class="flex items-center gap-2 w-full">
<el-input
v-model="item.config_value"
:placeholder="t('common.inputText')"
clearable
style="width: 100%"
@input="markModified(key)"
/>
</span>
</el-form-item>
</div>
</el-form-item>
</div>
</el-form>
<!-- logo配置 -->
<el-divider>网站图标</el-divider>
<div v-for="(item, key) in logoConfigs" :key="key">
<el-form-item :label="item.config_name">
<div class="flex items-center gap-2 w-full">
<SingleImageUpload
v-model="item.config_value"
:data="{ type: key }"
:name="'file'"
:max-file-size="item.maxFileSize"
@on-success="(fileInfo: UploadFilePath) => handleUploadSuccess(fileInfo, key)"
@on-error="handleUploadError"
@input="markModified(key)"
/>
</div>
</el-form-item>
</div>
</el-form>
</el-tab-pane>
<el-tab-pane label="安全隐私" name="securityPrivacy">
<el-form :model="configState" label-suffix=":" label-width="auto" label-position="right">
<!-- 系统配置 -->
<el-divider>安全隐私</el-divider>
<div v-for="(item, key) in securityPrivacyConfigs" :key="key">
<el-form-item :label="item.config_name">
<span class="flex items-center gap-2 w-full">
<el-input
v-model="item.config_value"
:placeholder="t('common.inputText')"
clearable
style="width: 100%"
@input="markModified(key)"
/>
</span>
</el-form-item>
</div>
</el-form>
</el-tab-pane>
<el-tab-pane label="用户协议" name="userAgreement">
<!-- 系统配置 -->
<el-divider>用户协议</el-divider>
<div v-for="(item, key) in userAgreementConfigs" :key="key">
<el-form-item :label="item.config_name">
<span class="flex items-center gap-2 w-full">
<el-input
v-model="item.config_value"
:placeholder="t('common.inputText')"
clearable
style="width: 100%"
@input="markModified(key)"
/>
</span>
</el-form-item>
</div>
</el-tab-pane>
<el-tab-pane label="接口白名单" name="apiWhitelist">
<el-form :model="configState" label-suffix=":" label-width="auto" label-position="right">
<!-- 系统配置 -->
<el-divider>接口白名单</el-divider>
<div v-for="(item, key) in apiWhitelistConfigs" :key="key">
<el-form-item :label="item.config_name">
<div class="space-y-2">
<div v-for="listItem in apiWhitelistItems" :key="listItem.id" class="flex items-center gap-2">
<el-input
v-model="listItem.value"
:placeholder="'/api/v1/users/get'"
clearable
@input="markModified(key)"
@blur="{
if (!isValidApiPath(listItem.value) && listItem.value.trim()) {
ElMessage.warning('请输入有效的接口路径格式(以/开头)');
}
}"
/>
<el-button
type="danger"
icon="minus"
circle
size="small"
@click="removeApiWhitelistItem(listItem.id)"
/>
</div>
<el-button
type="primary"
icon="plus"
size="small"
style="margin-top: 10px"
@click="addApiWhitelistItem"
>
添加接口路径
</el-button>
<div class="text-xs text-gray-500 mt-2">
配置说明:添加到白名单的接口路径无需登录即可访问,支持完整路径配置。
</div>
</div>
</el-form-item>
</div>
</el-form>
</el-tab-pane>
<el-tab-pane label="IP黑名单" name="ipBlacklist">
<el-form :model="configState" label-suffix=":" label-width="auto" label-position="right">
<!-- 系统配置 -->
<el-divider>IP黑名单</el-divider>
<div v-for="(item, key) in ipBlacklistConfigs" :key="key">
<el-form-item :label="item.config_name">
<div class="space-y-2">
<div v-for="listItem in ipBlacklistItems" :key="listItem.id" class="flex items-center gap-2">
<el-input
v-model="listItem.value"
:placeholder="'192.168.1.1'"
clearable
style="flex: 1"
@input="markModified(key)"
@blur="{
if (!isValidIp(listItem.value) && listItem.value.trim()) {
ElMessage.warning('请输入有效的IP地址格式');
}
}"
/>
<el-button
type="danger"
icon="minus"
circle
size="small"
@click="removeIpBlacklistItem(listItem.id)"
/>
</div>
<el-button
type="primary"
icon="plus"
size="small"
style="margin-top: 10px"
@click="addIpBlacklistItem"
>
添加IP地址
</el-button>
<div class="text-xs text-gray-500 mt-2">
配置说明:添加到黑名单的IP地址将无法访问系统,支持单个IP配置。
</div>
</div>
</el-form-item>
</div>
</el-form>
</el-tab-pane>
<el-tab-pane label="演示环境配置" name="demo">
<el-form :model="configState" label-suffix=":" label-width="auto" label-position="right">
<!-- 系统配置 -->
<el-divider>演示环境配置</el-divider>
<div v-for="(item, key) in demoConfigs" :key="key">
<el-form-item :label="item.config_name">
<!-- 演示模式开关 -->
<template v-if="key === 'demo_enable'">
<el-switch
v-model="item.config_value"
inline-prompt
active-text="启用"
inactive-text="禁用"
@change="markModified(key)"
/>
<div class="text-xs text-gray-500 mt-1">
配置说明:启用后系统将进入演示模式,部分功能可能受限。
</div>
</template>
<!-- IP白名单 -->
<template v-else-if="key === 'ip_white_list'">
<div class="space-y-2">
<div v-for="listItem in demoIpWhitelistItems" :key="listItem.id" class="flex items-center gap-2">
<el-input
v-model="listItem.value"
:placeholder="'192.168.1.1'"
clearable
style="flex: 1"
@input="markModified(key)"
@blur="{
if (!isValidIp(listItem.value) && listItem.value.trim()) {
ElMessage.warning('请输入有效的IP地址格式');
}
}"
/>
<el-button
type="danger"
icon="minus"
circle
size="small"
@click="removeDemoIpWhitelistItem(listItem.id)"
/>
</div>
<el-button
type="primary"
icon="plus"
size="small"
style="margin-top: 10px"
@click="addDemoIpWhitelistItem"
>
添加IP地址
</el-button>
<div class="text-xs text-gray-500 mt-2">
配置说明:演示模式下,只有白名单中的IP地址可以访问系统,支持单个IP配置。
</div>
</div>
</template>
<!-- 其他配置项 -->
<template v-else>
<el-input
v-model="item.config_value"
:placeholder="t('common.inputText')"
clearable
style="width: 100%"
@input="markModified(key)"
/>
</template>
</el-form-item>
</div>
</el-form>
</el-tab-pane>
</el-tabs>
<template #footer>
<!-- 操作按钮 -->
<el-button @click="resetForm">取消</el-button>
@@ -45,7 +247,7 @@
</template>
<script lang="ts" setup>
import { ref, reactive, onMounted, computed } from 'vue';
import { ref, reactive, onMounted, computed, watch } from 'vue';
import ParamsAPI, { type ConfigTable } from '@/api/system/params';
import { useConfigStore } from "@/store";
import { useI18n } from 'vue-i18n';
@@ -54,11 +256,35 @@ import SingleImageUpload from '@/components/Upload/SingleImageUpload.vue';
import { useAppStore } from "@/store/modules/app.store";
import { DeviceEnum } from "@/enums/settings/device.enum";
// 定义列表项类型
interface ListItem {
id: string;
value: string;
}
// 生成唯一ID
const generateId = () => {
return Math.random().toString(36).substr(2, 9);
};
// IP地址验证函数
const isValidIp = (ip: string): boolean => {
const ipRegex = /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
return ipRegex.test(ip);
};
// 接口路径验证函数
const isValidApiPath = (path: string): boolean => {
const pathRegex = /^\/[\w\-/]+$/;
return pathRegex.test(path);
}
const appStore = useAppStore();
const drawerSize = computed(() => (appStore.device === DeviceEnum.DESKTOP ? "500px" : "90%"));
const drawerSize = computed(() => (appStore.device === DeviceEnum.DESKTOP ? "60%" : "60%"));
const t = useI18n().t;
const configStore = useConfigStore();
const activeTabRef = ref('website')
// 配置状态管理
const drawerVisible = ref<boolean>(false);
@@ -88,18 +314,68 @@ const submitChanges = async () => {
if (keysToSubmit.length === 0) return;
try {
// 并行处理所有修改请求,提高性能
const updatePromises = keysToSubmit.map(key => {
const item = systemConfigs.value[key as keyof typeof systemConfigs.value] || logoConfigs.value[key as keyof typeof logoConfigs.value];
// 准备提交数据
// 1. 处理接口白名单
if ('white_api_list_path' in modifiedFields && apiWhitelistConfigs.value.white_api_list_path?.id) {
const apiWhitelistArray = apiWhitelistItems.value
.map(item => item.value.trim())
.filter(Boolean);
// 转换为JSON字符串格式保存
const apiWhitelistJson = JSON.stringify(apiWhitelistArray);
await ParamsAPI.updateConfig(apiWhitelistConfigs.value.white_api_list_path.id, {
...apiWhitelistConfigs.value.white_api_list_path,
config_value: apiWhitelistJson
});
}
// 2. 处理IP黑名单
if ('ip_black_list' in modifiedFields && ipBlacklistConfigs.value.ip_black_list?.id) {
const ipBlacklistArray = ipBlacklistItems.value
.map(item => item.value.trim())
.filter(Boolean);
// 转换为JSON字符串格式保存
const ipBlacklistJson = JSON.stringify(ipBlacklistArray);
await ParamsAPI.updateConfig(ipBlacklistConfigs.value.ip_black_list.id, {
...ipBlacklistConfigs.value.ip_black_list,
config_value: ipBlacklistJson
});
}
// 3. 处理演示环境IP白名单
if ('ip_white_list' in modifiedFields && demoConfigs.value.ip_white_list?.id) {
const demoIpWhitelistArray = demoIpWhitelistItems.value
.map(item => item.value.trim())
.filter(Boolean);
// 转换为JSON字符串格式保存
const demoIpWhitelistJson = JSON.stringify(demoIpWhitelistArray);
await ParamsAPI.updateConfig(demoConfigs.value.ip_white_list.id, {
...demoConfigs.value.ip_white_list,
config_value: demoIpWhitelistJson
});
}
// 4. 处理其他配置项
const otherKeys = keysToSubmit.filter(key =>
!['white_api_list_path', 'ip_black_list', 'ip_white_list'].includes(key)
);
const otherUpdatePromises = otherKeys.map(key => {
const item = systemConfigs.value[key as keyof typeof systemConfigs.value] ||
logoConfigs.value[key as keyof typeof logoConfigs.value] ||
securityPrivacyConfigs.value[key as keyof typeof securityPrivacyConfigs.value] ||
userAgreementConfigs.value[key as keyof typeof userAgreementConfigs.value] ||
demoConfigs.value[key as keyof typeof demoConfigs.value];
return item && item.id ? ParamsAPI.updateConfig(item.id, { ...item }) : Promise.resolve();
});
await Promise.all(updatePromises);
await Promise.all(otherUpdatePromises);
// 清除已提交的修改标记
keysToSubmit.forEach(key => {
delete modifiedFields[key];
});
// 重新加载配置数据
await configStore.getConfig();
initializeLists();
} catch (error) {
console.error('保存失败:', error);
}
@@ -107,12 +383,25 @@ const submitChanges = async () => {
// 取消修改:重置所有修改字段的状态并恢复初始值
const resetForm = () => {
// 重置动态列表
initializeLists();
// 重置其他配置项
const keysToReset = Object.keys(modifiedFields);
for (const key of keysToReset) {
if (systemConfigs.value[key as keyof typeof systemConfigs.value]) {
systemConfigs.value[key as keyof typeof systemConfigs.value].config_value = configStore.configData[key as keyof typeof configStore.configData]?.config_value || '';
} else if (logoConfigs.value[key as keyof typeof logoConfigs.value]) {
logoConfigs.value[key as keyof typeof logoConfigs.value].config_value = configStore.configData[key as keyof typeof configStore.configData]?.config_value || '';
} else if (securityPrivacyConfigs.value[key as keyof typeof securityPrivacyConfigs.value]) {
securityPrivacyConfigs.value[key as keyof typeof securityPrivacyConfigs.value].config_value = configStore.configData[key as keyof typeof configStore.configData]?.config_value || '';
} else if (userAgreementConfigs.value[key as keyof typeof userAgreementConfigs.value]) {
userAgreementConfigs.value[key as keyof typeof userAgreementConfigs.value].config_value = configStore.configData[key as keyof typeof configStore.configData]?.config_value || '';
} else if (demoConfigs.value[key as keyof typeof demoConfigs.value]) {
// 除了IP白名单外的演示配置项
if (key !== 'ip_white_list') {
demoConfigs.value[key as keyof typeof demoConfigs.value].config_value = configStore.configData[key as keyof typeof configStore.configData]?.config_value || '';
}
}
delete modifiedFields[key];
}
@@ -123,15 +412,185 @@ const resetForm = () => {
const systemConfigs = computed(() => ({
sys_web_title: configStore.configData.sys_web_title,
sys_web_version: configStore.configData.sys_web_version,
sys_web_description: configStore.configData.sys_web_description,
}));
// 安全隐私配置项
const securityPrivacyConfigs = computed(() => ({
sys_help_doc: configStore.configData.sys_help_doc,
sys_git_code: configStore.configData.sys_git_code,
sys_keep_record: configStore.configData.sys_keep_record,
sys_web_clause: configStore.configData.sys_web_clause,
sys_web_copyright: configStore.configData.sys_web_copyright,
sys_web_privacy: configStore.configData.sys_web_privacy,
sys_web_description: configStore.configData.sys_web_description,
}));
// 用户协议配置项
const userAgreementConfigs = computed(() => ({
sys_web_clause: configStore.configData.sys_web_clause,
}));
// 接口白名单配置 - 动态管理
const apiWhitelistItems = ref<ListItem[]>([]);
// IP黑名单配置 - 动态管理
const ipBlacklistItems = ref<ListItem[]>([]);
// IP白名单配置 - 动态管理
const demoIpWhitelistItems = ref<ListItem[]>([]);
// 从配置数据初始化列表
const initializeLists = () => {
// 初始化接口白名单
const apiWhitelistStr = configStore.configData.white_api_list_path?.config_value || '';
try {
// 尝试解析为JSON数组
const apiWhitelistArray = JSON.parse(apiWhitelistStr);
if (Array.isArray(apiWhitelistArray)) {
apiWhitelistItems.value = apiWhitelistArray
.filter(item => typeof item === 'string' && item.trim())
.map(item => ({ id: generateId(), value: item.trim() }));
} else {
// 如果不是数组,回退到按换行符分割
apiWhitelistItems.value = apiWhitelistStr
? apiWhitelistStr.split('\n')
.filter(item => item.trim())
.map(item => ({ id: generateId(), value: item.trim() }))
: [{ id: generateId(), value: '' }];
}
} catch {
// 解析失败,回退到按换行符分割
apiWhitelistItems.value = apiWhitelistStr
? apiWhitelistStr.split('\n')
.filter(item => item.trim())
.map(item => ({ id: generateId(), value: item.trim() }))
: [{ id: generateId(), value: '' }];
}
// 初始化IP黑名单
const ipBlacklistStr = configStore.configData.ip_black_list?.config_value || '';
try {
// 尝试解析为JSON数组
const ipBlacklistArray = JSON.parse(ipBlacklistStr);
if (Array.isArray(ipBlacklistArray)) {
ipBlacklistItems.value = ipBlacklistArray
.filter(item => typeof item === 'string' && item.trim())
.map(item => ({ id: generateId(), value: item.trim() }));
} else {
// 如果不是数组,回退到按换行符分割
ipBlacklistItems.value = ipBlacklistStr
? ipBlacklistStr.split('\n')
.filter(item => item.trim())
.map(item => ({ id: generateId(), value: item.trim() }))
: [{ id: generateId(), value: '' }];
}
} catch {
// 解析失败,回退到按换行符分割
ipBlacklistItems.value = ipBlacklistStr
? ipBlacklistStr.split('\n')
.filter(item => item.trim())
.map(item => ({ id: generateId(), value: item.trim() }))
: [{ id: generateId(), value: '' }];
}
// 初始化演示环境IP白名单
const demoIpWhitelistStr = configStore.configData.ip_white_list?.config_value || '';
try {
// 尝试解析为JSON数组
const demoIpWhitelistArray = JSON.parse(demoIpWhitelistStr);
if (Array.isArray(demoIpWhitelistArray)) {
demoIpWhitelistItems.value = demoIpWhitelistArray
.filter(item => typeof item === 'string' && item.trim())
.map(item => ({ id: generateId(), value: item.trim() }));
} else {
// 如果不是数组,回退到按换行符分割
demoIpWhitelistItems.value = demoIpWhitelistStr
? demoIpWhitelistStr.split('\n')
.filter(item => item.trim())
.map(item => ({ id: generateId(), value: item.trim() }))
: [{ id: generateId(), value: '' }];
}
} catch {
// 解析失败,回退到按换行符分割
demoIpWhitelistItems.value = demoIpWhitelistStr
? demoIpWhitelistStr.split('\n')
.filter(item => item.trim())
.map(item => ({ id: generateId(), value: item.trim() }))
: [{ id: generateId(), value: '' }];
}
};
// 添加接口白名单项
const addApiWhitelistItem = () => {
apiWhitelistItems.value.push({ id: generateId(), value: '' });
markModified('white_api_list_path');
};
// 移除接口白名单项
const removeApiWhitelistItem = (id: string) => {
if (apiWhitelistItems.value.length <= 1) {
ElMessage.warning('至少需要保留一个接口白名单配置');
return;
}
apiWhitelistItems.value = apiWhitelistItems.value.filter(item => item.id !== id);
markModified('white_api_list_path');
};
// 添加IP黑名单项
const addIpBlacklistItem = () => {
ipBlacklistItems.value.push({ id: generateId(), value: '' });
markModified('ip_black_list');
};
// 移除IP黑名单项
const removeIpBlacklistItem = (id: string) => {
if (ipBlacklistItems.value.length <= 1) {
ElMessage.warning('至少需要保留一个IP黑名单配置');
return;
}
ipBlacklistItems.value = ipBlacklistItems.value.filter(item => item.id !== id);
markModified('ip_black_list');
};
// 添加演示环境IP白名单项
const addDemoIpWhitelistItem = () => {
demoIpWhitelistItems.value.push({ id: generateId(), value: '' });
markModified('ip_white_list');
};
// 移除演示环境IP白名单项
const removeDemoIpWhitelistItem = (id: string) => {
if (demoIpWhitelistItems.value.length <= 1) {
ElMessage.warning('至少需要保留一个IP白名单配置');
return;
}
demoIpWhitelistItems.value = demoIpWhitelistItems.value.filter(item => item.id !== id);
markModified('ip_white_list');
};
// 监听列表变化并标记为已修改
watch([apiWhitelistItems, ipBlacklistItems, demoIpWhitelistItems], () => {
// 这里可以添加验证逻辑
}, { deep: true });
// 接口白名单配置项
const apiWhitelistConfigs = computed(() => ({
white_api_list_path: configStore.configData.white_api_list_path,
}));
// IP黑名单配置项
const ipBlacklistConfigs = computed(() => ({
ip_black_list: configStore.configData.ip_black_list,
}));
// 演示环境配置项
const demoConfigs = computed(() => ({
demo_enable: configStore.configData.demo_enable,
ip_white_list: configStore.configData.ip_white_list,
}));
// 在组件挂载时初始化列表
onMounted(() => {
initializeLists();
});
// logo配置项
const logoConfigs = computed(() => ({
sys_web_logo: {