From b6191145f2571a653a4baf1daebac20dcce48390 Mon Sep 17 00:00:00 2001
From: zuohuaijun <zuohuaijun@163.com>
Date: Sun, 15 Dec 2024 12:04:31 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E=E5=A2=9E=E5=8A=A0=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=9B=91=E6=8E=A7=E6=95=B0=E6=8D=AE=E5=BA=93=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.NET/Admin.NET.Core/Service/Server/SysServerService.cs | 2 +-
 Web/src/views/system/region/index.vue                       | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Admin.NET/Admin.NET.Core/Service/Server/SysServerService.cs b/Admin.NET/Admin.NET.Core/Service/Server/SysServerService.cs
index 9a070f40..54444a23 100644
--- a/Admin.NET/Admin.NET.Core/Service/Server/SysServerService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Server/SysServerService.cs
@@ -32,7 +32,7 @@ public class SysServerService : IDynamicApiController, ITransient
             SysRunTime = ComputerUtil.GetRunTime(), // 系统运行时间
             RemoteIp = ComputerUtil.GetIpFromOnline(), // 外网地址
             LocalIp = App.HttpContext?.Connection?.LocalIpAddress!.MapToIPv4().ToString(), // 本地地址
-            RuntimeInformation.FrameworkDescription, // NET框架
+            FrameworkDescription = RuntimeInformation.FrameworkDescription + " / " + App.GetOptions<DbConnectionOptions>().ConnectionConfigs[0].DbType.ToString(), // NET框架 + 数据库类型
             Environment = App.HostEnvironment.IsDevelopment() ? "Development" : "Production",
             Wwwroot = App.WebHostEnvironment.WebRootPath, // 网站根目录
             Stage = App.HostEnvironment.IsStaging() ? "Stage环境" : "非Stage环境", // 是否Stage环境
diff --git a/Web/src/views/system/region/index.vue b/Web/src/views/system/region/index.vue
index 5ad6cfee..eb744081 100644
--- a/Web/src/views/system/region/index.vue
+++ b/Web/src/views/system/region/index.vue
@@ -45,6 +45,7 @@
 							<el-button type="danger" icon="ele-Lightning" @click="syncRegionGD" v-auth="'sysRegion/add'"> 同步高德地图 </el-button>
 							<el-button type="danger" icon="ele-Lightning" @click="syncRegionTianditu" v-auth="'sysRegion/add'"> 同步天地图 </el-button>
 							<el-button type="danger" icon="ele-Lightning" @click="syncRegionMca" v-auth="'sysRegion/add'"> 同步国家地名信息库 </el-button>
+							<el-button type="danger" icon="ele-Lightning" @click="syncRegionMzb" v-auth="'sysRegion/add'"> 同步民政部行政区划 </el-button>
 						</template>
 						<template #toolbar_tools> </template>
 						<template #empty>
@@ -251,6 +252,11 @@ const syncRegionTianditu = async () => {
 	state.title = '同步天地图行政区划';
 	syncTdtParamRef.value?.openDialog();
 };
+// 同步民政部行政区划
+const syncRegionMzb = async () => {
+	state.title = '同步民政部行政区划';
+	// syncTdtParamRef.value?.openDialog();
+};
 
 // 生成组织架构
 const genOrg = (row: any) => {