diff --git a/Atomx.Admin/Atomx.Admin.Client/Models/MaterialSearch.cs b/Atomx.Admin/Atomx.Admin.Client/Models/MaterialSearch.cs
deleted file mode 100644
index 5b5630c..0000000
--- a/Atomx.Admin/Atomx.Admin.Client/Models/MaterialSearch.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace Atomx.Admin.Client.Models
-{
-    public class MaterialSearch : BaseSearch
-    {
-        /// <summary>
-        /// 类型
-        /// </summary>
-        public int? Type { get; set; }
-
-        /// <summary>
-        /// 原料归属公司ID
-        /// </summary>
-        public long CorporationId { get; set; }
-
-        /// <summary>
-        /// 原料归属店铺网点ID
-        /// </summary>
-        public long StoreId { get; set; }
-    }
-}
diff --git a/Atomx.Admin/Atomx.Admin.Client/Models/MessageTemplateModel.cs b/Atomx.Admin/Atomx.Admin.Client/Models/MessageTemplateModel.cs
index 94095d5..91c931f 100644
--- a/Atomx.Admin/Atomx.Admin.Client/Models/MessageTemplateModel.cs
+++ b/Atomx.Admin/Atomx.Admin.Client/Models/MessageTemplateModel.cs
@@ -7,6 +7,16 @@
         /// </summary>
         public long Id { get; set; }
 
+        /// <summary>
+        /// 站点ID
+        /// </summary>
+        public long SiteId { get; set; }
+
+        /// <summary>
+        /// 语言编码
+        /// </summary>
+        public int LanguageId { get; set; }
+
         /// <summary>
         /// 消息模板类型
         /// </summary>
@@ -32,6 +42,11 @@
         /// </summary>
         public string Body { get; set; } = string.Empty;
 
+        /// <summary>
+        /// 附件文件地址列表，多个附件以逗号分隔
+        /// </summary>
+        public string Attachments { get; set; } = string.Empty;
+
         /// <summary>
         /// 是否可用
         /// </summary>
diff --git a/Atomx.Admin/Atomx.Admin.Client/Models/MessageTemplateSearch.cs b/Atomx.Admin/Atomx.Admin.Client/Models/MessageTemplateSearch.cs
index a906ad2..45d6097 100644
--- a/Atomx.Admin/Atomx.Admin.Client/Models/MessageTemplateSearch.cs
+++ b/Atomx.Admin/Atomx.Admin.Client/Models/MessageTemplateSearch.cs
@@ -4,6 +4,8 @@
     {
         public int? Type { get; set; }
 
+        public int? Language { get; set; }
+
         public string Key { get; set; } = string.Empty;
     }
 }
diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/Home.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/Home.razor
index b0ea21b..e7c88e0 100644
--- a/Atomx.Admin/Atomx.Admin.Client/Pages/Home.razor
+++ b/Atomx.Admin/Atomx.Admin.Client/Pages/Home.razor
@@ -24,6 +24,9 @@
     <li>
         <a href="/system/role/list">角色管理</a>
     </li>
+    <li>
+        <a href="/currency/list">货币设置</a>
+    </li>
 </PageContainer>
 
 @code {
diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/CountryEdit.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/CountryEdit.razor
new file mode 100644
index 0000000..4668b07
--- /dev/null
+++ b/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/CountryEdit.razor
@@ -0,0 +1,5 @@
+<h3>CountryEdit</h3>
+
+@code {
+
+}
diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/CountryList.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/CountryList.razor
new file mode 100644
index 0000000..abc05a2
--- /dev/null
+++ b/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/CountryList.razor
@@ -0,0 +1,5 @@
+<h3>CountryList</h3>
+
+@code {
+
+}
diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/CurrencyList.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/CurrencyList.razor
new file mode 100644
index 0000000..c962082
--- /dev/null
+++ b/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/CurrencyList.razor
@@ -0,0 +1,22 @@
+@page "/currency/list"
+@page "/{locale}/currency/list"
+@inject ILogger<CurrencyList> Logger
+@attribute [Authorize]
+
+<PageContainer Title="货币管理">
+    <Breadcrumb>
+        <Breadcrumb>
+            <BreadcrumbItem Href="/">管理后台</BreadcrumbItem>
+            <BreadcrumbItem Href="/admin/list">系统功能</BreadcrumbItem>
+            <BreadcrumbItem>货币管理</BreadcrumbItem>
+        </Breadcrumb>
+    </Breadcrumb>
+    <ChildContent>
+        <h3>Tools</h3>
+    </ChildContent>
+</PageContainer>
+
+@code {
+    [Parameter]
+    public string Locale { get; set; } = string.Empty;
+}
diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/MessageTemplateList.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/MessageTemplateList.razor
index be0f184..7acf83c 100644
--- a/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/MessageTemplateList.razor
+++ b/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/MessageTemplateList.razor
@@ -1,144 +1,162 @@
 @page "/setting/messagetemplate/list"
-
+@page "/{locale}/setting/messagetemplate/list"
 @inject ILogger<MessageTemplateList> Logger
 @attribute [Authorize]
 
-<PageTitle>消息模板</PageTitle>
-<Title Level="4">消息模版管理</Title>
-<Card>
-    <Form @ref="searchForm" Model="search" Layout="FormLayout.Inline" Class="search-form" OnFinish="OnSearchFinish">
-        <Row Justify="RowJustify.Start" Gutter="16">
-            <Col>
-            <FormItem Label="名称">
-                <Input @bind-Value="search.Key" Placeholder="名称" AllowClear />
-            </FormItem>
-            </Col>
-            <Col>
-            <div class="ant-form-item" style="width:200px;display:flex;">
-                <Button Type="ButtonType.Primary" HtmlType="submit">查询</Button>
-                <Button Style="margin: 0 8px;" OnClick="OnSearchReset">重置</Button>
-            </div>
-            </Col>
-        </Row>
-    </Form>
-</Card>
+<PageContainer Title="消息模板">
+    <Breadcrumb>
+        <Breadcrumb>
+            <BreadcrumbItem Href="/">管理后台</BreadcrumbItem>
+            <BreadcrumbItem Href="/admin/list">系统功能</BreadcrumbItem>
+            <BreadcrumbItem>系统设置</BreadcrumbItem>
+        </Breadcrumb>
+    </Breadcrumb>
+    <ChildContent>
+        <Card>
+            <Form @ref="searchForm" Model="search" Layout="FormLayout.Inline" Class="search-form" OnFinish="OnSearchFinish">
+                <Row Justify="RowJustify.Start" Gutter="16">
+                    <Col>
+                    <FormItem Label="名称">
+                        <Input @bind-Value="search.Key" Placeholder="名称" AllowClear />
+                    </FormItem>
+                    </Col>
+                    <Col>
+                    <div class="ant-form-item" style="width:200px;display:flex;">
+                        <Button Type="ButtonType.Primary" HtmlType="submit">查询</Button>
+                        <Button Style="margin: 0 8px;" OnClick="OnSearchReset">重置</Button>
+                    </div>
+                    </Col>
+                </Row>
+            </Form>
+        </Card>
+        <br />
+        <Card Class="mt-3">
+            <Table DataSource="PagingList.Items" PageSize="100" HidePagination="true" Resizable>
+                <TitleTemplate>
+                    <Flex Justify="FlexJustify.SpaceBetween">
+                        菜单列表
+                        <div>
+                            <Button Class="me-3" OnClick="OnCreateClick" Type="ButtonType.Primary">新增</Button>
+                        </div>
+                    </Flex>
+                </TitleTemplate>
+                <ColumnDefinitions>
+                    <PropertyColumn Property="c => c.Type" Title="模版类型" Width="150px">
+                        @if (context.Type == (int)MessageTemplateType.Message)
+                        {
+                            <AntDesign.Text>站内信</AntDesign.Text>
+                        }
+                        else if (context.Type == (int)MessageTemplateType.Email)
+                        {
+                            <AntDesign.Text>邮件</AntDesign.Text>
+                        }
+                        else if (context.Type == (int)MessageTemplateType.Sms)
+                        {
+                            <AntDesign.Text>短信</AntDesign.Text>
+                        }
+                    </PropertyColumn>
+                    <PropertyColumn Property="c => c.Name" Title="模版名称" />
+                    <PropertyColumn Property="c => c.LanguageId" Title="语言">
+                        @GetLanuageName(context.LanguageId)
+                    </PropertyColumn>
+                    <PropertyColumn Property="c => c.Key" Title="模版Code" Width="100px" />
+                    <PropertyColumn Property="c => c.Title" Title="模版标题" />
+                    <PropertyColumn Property="c => c.Enabled" Title="状态" Width="80px" Align="ColumnAlign.Center">
+                        @if (context.Enabled)
+                        {
+                            <AntDesign.Text Type="TextElementType.Success"><Icon Type="check" Theme=" IconThemeType.Outline" Width="1.3em" Height="1.3em" /></AntDesign.Text>
 
-<Card Class="mt-3">
-    <Table DataSource="PagingList.Items" PageSize="100" HidePagination="true" Resizable>
-        <TitleTemplate>
-            <Flex Justify="FlexJustify.SpaceBetween">
-                菜单列表
-                <div>
-                    <Button Class="me-3" OnClick="OnCreateClick" Type="ButtonType.Primary">新增</Button>
-                </div>
-            </Flex>
-        </TitleTemplate>
-        <ColumnDefinitions>
-            <PropertyColumn Property="c => c.Type" Title="模版类型" Width="150px">
-                @if (context.Type == (int)MessageTemplateType.Message)
-                {
-                    <AntDesign.Text>站内信</AntDesign.Text>
-                }
-                else if (context.Type == (int)MessageTemplateType.Email)
-                {
-                    <AntDesign.Text>邮件</AntDesign.Text>
-                }
-                else if (context.Type == (int)MessageTemplateType.Sms)
-                {
-                    <AntDesign.Text>短信</AntDesign.Text>
-                }
-            </PropertyColumn>
-            <PropertyColumn Property="c => c.Name" Title="模版名称" />
-            <PropertyColumn Property="c => c.Key" Title="模版Code" Width="100px" />
-            <PropertyColumn Property="c => c.Title" Title="模版标题" />
-            <PropertyColumn Property="c => c.Enabled" Title="状态" Width="80px" Align="ColumnAlign.Center">
-                @if (context.Enabled)
-                {
-                    <AntDesign.Text Type="TextElementType.Success"><Icon Type="check" Theme=" IconThemeType.Outline" Width="1.3em" Height="1.3em" /></AntDesign.Text>
+                        }
+                        else
+                        {
+                            <Icon Type="close" Theme="IconThemeType.Outline" Width="1.3em" Height="1.3em" />
+                        }
+                    </PropertyColumn>
+                    <PropertyColumn Property="c => c.CreateTime" Title="时间" Width="190px" />
+                    <ActionColumn Title="操作" Align="ColumnAlign.Right" Width="160px">
+                        <Space>
+                            <SpaceItem>
+                                <Dropdown Trigger="@(new Trigger[] { Trigger.Click })">
+                                    <Overlay>
+                                        <Menu>
 
-                }
-                else
-                {
-                    <Icon Type="close" Theme="IconThemeType.Outline" Width="1.3em" Height="1.3em" />
-                }
-            </PropertyColumn>
-            <PropertyColumn Property="c => c.CreateTime" Title="时间" Width="190px" />
-            <ActionColumn Title="操作" Align="ColumnAlign.Right" Width="160px">
-                <Space>
-                    <SpaceItem>
-                        <Dropdown Trigger="@(new Trigger[] { Trigger.Click })">
-                            <Overlay>
-                                <Menu>
-
-                                    <MenuItem>
-                                        <a @onclick="(e) => HandleEdit(context)"> <Icon Type="@IconType.Outline.Edit" /> 编辑</a>
-                                    </MenuItem>
-                                    <MenuDivider />
-                                    <MenuItem>
-                                        <Popconfirm Placement="@Placement.Left" Title="@("删除这条数据无法恢复，您确定要删除吗?")"
-                                                    OnConfirm="@(e=>HandleDeleteConfirmAsync(e,context.Id))"
-                                                    OkText="确定"
-                                                    CancelText="取消">
-                                            <a> <Icon Type="@IconType.Outline.Delete" /> 删除</a>
-                                        </Popconfirm>
-                                    </MenuItem>
-                                </Menu>
-                            </Overlay>
-                            <ChildContent>
-                                <a class="ant-dropdown-link" @onclick:preventDefault>
-                                    <Icon Type="@IconType.Outline.Menu" />
-                                </a>
-                            </ChildContent>
-                        </Dropdown>
-                    </SpaceItem>
-                </Space>
-            </ActionColumn>
-        </ColumnDefinitions>
-    </Table>
-    <Row Justify="RowJustify.End">
-        <Pagination PageIndex="PagingList.Index" Total="PagingList.Count" PageSize="PagingList.Size" ShowSizeChanger="false" OnChange="OnPageChanged"></Pagination>
-    </Row>
-</Card>
+                                            <MenuItem>
+                                                <a @onclick="(e) => HandleEdit(context)"> <Icon Type="@IconType.Outline.Edit" /> 编辑</a>
+                                            </MenuItem>
+                                            <MenuDivider />
+                                            <MenuItem>
+                                                <Popconfirm Placement="@Placement.Left" Title="@("删除这条数据无法恢复，您确定要删除吗?")"
+                                                            OnConfirm="@(e=>HandleDeleteConfirmAsync(e,context.Id))"
+                                                            OkText="确定"
+                                                            CancelText="取消">
+                                                    <a> <Icon Type="@IconType.Outline.Delete" /> 删除</a>
+                                                </Popconfirm>
+                                            </MenuItem>
+                                        </Menu>
+                                    </Overlay>
+                                    <ChildContent>
+                                        <a class="ant-dropdown-link" @onclick:preventDefault>
+                                            <Icon Type="@IconType.Outline.Menu" />
+                                        </a>
+                                    </ChildContent>
+                                </Dropdown>
+                            </SpaceItem>
+                        </Space>
+                    </ActionColumn>
+                </ColumnDefinitions>
+            </Table>
+            <br />
+            <Row Justify="RowJustify.End">
+                <Pagination PageIndex="PagingList.Index" Total="PagingList.Count" PageSize="PagingList.Size" ShowSizeChanger="false" OnChange="OnPageChanged"></Pagination>
+            </Row>
+        </Card>
 
 
 
-<Modal Title="@("消息模版设置")" Visible="@modalVisible" Width="700" MaskClosable="true" OkText="@("保存")" CancelText="@("取消")" OnOk="@HandleModalOk" OnCancel="@HandleCancel">
-    <Form Model="@template" @ref="@editForm" LabelCol="new ColLayoutParam { Span = 5 }" WrapperCol="new ColLayoutParam { Span = 15 }" Name="modalForm" OnFinish="OnFormFinish">
-        <FluentValidationValidator />
-        <FormItem Label="消息模版类型">
-            <SimpleSelect DefaultValue="" Style="width:120px;" @bind-Value="@context.Type">
-                <SelectOptions>
-                    <SimpleSelectOption Value="" Label="请选择消息模版类型"></SimpleSelectOption>
-                    <SimpleSelectOption Value="@(((int)MessageTemplateType.Message).ToString())" Label="站内信"></SimpleSelectOption>
-                    <SimpleSelectOption Value="@(((int)MessageTemplateType.Email).ToString())" Label="邮件模版"></SimpleSelectOption>
-                    <SimpleSelectOption Value="@(((int)MessageTemplateType.Sms).ToString())" Label="短信模版"></SimpleSelectOption>
-                </SelectOptions>
-            </SimpleSelect>
-        </FormItem>
-        <FormItem Label="消息模版名称">
-            <Input Placeholder="消息模版名称" @bind-Value="@context.Name" />
-        </FormItem>
-
-        <FormItem Label="模版Code">
-            <Input Placeholder="模版Code" @bind-Value="@context.Key" Disabled="@(context.Id > 0)" />
-        </FormItem>
-        <FormItem Label="消息标题">
-            <Input Placeholder="消息标题" @bind-Value="@context.Title" />
-        </FormItem>
-        <FormItem Label="消息内容">
-            <TextArea Placeholder="消息内容" @bind-Value="@context.Body" />
-        </FormItem>
-        <FormItem Label="状态">
-            <Checkbox @bind-Value="@context.Enabled" Disabled=false>
-                启用
-            </Checkbox>
-        </FormItem>
-    </Form>
-</Modal>
-
+        <Modal Title="@("消息模版设置")" Visible="@modalVisible" Width="700" MaskClosable="true" OkText="@("保存")" CancelText="@("取消")" OnOk="@HandleModalOk" OnCancel="@HandleCancel">
+            <Form Model="@model" @ref="@editForm" LabelCol="new ColLayoutParam { Span = 5 }" WrapperCol="new ColLayoutParam { Span = 15 }" Name="modalForm" OnFinish="OnFormFinish">
+                <FluentValidationValidator />
+                <FormItem Label="消息模版类型">
+                    <SimpleSelect DefaultValue="" Style="width:120px;" @bind-Value="@context.Type">
+                        <SelectOptions>
+                            <SimpleSelectOption Value="" Label="请选择消息模版类型"></SimpleSelectOption>
+                            <SimpleSelectOption Value="@(((int)MessageTemplateType.Message).ToString())" Label="站内信"></SimpleSelectOption>
+                            <SimpleSelectOption Value="@(((int)MessageTemplateType.Email).ToString())" Label="邮件模版"></SimpleSelectOption>
+                            <SimpleSelectOption Value="@(((int)MessageTemplateType.Sms).ToString())" Label="短信模版"></SimpleSelectOption>
+                        </SelectOptions>
+                    </SimpleSelect>
+                </FormItem>
+                <FormItem Label="消息模版名称">
+                    <Input Placeholder="消息模版名称" @bind-Value="@context.Name" />
+                </FormItem>
+                <FormItem Label="语言">
+                    <Select DataSource="@languages" @bind-Value="@context.LanguageId" ItemValue="p => p.Id" ItemLabel="p => p.Title" Disabled="@(context.Id > 0)">
+                    </Select>
+                </FormItem>
+                <FormItem Label="模版Code">
+                    <Input Placeholder="模版Code" @bind-Value="@context.Key" Disabled="@(context.Id > 0)" />
+                </FormItem>
+                <FormItem Label="消息标题">
+                    <Input Placeholder="消息标题" @bind-Value="@context.Title" />
+                </FormItem>
+                <FormItem Label="消息内容">
+                    <TextArea Placeholder="消息内容" @bind-Value="@context.Body" />
+                </FormItem>
+                <FormItem Label="状态">
+                    <Checkbox @bind-Value="@context.Enabled" Disabled=false>
+                        启用
+                    </Checkbox>
+                </FormItem>
+            </Form>
+        </Modal>
+    </ChildContent>
+</PageContainer>
 
 
 @code {
+    [Parameter]
+    public string Locale { get; set; } = string.Empty;
+
     [SupplyParameterFromQuery]
     int? Page { get; set; }
 
@@ -147,10 +165,10 @@
     Form<MessageTemplateSearch> searchForm = null!;
 
     [SupplyParameterFromForm]
-    MessageTemplateModel template { get; set; } = new();
+    MessageTemplateModel model { get; set; } = new();
     Form<MessageTemplateModel> editForm = null!;
 
-
+    List<Language> languages = new();
     PagingList<MessageTemplate> PagingList = new();
     bool loading { get; set; } = true;
     bool searchExpand { get; set; } = false;
@@ -166,7 +184,7 @@
     {
         loadQueryString();
         LoadList();
-
+        _ = LoadLanguages();
         base.OnParametersSet();
     }
 
@@ -177,6 +195,20 @@
         search.Key = query.GetQueryString("Key");
     }
 
+    private async Task LoadLanguages()
+    {
+        var url = $"/api/language/enabled";
+        var apiResult = await HttpService.Get<ApiResult<List<Language>>>(url);
+        if (apiResult.Success)
+        {
+            if (apiResult.Data != null)
+            {
+                languages = apiResult.Data;
+                StateHasChanged();
+            }
+        }
+    }
+
     private async void LoadList()
     {
 
@@ -265,13 +297,13 @@
 
     void OnCreateClick()
     {
-        template = new();
+        model = new();
         modalVisible = true;
     }
 
-    void HandleEdit(MessageTemplate model)
+    void HandleEdit(MessageTemplate data)
     {
-        template = model.Adapt<MessageTemplateModel>();
+        model = data.Adapt<MessageTemplateModel>();
         modalVisible = true;
     }
 
@@ -285,18 +317,8 @@
         if (editForm.Validate())
         {
             var result = new ApiResult<string>();
-            var data = template.Adapt<MessageTemplate>();
-
-            if (template.Id > 0)
-            {
-                var url = $"api/messagetemplate/edit";
-                result = await HttpService.Post<ApiResult<string>>(url, data);
-            }
-            else
-            {
-                var url = $"api/messagetemplate/add";
-                result = await HttpService.Post<ApiResult<string>>(url, data);
-            }
+            var url = $"api/messagetemplate/save";
+            result = await HttpService.Post<ApiResult<string>>(url, model);
 
             if (result.Code == (int)ResultCode.Success)
             {
@@ -314,4 +336,14 @@
     {
         modalVisible = false;
     }
+
+    string GetLanuageName(int languageId)
+    {
+        var language = languages.FirstOrDefault(l => l.Id == languageId);
+        if (language != null)
+        {
+            return language.Title;
+        }
+        return "-";
+    }
 }
\ No newline at end of file
diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/Settings.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/Settings.razor
index 7dfc28c..f1d86a0 100644
--- a/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/Settings.razor
+++ b/Atomx.Admin/Atomx.Admin.Client/Pages/Settings/Settings.razor
@@ -1,7 +1,22 @@
 @page "/settings"
+@page "/{locale}/settings"
 @attribute [Authorize]
 @inject ILogger<Settings> Logger
 
-@code {
+<PageContainer Title="系统设置">
+    <Breadcrumb>
+        <Breadcrumb>
+            <BreadcrumbItem Href="/">管理后台</BreadcrumbItem>
+            <BreadcrumbItem Href="/admin/list">系统功能</BreadcrumbItem>
+            <BreadcrumbItem>系统设置</BreadcrumbItem>
+        </Breadcrumb>
+    </Breadcrumb>
+    <ChildContent>
+        <h3>Tools</h3>
+    </ChildContent>
+</PageContainer>
 
-}
+@code {
+    [Parameter]
+    public string Locale { get; set; } = string.Empty;
+}
\ No newline at end of file
diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/SiteApps/AppVersionList.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/SiteApps/AppVersionList.razor
index be2b21b..74843a8 100644
--- a/Atomx.Admin/Atomx.Admin.Client/Pages/SiteApps/AppVersionList.razor
+++ b/Atomx.Admin/Atomx.Admin.Client/Pages/SiteApps/AppVersionList.razor
@@ -3,20 +3,19 @@
 
 @inject ILogger<AppVersionList> Logger
 @attribute [Authorize]
-<div>
-    <PageContainer Title="App版本管理">
+
+<PageContainer Title="App版本管理">
+    <Breadcrumb>
         <Breadcrumb>
-            <Breadcrumb>
-                <BreadcrumbItem Href="/">管理后台</BreadcrumbItem>
-                <BreadcrumbItem Href="/settings">系统配置</BreadcrumbItem>
-                <BreadcrumbItem>版本管理</BreadcrumbItem>
-            </Breadcrumb>
+            <BreadcrumbItem Href="/">管理后台</BreadcrumbItem>
+            <BreadcrumbItem Href="/settings">系统配置</BreadcrumbItem>
+            <BreadcrumbItem>版本管理</BreadcrumbItem>
         </Breadcrumb>
-        <ChildContent>
-            <h3>App Version List</h3>
-        </ChildContent>
-    </PageContainer>
-</div>
+    </Breadcrumb>
+    <ChildContent>
+        <h3>App Version List</h3>
+    </ChildContent>
+</PageContainer>
 
 
 @code {
diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/SiteApps/SiteAppList.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/SiteApps/SiteAppList.razor
index 3c54523..3997660 100644
--- a/Atomx.Admin/Atomx.Admin.Client/Pages/SiteApps/SiteAppList.razor
+++ b/Atomx.Admin/Atomx.Admin.Client/Pages/SiteApps/SiteAppList.razor
@@ -1,7 +1,22 @@
 @page "/system/app/list"
+@page "/{locale}/system/app/list"
 @inject ILogger<SiteAppList> Logger
 @attribute [Authorize]
 
-@code {
+<PageContainer Title="系统工具">
+    <Breadcrumb>
+        <Breadcrumb>
+            <BreadcrumbItem Href="/">管理后台</BreadcrumbItem>
+            <BreadcrumbItem Href="/admin/list">系统功能</BreadcrumbItem>
+            <BreadcrumbItem>系统工具</BreadcrumbItem>
+        </Breadcrumb>
+    </Breadcrumb>
+    <ChildContent>
+        <h3>Tools</h3>
+    </ChildContent>
+</PageContainer>
 
+@code {
+    [Parameter]
+    public string Locale { get; set; } = string.Empty;
 }
diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/Storages/UploadList.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/Storages/UploadList.razor
index 37fe40e..86957f9 100644
--- a/Atomx.Admin/Atomx.Admin.Client/Pages/Storages/UploadList.razor
+++ b/Atomx.Admin/Atomx.Admin.Client/Pages/Storages/UploadList.razor
@@ -1,103 +1,113 @@
 @page "/system/file/list"
+@page "/{locale}/system/file/list"
 @inject ILogger<UploadList> Logger
 @attribute [Authorize]
 
-<PageTitle>上传文件</PageTitle>
-<Title Level="4">上传文件</Title>
-<Card>
-    <Form @ref="searchForm" Model="search" Layout="FormLayout.Inline" Class="search-form" OnFinish="OnSearchFinish">
-        <Row Justify="RowJustify.Start" Gutter="16">
-            <Col>
-            <FormItem Label="文件名">
-                <Input @bind-Value="search.Name" Placeholder="文件名" AllowClear />
-            </FormItem>
-            </Col>
+<PageContainer Title="上传文件">
+    <Breadcrumb>
+        <Breadcrumb>
+            <BreadcrumbItem Href="/">管理后台</BreadcrumbItem>
+            <BreadcrumbItem Href="/admin/list">系统功能</BreadcrumbItem>
+            <BreadcrumbItem>上传文件</BreadcrumbItem>
+        </Breadcrumb>
+    </Breadcrumb>
+    <ChildContent>
+        <Card>
+            <Form @ref="searchForm" Model="search" Layout="FormLayout.Inline" Class="search-form" OnFinish="OnSearchFinish">
+                <Row Justify="RowJustify.Start" Gutter="16">
+                    <Col>
+                    <FormItem Label="文件名">
+                        <Input @bind-Value="search.Name" Placeholder="文件名" AllowClear />
+                    </FormItem>
+                    </Col>
 
-            <Col>
-            <div class="ant-form-item" style="width:200px;display:flex;">
-                <Button Type="ButtonType.Primary" HtmlType="submit">查询</Button>
-                <Button Style="margin: 0 8px;" OnClick="OnSearchReset">重置</Button>
-            </div>
-            </Col>
-        </Row>
-    </Form>
-</Card>
-<Card Class="mt-3">
-    <Table DataSource="PagingList.Items" PageSize="100" HidePagination="true" Resizable>
-        <TitleTemplate>
-            <Flex Justify="FlexJustify.SpaceBetween">
-                文件列表
-                <div>
-                    <Button Class="me-3" OnClick="OnCreateClick" Type="ButtonType.Primary">上传新文件</Button>
-                </div>
-            </Flex>
-        </TitleTemplate>
-        <ColumnDefinitions>
-            <PropertyColumn Property="c => c.Name" Title="文件">
-            </PropertyColumn>
-            <PropertyColumn Property="c => c.ContentType" Title="类型" Width="80px" Align="ColumnAlign.Center">
+                    <Col>
+                    <div class="ant-form-item" style="width:200px;display:flex;">
+                        <Button Type="ButtonType.Primary" HtmlType="submit">查询</Button>
+                        <Button Style="margin: 0 8px;" OnClick="OnSearchReset">重置</Button>
+                    </div>
+                    </Col>
+                </Row>
+            </Form>
+        </Card>
+        <Card Class="mt-3">
+            <Table DataSource="PagingList.Items" PageSize="100" HidePagination="true" Resizable>
+                <TitleTemplate>
+                    <Flex Justify="FlexJustify.SpaceBetween">
+                        文件列表
+                        <div>
+                            <Button Class="me-3" OnClick="OnCreateClick" Type="ButtonType.Primary">上传新文件</Button>
+                        </div>
+                    </Flex>
+                </TitleTemplate>
+                <ColumnDefinitions>
+                    <PropertyColumn Property="c => c.Name" Title="文件">
+                    </PropertyColumn>
+                    <PropertyColumn Property="c => c.ContentType" Title="类型" Width="80px" Align="ColumnAlign.Center">
 
-            </PropertyColumn>
-            <PropertyColumn Property="c => c.Size" Title="文件大小" Width="100px" />
-            <PropertyColumn Property="c => c.Type" Title="状态" Width="80px" Align="ColumnAlign.Center">
-                @if (context.Type == 1)
-                {
-                    <AntDesign.Text Type="TextElementType.Success"><Icon Type="check" Theme=" IconThemeType.Outline" Width="1.3em" Height="1.3em" /></AntDesign.Text>
+                    </PropertyColumn>
+                    <PropertyColumn Property="c => c.Size" Title="文件大小" Width="100px" />
+                    <PropertyColumn Property="c => c.Type" Title="状态" Width="80px" Align="ColumnAlign.Center">
+                        @if (context.Type == 1)
+                        {
+                            <AntDesign.Text Type="TextElementType.Success"><Icon Type="check" Theme=" IconThemeType.Outline" Width="1.3em" Height="1.3em" /></AntDesign.Text>
 
-                }
-                else
-                {
-                    <Icon Type="close" Theme="IconThemeType.Outline" Width="1.3em" Height="1.3em" />
-                }
-            </PropertyColumn>
-            <PropertyColumn Property="c => c.CreateTime" Title="最后登录" Width="190px" />
-            <PropertyColumn Property="c => c.UpdateTime" Title="最后更新" Width="190px" />
-            <ActionColumn Title="操作" Align="ColumnAlign.Right" Width="160px">
-                <Space>
-                    <SpaceItem>
-                        <Dropdown Trigger="@(new Trigger[] { Trigger.Click })">
-                            <Overlay>
-                                <Menu>
+                        }
+                        else
+                        {
+                            <Icon Type="close" Theme="IconThemeType.Outline" Width="1.3em" Height="1.3em" />
+                        }
+                    </PropertyColumn>
+                    <PropertyColumn Property="c => c.CreateTime" Title="最后登录" Width="190px" />
+                    <PropertyColumn Property="c => c.UpdateTime" Title="最后更新" Width="190px" />
+                    <ActionColumn Title="操作" Align="ColumnAlign.Right" Width="160px">
+                        <Space>
+                            <SpaceItem>
+                                <Dropdown Trigger="@(new Trigger[] { Trigger.Click })">
+                                    <Overlay>
+                                        <Menu>
 
-                                    <MenuItem>
-                                        <a @onclick="(e) => OnEditClick(context)"> <Icon Type="@IconType.Outline.Edit" /> 编辑</a>
-                                    </MenuItem>
-                                    <MenuDivider />
-                                    <MenuItem>
-                                        <Popconfirm Placement="@Placement.Left" Title="@("删除这条数据无法恢复，您确定要删除吗?")"
-                                                    OnConfirm="@(e=>HandleDeleteConfirmAsync(e,context.Id))"
-                                                    OkText="确定"
-                                                    CancelText="取消">
-                                            <a> <Icon Type="@IconType.Outline.Delete" /> 删除</a>
-                                        </Popconfirm>
-                                    </MenuItem>
-                                </Menu>
-                            </Overlay>
-                            <ChildContent>
-                                <a class="ant-dropdown-link" @onclick:preventDefault>
-                                    <Icon Type="@IconType.Outline.Menu" />
-                                </a>
-                            </ChildContent>
-                        </Dropdown>
-                    </SpaceItem>
-                </Space>
-            </ActionColumn>
-        </ColumnDefinitions>
-    </Table>
-</Card>
+                                            <MenuItem>
+                                                <a @onclick="(e) => OnEditClick(context)"> <Icon Type="@IconType.Outline.Edit" /> 编辑</a>
+                                            </MenuItem>
+                                            <MenuDivider />
+                                            <MenuItem>
+                                                <Popconfirm Placement="@Placement.Left" Title="@("删除这条数据无法恢复，您确定要删除吗?")"
+                                                            OnConfirm="@(e=>HandleDeleteConfirmAsync(e,context.Id))"
+                                                            OkText="确定"
+                                                            CancelText="取消">
+                                                    <a> <Icon Type="@IconType.Outline.Delete" /> 删除</a>
+                                                </Popconfirm>
+                                            </MenuItem>
+                                        </Menu>
+                                    </Overlay>
+                                    <ChildContent>
+                                        <a class="ant-dropdown-link" @onclick:preventDefault>
+                                            <Icon Type="@IconType.Outline.Menu" />
+                                        </a>
+                                    </ChildContent>
+                                </Dropdown>
+                            </SpaceItem>
+                        </Space>
+                    </ActionColumn>
+                </ColumnDefinitions>
+            </Table>
+        </Card>
 
-<Drawer Closable="true" Width="520" Visible="drawerVisible" Title='(model.Id == 0 ? "新增帐号" : "编辑帐号")' OnClose="_ => CloseDrawer()">
-    <Form LabelColSpan="5" @ref="@editform" Model="@model" OnFinish="OnFormFinish">
-        <FluentValidationValidator />
-        <FormItem Label="帐号名称">
-            <Input @bind-Value="model.Name" For="(()=>model.Name)" Placeholder="帐号名称" />
-        </FormItem>
+        <Drawer Closable="true" Width="520" Visible="drawerVisible" Title='(model.Id == 0 ? "新增帐号" : "编辑帐号")' OnClose="_ => CloseDrawer()">
+            <Form LabelColSpan="5" @ref="@editform" Model="@model" OnFinish="OnFormFinish">
+                <FluentValidationValidator />
+                <FormItem Label="帐号名称">
+                    <Input @bind-Value="model.Name" For="(()=>model.Name)" Placeholder="帐号名称" />
+                </FormItem>
 
-        <FormItem WrapperColOffset="4">
-            <Button Type="ButtonType.Primary" HtmlType="submit" Style="width: 100%;">保存</Button>
-        </FormItem>
-    </Form>
-</Drawer>
+                <FormItem WrapperColOffset="4">
+                    <Button Type="ButtonType.Primary" HtmlType="submit" Style="width: 100%;">保存</Button>
+                </FormItem>
+            </Form>
+        </Drawer>
+    </ChildContent>
+</PageContainer>
 
 @code {
     [SupplyParameterFromQuery]
diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/CurrencyList.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/CurrencyList.razor
deleted file mode 100644
index bc10186..0000000
--- a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/CurrencyList.razor
+++ /dev/null
@@ -1,9 +0,0 @@
-@page "/system/currency/list"
-@inject ILogger<CurrencyList> Logger
-@attribute [Authorize]
-
-<h3>CurrencyList</h3>
-
-@code {
-
-}
diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/Info.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/Info.razor
index 02477c7..a5cb5b3 100644
--- a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/Info.razor
+++ b/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/Info.razor
@@ -1,6 +1,17 @@
 @page "/system/info"
 @page "/{locale}/system/info"
-<h3>Info</h3>
+<PageContainer Title="系统信息">
+    <Breadcrumb>
+        <Breadcrumb>
+            <BreadcrumbItem Href="/">管理后台</BreadcrumbItem>
+            <BreadcrumbItem Href="/admin/list">系统功能</BreadcrumbItem>
+            <BreadcrumbItem>系统信息</BreadcrumbItem>
+        </Breadcrumb>
+    </Breadcrumb>
+    <ChildContent>
+        <h3>Tools</h3>
+    </ChildContent>
+</PageContainer>
 
 @code {
     [Parameter]
diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LanguageList.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LanguageList.razor
index e43aae2..0a5e40c 100644
--- a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LanguageList.razor
+++ b/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LanguageList.razor
@@ -1,110 +1,121 @@
 @page "/system/language/list"
+@page "/{locale}/system/language/list"
 @inject ILogger<LanguageList> Logger
 @attribute [Authorize]
 
-<PageTitle>语言管理</PageTitle>
+<PageContainer Title="语言管理">
+    <Breadcrumb>
+        <Breadcrumb>
+            <BreadcrumbItem Href="/">管理后台</BreadcrumbItem>
+            <BreadcrumbItem Href="/admin/list">系统功能</BreadcrumbItem>
+            <BreadcrumbItem>语言管理</BreadcrumbItem>
+        </Breadcrumb>
+    </Breadcrumb>
+    <ChildContent>
+        <Card Class="mt-3">
+            <Table DataSource="PagingList.Items" PageSize="100" HidePagination="true" Resizable>
+                <TitleTemplate>
+                    <Flex Justify="FlexJustify.SpaceBetween">
+                        多语言列表
+                        <div>
+                            <Button Class="me-3" OnClick="OnCreateClick" Type="ButtonType.Primary">新增</Button>
+                        </div>
+                    </Flex>
+                </TitleTemplate>
+                <ColumnDefinitions>
+                    <PropertyColumn Property="c => c.Name" Title="语言名称">
+                    </PropertyColumn>
+                    <PropertyColumn Property="c => c.Title" Title="语言标题">
 
-<Title Level="4">多语言</Title>
+                    </PropertyColumn>
+                    <PropertyColumn Property="c => c.Culture" Title="语言文化" Width="100px" />
+                    <PropertyColumn Property="c => c.Enabled" Title="状态" Width="80px" Align="ColumnAlign.Center">
+                        @if (context.Enabled)
+                        {
+                            <AntDesign.Text Type="TextElementType.Success"><Icon Type="check" Theme=" IconThemeType.Outline" Width="1.3em" Height="1.3em" /></AntDesign.Text>
 
-<Card Class="mt-3">
-    <Table DataSource="PagingList.Items" PageSize="100" HidePagination="true" Resizable>
-        <TitleTemplate>
-            <Flex Justify="FlexJustify.SpaceBetween">
-                多语言列表
-                <div>
-                    <Button Class="me-3" OnClick="OnCreateClick" Type="ButtonType.Primary">新增</Button>
-                </div>
-            </Flex>
-        </TitleTemplate>
-        <ColumnDefinitions>
-            <PropertyColumn Property="c => c.Name" Title="语言名称">
-            </PropertyColumn>
-            <PropertyColumn Property="c => c.Title" Title="语言标题">
+                        }
+                        else
+                        {
+                            <Icon Type="close" Theme="IconThemeType.Outline" Width="1.3em" Height="1.3em" />
+                        }
+                    </PropertyColumn>
+                    <PropertyColumn Property="c => c.ResourceVersion" Title="资源版本" />
+                    <PropertyColumn Property="c => c.UpdateTime" Title="最后更新" />
+                    <ActionColumn Title="操作" Align="ColumnAlign.Right">
+                        <Space>
+                            <SpaceItem>
+                                <a href="@($"/system/locale/resource/list/{context.Id}")"> <Icon Type="@IconType.Outline.Edit" /> 语言资源</a>
+                            </SpaceItem>
+                            <SpaceItem>
+                                <Dropdown Trigger="@(new Trigger[] { Trigger.Click })">
+                                    <Overlay>
+                                        <Menu>
 
-            </PropertyColumn>
-            <PropertyColumn Property="c => c.Culture" Title="语言文化" Width="100px" />
-            <PropertyColumn Property="c => c.Enabled" Title="状态" Width="80px" Align="ColumnAlign.Center">
-                @if (context.Enabled)
-                {
-                    <AntDesign.Text Type="TextElementType.Success"><Icon Type="check" Theme=" IconThemeType.Outline" Width="1.3em" Height="1.3em" /></AntDesign.Text>
+                                            <MenuItem>
+                                                <a @onclick="(e) => OnEditClick(context)"> <Icon Type="@IconType.Outline.Edit" /> 编辑</a>
+                                            </MenuItem>
+                                            <MenuDivider />
+                                            <MenuItem>
+                                                <Popconfirm Placement="@Placement.Left" Title="@("删除这条数据无法恢复，您确定要删除吗?")"
+                                                            OnConfirm="@(e=>HandleDeleteConfirmAsync(e,context.Id))"
+                                                            OkText="确定"
+                                                            CancelText="取消">
+                                                    <a> <Icon Type="@IconType.Outline.Delete" /> 删除</a>
+                                                </Popconfirm>
+                                            </MenuItem>
+                                        </Menu>
+                                    </Overlay>
+                                    <ChildContent>
+                                        <a class="ant-dropdown-link" @onclick:preventDefault>
+                                            <Icon Type="@IconType.Outline.Menu" />
+                                        </a>
+                                    </ChildContent>
+                                </Dropdown>
+                            </SpaceItem>
+                        </Space>
+                    </ActionColumn>
+                </ColumnDefinitions>
+            </Table>
+        </Card>
 
-                }
-                else
-                {
-                    <Icon Type="close" Theme="IconThemeType.Outline" Width="1.3em" Height="1.3em" />
-                }
-            </PropertyColumn>
-            <PropertyColumn Property="c => c.ResourceVersion" Title="资源版本"/>
-            <PropertyColumn Property="c => c.UpdateTime" Title="最后更新" />
-            <ActionColumn Title="操作" Align="ColumnAlign.Right">
-                <Space>
-                    <SpaceItem>
-                        <a href="@($"/system/locale/resource/list/{context.Id}")"> <Icon Type="@IconType.Outline.Edit" /> 语言资源</a>
-                    </SpaceItem>
-                    <SpaceItem>
-                        <Dropdown Trigger="@(new Trigger[] { Trigger.Click })">
-                            <Overlay>
-                                <Menu>
-
-                                    <MenuItem>
-                                        <a @onclick="(e) => OnEditClick(context)"> <Icon Type="@IconType.Outline.Edit" /> 编辑</a>
-                                    </MenuItem>
-                                    <MenuDivider />
-                                    <MenuItem>
-                                        <Popconfirm Placement="@Placement.Left" Title="@("删除这条数据无法恢复，您确定要删除吗?")"
-                                                    OnConfirm="@(e=>HandleDeleteConfirmAsync(e,context.Id))"
-                                                    OkText="确定"
-                                                    CancelText="取消">
-                                            <a> <Icon Type="@IconType.Outline.Delete" /> 删除</a>
-                                        </Popconfirm>
-                                    </MenuItem>
-                                </Menu>
-                            </Overlay>
-                            <ChildContent>
-                                <a class="ant-dropdown-link" @onclick:preventDefault>
-                                    <Icon Type="@IconType.Outline.Menu" />
-                                </a>
-                            </ChildContent>
-                        </Dropdown>
-                    </SpaceItem>
-                </Space>
-            </ActionColumn>
-        </ColumnDefinitions>
-    </Table>
-</Card>
-
-<Drawer Closable="true" Width="520" Visible="drawerVisible" Title='(model.Id == 0 ? "新增语言" : "编辑语言")' OnClose="_ => CloseDrawer()">
-    <Form LabelColSpan="5" @ref="@editform" Model="@model" OnFinish="OnFormFinish">
-        <FluentValidationValidator />
-        <FormItem Label="语言标题">
-            <Input @bind-Value="model.Title" For="(()=>model.Title)" Placeholder="语言标题" />
-        </FormItem>
-        <FormItem Label="语言名称">
-            <Input @bind-Value="model.Name" For="(()=>model.Name)" Placeholder="语言名称" />
-        </FormItem>
-        <FormItem Label="语言文化">
-            <SimpleSelect @bind-Value="model.Culture" For="(()=>model.Culture)" Placeholder="语言文化">
-                <SelectOptions>
-                    @foreach (var item in LanguageCultures)
-                    {
-                        <SimpleSelectOption Value="@item.Key" Label="@($"{item.Value} - {item.Key}")"></SimpleSelectOption>
-                    }
-                </SelectOptions>
-            </SimpleSelect>
-        </FormItem>
-        <FormItem Label="显示排序">
-            <AntDesign.InputNumber @bind-Value="model.DisplayOrder" For="(()=>model.DisplayOrder)" Placeholder="显示排序" />
-        </FormItem>
-        <FormItem Label="可用状态">
-            <Checkbox T="bool" Label="启用" @bind-value="model.Enabled" Size="InputSize.Small" Class="ps-0" />
-        </FormItem>
-        <FormItem WrapperColOffset="4">
-            <Button Type="ButtonType.Primary" HtmlType="submit" Style="width: 100%;">保存</Button>
-        </FormItem>
-    </Form>
-</Drawer>
+        <Drawer Closable="true" Width="520" Visible="drawerVisible" Title='(model.Id == 0 ? "新增语言" : "编辑语言")' OnClose="_ => CloseDrawer()">
+            <Form LabelColSpan="5" @ref="@editform" Model="@model" OnFinish="OnFormFinish">
+                <FluentValidationValidator />
+                <FormItem Label="语言标题">
+                    <Input @bind-Value="model.Title" For="(()=>model.Title)" Placeholder="语言标题" />
+                </FormItem>
+                <FormItem Label="语言名称">
+                    <Input @bind-Value="model.Name" For="(()=>model.Name)" Placeholder="语言名称" />
+                </FormItem>
+                <FormItem Label="语言文化">
+                    <SimpleSelect @bind-Value="model.Culture" For="(()=>model.Culture)" Placeholder="语言文化">
+                        <SelectOptions>
+                            @foreach (var item in LanguageCultures)
+                            {
+                                <SimpleSelectOption Value="@item.Key" Label="@($"{item.Value} - {item.Key}")"></SimpleSelectOption>
+                            }
+                        </SelectOptions>
+                    </SimpleSelect>
+                </FormItem>
+                <FormItem Label="显示排序">
+                    <AntDesign.InputNumber @bind-Value="model.DisplayOrder" For="(()=>model.DisplayOrder)" Placeholder="显示排序" />
+                </FormItem>
+                <FormItem Label="可用状态">
+                    <Checkbox T="bool" Label="启用" @bind-value="model.Enabled" Size="InputSize.Small" Class="ps-0" />
+                </FormItem>
+                <FormItem WrapperColOffset="4">
+                    <Button Type="ButtonType.Primary" HtmlType="submit" Style="width: 100%;">保存</Button>
+                </FormItem>
+            </Form>
+        </Drawer>
+    </ChildContent>
+</PageContainer>
 
 @code {
+    [Parameter]
+    public string Locale { get; set; } = string.Empty;
+
     [SupplyParameterFromQuery]
     int? Page { get; set; }
 
diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LocaleResourceDetail.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LocaleResourceDetail.razor
index a0c2f40..3d05e79 100644
--- a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LocaleResourceDetail.razor
+++ b/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LocaleResourceDetail.razor
@@ -1,92 +1,103 @@
 @page "/system/locale/resource/detail/{Name}"
+@page "/{locale}/system/locale/resource/detail/{Name}"
 @inject ILogger<LocaleResourceList> Logger
 @attribute [Authorize]
 
+<PageContainer Title="本地化语言资源">
+    <Breadcrumb>
+        <Breadcrumb>
+            <BreadcrumbItem Href="/">管理后台</BreadcrumbItem>
+            <BreadcrumbItem Href="/admin/list">系统功能</BreadcrumbItem>
+            <BreadcrumbItem>本地化语言资源</BreadcrumbItem>
+        </Breadcrumb>
+    </Breadcrumb>
+    <ChildContent>
+        <Spin Spinning="loading">
+            <Card Class="mt-3">
+                <Table DataSource="ResourceItems" PageSize="100" HidePagination="true" Resizable>
+                    <TitleTemplate>
+                        <Flex Justify="FlexJustify.SpaceBetween">
+                            @(@Name)多语言资源列表，可用语言@(@languages.Count)种
+                            <div>
+                                <Button Class="me-3" OnClick="OnCreateClick" Type="ButtonType.Primary">新增</Button>
+                            </div>
+                        </Flex>
+                    </TitleTemplate>
+                    <ColumnDefinitions>
+                        <PropertyColumn Property="c => c.Name" Title="资源Key">
+                        </PropertyColumn>
+                        <PropertyColumn Property="c => c.Title" Title="语言">
+                        </PropertyColumn>
+                        <PropertyColumn Property="c => c.Value" Title="内容">
 
-<PageTitle>本地化语言资源</PageTitle>
-<Title Level="4">多语言本地资源管理</Title>
-<Spin Spinning="loading">
-    <Card Class="mt-3">
-        <Table DataSource="ResourceItems" PageSize="100" HidePagination="true" Resizable>
-            <TitleTemplate>
-                <Flex Justify="FlexJustify.SpaceBetween">
-                    @(@Name)多语言资源列表，可用语言@(@languages.Count)种
-                    <div>
-                        <Button Class="me-3" OnClick="OnCreateClick" Type="ButtonType.Primary">新增</Button>
-                    </div>
-                </Flex>
-            </TitleTemplate>
-            <ColumnDefinitions>
-                <PropertyColumn Property="c => c.Name" Title="资源Key">
-                </PropertyColumn>
-                <PropertyColumn Property="c => c.Title" Title="语言">
-                </PropertyColumn>
-                <PropertyColumn Property="c => c.Value" Title="内容">
+                        </PropertyColumn>
+                        <PropertyColumn Property="c => c.UpdateTime" Title="最后更新" Width="120px" />
+                        <ActionColumn Title="操作" Align="ColumnAlign.Right" Width="100px">
+                            <Space>
+                                <SpaceItem>
+                                    <Dropdown Trigger="@(new Trigger[] { Trigger.Click })">
+                                        <Overlay>
+                                            <Menu>
 
-                </PropertyColumn>
-                <PropertyColumn Property="c => c.UpdateTime" Title="最后更新" Width="120px" />
-                <ActionColumn Title="操作" Align="ColumnAlign.Right" Width="100px">
-                    <Space>
-                        <SpaceItem>
-                            <Dropdown Trigger="@(new Trigger[] { Trigger.Click })">
-                                <Overlay>
-                                    <Menu>
+                                                <MenuItem>
+                                                    <a @onclick="(e) => OnEditClick(context)"> <Icon Type="@IconType.Outline.Edit" /> 编辑</a>
+                                                </MenuItem>
+                                                <MenuDivider />
+                                                <MenuItem>
+                                                    <Popconfirm Placement="@Placement.Left" Title="@("删除这条数据无法恢复，您确定要删除吗?")"
+                                                                OnConfirm="@(e=>HandleDeleteConfirmAsync(e,context.Id))"
+                                                                OkText="确定"
+                                                                CancelText="取消">
+                                                        <a> <Icon Type="@IconType.Outline.Delete" /> 删除</a>
+                                                    </Popconfirm>
+                                                </MenuItem>
+                                            </Menu>
+                                        </Overlay>
+                                        <ChildContent>
+                                            <a class="ant-dropdown-link" @onclick:preventDefault>
+                                                <Icon Type="@IconType.Outline.Menu" />
+                                            </a>
+                                        </ChildContent>
+                                    </Dropdown>
+                                </SpaceItem>
+                            </Space>
+                        </ActionColumn>
+                    </ColumnDefinitions>
+                </Table>
+            </Card>
+        </Spin>
 
-                                        <MenuItem>
-                                            <a @onclick="(e) => OnEditClick(context)"> <Icon Type="@IconType.Outline.Edit" /> 编辑</a>
-                                        </MenuItem>
-                                        <MenuDivider />
-                                        <MenuItem>
-                                            <Popconfirm Placement="@Placement.Left" Title="@("删除这条数据无法恢复，您确定要删除吗?")"
-                                                        OnConfirm="@(e=>HandleDeleteConfirmAsync(e,context.Id))"
-                                                        OkText="确定"
-                                                        CancelText="取消">
-                                                <a> <Icon Type="@IconType.Outline.Delete" /> 删除</a>
-                                            </Popconfirm>
-                                        </MenuItem>
-                                    </Menu>
-                                </Overlay>
-                                <ChildContent>
-                                    <a class="ant-dropdown-link" @onclick:preventDefault>
-                                        <Icon Type="@IconType.Outline.Menu" />
-                                    </a>
-                                </ChildContent>
-                            </Dropdown>
-                        </SpaceItem>
-                    </Space>
-                </ActionColumn>
-            </ColumnDefinitions>
-        </Table>
-    </Card>
-</Spin>
+        <Modal Title="@("语言资源设置")" Visible="@modalVisible" Width="700" MaskClosable="true" OkText="@("保存")" CancelText="@("取消")" OnOk="@HandleModalOk" OnCancel="@HandleCancel">
+            <Form Model="@model" @ref="@editform" LabelCol="new ColLayoutParam { Span = 5 }" WrapperCol="new ColLayoutParam { Span = 15 }" Name="modalForm" OnFinish="OnFormFinish">
+                <FluentValidationValidator />
+                <FormItem Label="语言文字">
+                    @if (context.Id == 0)
+                    {
+                        <Select DataSource="@languages" @bind-Value="@context.LanguageId" ItemValue="p => p.Id" ItemLabel="p => p.Title">
+                        </Select>
+                    }
+                    else
+                    {
+                        <Input Placeholder="资源名称" @bind-Value="@context.Title" Disabled />
+                    }
 
-<Modal Title="@("语言资源设置")" Visible="@modalVisible" Width="700" MaskClosable="true" OkText="@("保存")" CancelText="@("取消")" OnOk="@HandleModalOk" OnCancel="@HandleCancel">
-    <Form Model="@model" @ref="@editform" LabelCol="new ColLayoutParam { Span = 5 }" WrapperCol="new ColLayoutParam { Span = 15 }" Name="modalForm" OnFinish="OnFormFinish">
-        <FluentValidationValidator />
-        <FormItem Label="语言文字">
-            @if (context.Id == 0)
-            {
-                <Select DataSource="@languages" @bind-Value="@context.LanguageId" ItemValue="p => p.Id" ItemLabel="p => p.Title">
-                </Select>
-            }
-            else
-            {
-                <Input Placeholder="资源名称" @bind-Value="@context.Title" Disabled />
-            }
-
-        </FormItem>
-        <FormItem Label="资源名称">
-            <Input Placeholder="资源名称" @bind-Value="@context.Name" Disabled />
-        </FormItem>
-        <FormItem Label="资源内容">
-            <TextArea Placeholder="资源内容" @bind-Value="@context.Value" />
-        </FormItem>
-    </Form>
-</Modal>
+                </FormItem>
+                <FormItem Label="资源名称">
+                    <Input Placeholder="资源名称" @bind-Value="@context.Name" Disabled />
+                </FormItem>
+                <FormItem Label="资源内容">
+                    <TextArea Placeholder="资源内容" @bind-Value="@context.Value" />
+                </FormItem>
+            </Form>
+        </Modal>
+    </ChildContent>
+</PageContainer>
 
 @code {
 
     bool loading = false;
+    [Parameter]
+    public string Locale { get; set; } = string.Empty;
 
     [Parameter]
     public string Name { get; set; }
diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LocaleResourceList.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LocaleResourceList.razor
index 85540de..2d51596 100644
--- a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LocaleResourceList.razor
+++ b/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/LocaleResourceList.razor
@@ -1,111 +1,121 @@
 @page "/system/locale/resource/list/{Id:int}"
+@page "/{locale}/system/locale/resource/list/{Id:int}"
 @inject ILogger<LocaleResourceList> Logger
 @attribute [Authorize]
 
+<PageContainer Title="多语言本地资源管理">
+    <Breadcrumb>
+        <Breadcrumb>
+            <BreadcrumbItem Href="/">管理后台</BreadcrumbItem>
+            <BreadcrumbItem Href="/admin/list">系统功能</BreadcrumbItem>
+            <BreadcrumbItem>多语言本地资源管理</BreadcrumbItem>
+        </Breadcrumb>
+    </Breadcrumb>
+    <ChildContent>
+        <Spin Spinning="loading">
+            <Card>
+                <Form @ref="searchForm" Model="search" Layout="FormLayout.Inline" Class="search-form" OnFinish="OnSearchFinish">
+                    <Row Justify="RowJustify.Start" Gutter="16">
+                        <Col>
+                        <FormItem Label="名称">
+                            <Input @bind-Value="search.Name" Placeholder="名称" AllowClear />
+                        </FormItem>
+                        </Col>
+                        <Col>
+                        <FormItem Label="内容">
+                            <Input @bind-Value="search.Value" Placeholder="名称" AllowClear />
+                        </FormItem>
+                        </Col>
+                        <Col>
+                        <div class="ant-form-item" style="width:200px;display:flex;">
+                            <Button Type="ButtonType.Primary" HtmlType="submit">查询</Button>
+                            <Button Style="margin: 0 8px;" OnClick="OnSearchReset">重置</Button>
+                        </div>
+                        </Col>
+                    </Row>
+                </Form>
+            </Card>
+            <br />
+            <Card Class="mt-3">
+                <Table DataSource="PagingList.Items" PageSize="100" HidePagination="true" Resizable>
+                    <TitleTemplate>
+                        <Flex Justify="FlexJustify.SpaceBetween">
+                            @(@language.Name)语言资源列表
+                            <div>
+                                <Button Class="me-3" OnClick="OnCreateClick" Type="ButtonType.Primary">新增</Button>
+                            </div>
+                        </Flex>
+                    </TitleTemplate>
+                    <ColumnDefinitions>
+                        <PropertyColumn Property="c => c.Name" Title="资源Key">
+                        </PropertyColumn>
+                        <PropertyColumn Property="c => c.Value" Title="内容">
 
-<PageTitle>本地化语言资源</PageTitle>
-<Title Level="4">多语言本地资源管理</Title>
-<Spin Spinning="loading">
-    <Card>
-        <Form @ref="searchForm" Model="search" Layout="FormLayout.Inline" Class="search-form" OnFinish="OnSearchFinish">
-            <Row Justify="RowJustify.Start" Gutter="16">
-                <Col>
-                <FormItem Label="名称">
-                    <Input @bind-Value="search.Name" Placeholder="名称" AllowClear />
+                        </PropertyColumn>
+                        <PropertyColumn Property="c => c.UpdateTime" Title="最后更新" Width="120px" />
+                        <ActionColumn Title="操作" Align="ColumnAlign.Right" Width="120px">
+                            <Space>
+                                <SpaceItem>
+                                    <a @onclick="(e) => OnEditClick(context)"> <Icon Type="@IconType.Outline.Edit" /> 编辑</a>
+                                </SpaceItem>
+                                <SpaceItem>
+                                    <Dropdown Trigger="@(new Trigger[] { Trigger.Click })">
+                                        <Overlay>
+                                            <Menu>
+
+                                                <MenuItem>
+                                                    <a href="@($"/system/locale/resource/detail/{context.Name}")"> <Icon Type="@IconType.Outline.Edit" /> 其他语言比对</a>
+                                                </MenuItem>
+                                                <MenuDivider />
+                                                <MenuItem>
+                                                    <Popconfirm Placement="@Placement.Left" Title="@("删除这条数据无法恢复，您确定要删除吗?")"
+                                                                OnConfirm="@(e=>HandleDeleteConfirmAsync(e,context.Id))"
+                                                                OkText="确定"
+                                                                CancelText="取消">
+                                                        <a> <Icon Type="@IconType.Outline.Delete" /> 删除</a>
+                                                    </Popconfirm>
+                                                </MenuItem>
+                                            </Menu>
+                                        </Overlay>
+                                        <ChildContent>
+                                            <a class="ant-dropdown-link" @onclick:preventDefault>
+                                                <Icon Type="@IconType.Outline.Menu" />
+                                            </a>
+                                        </ChildContent>
+                                    </Dropdown>
+                                </SpaceItem>
+                            </Space>
+                        </ActionColumn>
+                    </ColumnDefinitions>
+                </Table>
+                <br />
+                <Row Justify="RowJustify.End">
+                    <Pagination PageIndex="pager.Index" Total="PagingList.Count" PageSize="PagingList.Size" ShowSizeChanger="false" OnChange="OnPageChanged"></Pagination>
+                </Row>
+            </Card>
+        </Spin>
+
+        <Modal Title="@("语言资源设置")" Visible="@modalVisible" Width="700" MaskClosable="true" OkText="@("保存")" CancelText="@("取消")" OnOk="@HandleModalOk" OnCancel="@HandleCancel">
+            <Form Model="@model" @ref="@editform" LabelCol="new ColLayoutParam { Span = 5 }" WrapperCol="new ColLayoutParam { Span = 15 }" Name="modalForm" OnFinish="OnFormFinish">
+                <FluentValidationValidator />
+                <FormItem Label="语言文字">
+                    @language.Name
                 </FormItem>
-                </Col>
-                <Col>
-                <FormItem Label="内容">
-                    <Input @bind-Value="search.Value" Placeholder="名称" AllowClear />
+                <FormItem Label="资源名称">
+                    <Input Placeholder="资源名称" @bind-Value="@context.Name" />
                 </FormItem>
-                </Col>
-                <Col>
-                <div class="ant-form-item" style="width:200px;display:flex;">
-                    <Button Type="ButtonType.Primary" HtmlType="submit">查询</Button>
-                    <Button Style="margin: 0 8px;" OnClick="OnSearchReset">重置</Button>
-                </div>
-                </Col>
-            </Row>
-        </Form>
-    </Card>
-    <br />
-    <Card Class="mt-3">
-        <Table DataSource="PagingList.Items" PageSize="100" HidePagination="true" Resizable>
-            <TitleTemplate>
-                <Flex Justify="FlexJustify.SpaceBetween">
-                    @(@language.Name)语言资源列表
-                    <div>
-                        <Button Class="me-3" OnClick="OnCreateClick" Type="ButtonType.Primary">新增</Button>
-                    </div>
-                </Flex>
-            </TitleTemplate>
-            <ColumnDefinitions>
-                <PropertyColumn Property="c => c.Name" Title="资源Key">
-                </PropertyColumn>
-                <PropertyColumn Property="c => c.Value" Title="内容">
-
-                </PropertyColumn>
-                <PropertyColumn Property="c => c.UpdateTime" Title="最后更新" Width="120px" />
-                <ActionColumn Title="操作" Align="ColumnAlign.Right" Width="120px">
-                    <Space>
-                        <SpaceItem>
-                            <a @onclick="(e) => OnEditClick(context)"> <Icon Type="@IconType.Outline.Edit" /> 编辑</a>
-                        </SpaceItem>
-                        <SpaceItem>
-                            <Dropdown Trigger="@(new Trigger[] { Trigger.Click })">
-                                <Overlay>
-                                    <Menu>
-
-                                        <MenuItem>
-                                            <a href="@($"/system/locale/resource/detail/{context.Name}")"> <Icon Type="@IconType.Outline.Edit" /> 其他语言比对</a>
-                                        </MenuItem>
-                                        <MenuDivider />
-                                        <MenuItem>
-                                            <Popconfirm Placement="@Placement.Left" Title="@("删除这条数据无法恢复，您确定要删除吗?")"
-                                                        OnConfirm="@(e=>HandleDeleteConfirmAsync(e,context.Id))"
-                                                        OkText="确定"
-                                                        CancelText="取消">
-                                                <a> <Icon Type="@IconType.Outline.Delete" /> 删除</a>
-                                            </Popconfirm>
-                                        </MenuItem>
-                                    </Menu>
-                                </Overlay>
-                                <ChildContent>
-                                    <a class="ant-dropdown-link" @onclick:preventDefault>
-                                        <Icon Type="@IconType.Outline.Menu" />
-                                    </a>
-                                </ChildContent>
-                            </Dropdown>
-                        </SpaceItem>
-                    </Space>
-                </ActionColumn>
-            </ColumnDefinitions>
-        </Table>
-        <br />
-        <Row Justify="RowJustify.End">
-            <Pagination PageIndex="pager.Index" Total="PagingList.Count" PageSize="PagingList.Size" ShowSizeChanger="false" OnChange="OnPageChanged"></Pagination>
-        </Row>
-    </Card>
-</Spin>
-
-<Modal Title="@("语言资源设置")" Visible="@modalVisible" Width="700" MaskClosable="true" OkText="@("保存")" CancelText="@("取消")" OnOk="@HandleModalOk" OnCancel="@HandleCancel">
-    <Form Model="@model" @ref="@editform" LabelCol="new ColLayoutParam { Span = 5 }" WrapperCol="new ColLayoutParam { Span = 15 }" Name="modalForm" OnFinish="OnFormFinish">
-        <FluentValidationValidator />
-        <FormItem Label="语言文字">
-            @language.Name
-        </FormItem>
-        <FormItem Label="资源名称">
-            <Input Placeholder="资源名称" @bind-Value="@context.Name" />
-        </FormItem>
-        <FormItem Label="资源内容">
-            <TextArea Placeholder="资源内容" @bind-Value="@context.Value" />
-        </FormItem>
-    </Form>
-</Modal>
-
+                <FormItem Label="资源内容">
+                    <TextArea Placeholder="资源内容" @bind-Value="@context.Value" />
+                </FormItem>
+            </Form>
+        </Modal>
+    </ChildContent>
+</PageContainer>
 @code {
 
     bool loading = false;
+    [Parameter]
+    public string Locale { get; set; } = string.Empty;
 
     [Parameter]
     public int Id { get; set; }
diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/MenuList.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/MenuList.razor
index 20d42db..991015c 100644
--- a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/MenuList.razor
+++ b/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/MenuList.razor
@@ -1,142 +1,152 @@
 @page "/system/menu/list"
-
+@page "/{locale}/system/menu/list"
 @inject ILogger<MenuList> Logger
 @using MenuItem = Atomx.Admin.Client.Models.MenuItem
 @using Menu = Atomx.Common.Entities.Menu
 @attribute [Authorize]
 
-<PageTitle>菜单管理</PageTitle>
+<PageContainer Title="菜单管理">
+    <Breadcrumb>
+        <Breadcrumb>
+            <BreadcrumbItem Href="/">管理后台</BreadcrumbItem>
+            <BreadcrumbItem Href="/admin/list">系统功能</BreadcrumbItem>
+            <BreadcrumbItem>菜单管理</BreadcrumbItem>
+        </Breadcrumb>
+    </Breadcrumb>
+    <ChildContent>
+        <Card>
+            <Form @ref="searchForm" Model="search" Layout="FormLayout.Inline" Class="search-form" OnFinish="OnSearchFinish">
+                <Row Justify="RowJustify.Start" Gutter="16">
+                    <Col>
+                    <FormItem Label="名称">
+                        <Input @bind-Value="search.Name" Placeholder="名称" AllowClear />
+                    </FormItem>
+                    </Col>
 
-<Title Level="4">菜单管理</Title>
-<Card>
-    <Form @ref="searchForm" Model="search" Layout="FormLayout.Inline" Class="search-form" OnFinish="OnSearchFinish">
-        <Row Justify="RowJustify.Start" Gutter="16">
-            <Col>
-            <FormItem Label="名称">
-                <Input @bind-Value="search.Name" Placeholder="名称" AllowClear />
-            </FormItem>
-            </Col>
+                    <Col>
+                    <div class="ant-form-item" style="width:200px;display:flex;">
+                        <Button Type="ButtonType.Primary" HtmlType="submit">查询</Button>
+                        <Button Style="margin: 0 8px;" OnClick="OnSearchReset">重置</Button>
+                    </div>
+                    </Col>
+                </Row>
+            </Form>
+        </Card>
+        <Card Class="mt-3">
+            <Table DataSource="Menus" PageSize="100" HidePagination="true" Resizable>
+                <TitleTemplate>
+                    <Flex Justify="FlexJustify.SpaceBetween">
+                        菜单列表
+                        <div>
+                            <Button Class="me-3" OnClick="OnCreateClick" Type="ButtonType.Primary">新增</Button>
+                        </div>
 
-            <Col>
-            <div class="ant-form-item" style="width:200px;display:flex;">
-                <Button Type="ButtonType.Primary" HtmlType="submit">查询</Button>
-                <Button Style="margin: 0 8px;" OnClick="OnSearchReset">重置</Button>
-            </div>
-            </Col>
-        </Row>
-    </Form>
-</Card>
-<Card Class="mt-3">
-    <Table DataSource="Menus" PageSize="100" HidePagination="true" Resizable>
-        <TitleTemplate>            
-            <Flex Justify="FlexJustify.SpaceBetween">
-                菜单列表
-                <div>
-                    <Button Class="me-3" OnClick="OnCreateClick" Type="ButtonType.Primary">新增</Button>
-                </div>
-               
-            </Flex>
-        </TitleTemplate>
-        <ColumnDefinitions>
-            <PropertyColumn Property="c=>c.Name" Title="名称">
-                <AntDesign.Text>@GetName(context)</AntDesign.Text>
-            </PropertyColumn>
-            <PropertyColumn Property="c=>c.Icon" Title="图标" Width="60px" Align="ColumnAlign.Center">
-                @if (!string.IsNullOrEmpty(context.Icon)) {
-                    <Icon Type="@context.Icon" Theme="IconThemeType.Outline" Width="1.3em" Height="1.3em" />
-                }
-            </PropertyColumn>
-            <PropertyColumn Property="c=>c.Key" Title="分组标识" Ellipsis/>
-            <PropertyColumn Property="c=>c.Url" Title="链接" />
-            <PropertyColumn Property="c=>c.DisplayOrder" Title="排序" Width="80px" Align="ColumnAlign.Center" />
-            <PropertyColumn Property="c=>c.Enabled" Title="状态" Width="80px" Align="ColumnAlign.Center">
-                @if (context.Enabled)
+                    </Flex>
+                </TitleTemplate>
+                <ColumnDefinitions>
+                    <PropertyColumn Property="c => c.Name" Title="名称">
+                        <AntDesign.Text>@GetName(context)</AntDesign.Text>
+                    </PropertyColumn>
+                    <PropertyColumn Property="c => c.Icon" Title="图标" Width="60px" Align="ColumnAlign.Center">
+                        @if (!string.IsNullOrEmpty(context.Icon))
+                        {
+                            <Icon Type="@context.Icon" Theme="IconThemeType.Outline" Width="1.3em" Height="1.3em" />
+                        }
+                    </PropertyColumn>
+                    <PropertyColumn Property="c => c.Key" Title="分组标识" Ellipsis />
+                    <PropertyColumn Property="c => c.Url" Title="链接" />
+                    <PropertyColumn Property="c => c.DisplayOrder" Title="排序" Width="80px" Align="ColumnAlign.Center" />
+                    <PropertyColumn Property="c => c.Enabled" Title="状态" Width="80px" Align="ColumnAlign.Center">
+                        @if (context.Enabled)
+                        {
+                            <AntDesign.Text Type="TextElementType.Success"><Icon Type="check" Theme=" IconThemeType.Outline" Width="1.3em" Height="1.3em" /></AntDesign.Text>
+
+                        }
+                        else
+                        {
+                            <Icon Type="close" Theme="IconThemeType.Outline" Width="1.3em" Height="1.3em" />
+                        }
+                    </PropertyColumn>
+                    <PropertyColumn Property="c => c.CreateTime" Title="时间" Width="150px" />
+                    <ActionColumn Title="操作" Align="ColumnAlign.Right" Width="120px">
+                        <Space>
+                            <SpaceItem>
+                                <a @onclick="(e) => OnEditClick(context)">编辑</a>
+                            </SpaceItem>
+                            <SpaceItem>
+                                <Popconfirm Placement="@Placement.Left" Title="@("删除这条数据无法恢复，您确定要删除吗?")"
+                                            OnConfirm="@(e=>HandleDeleteConfirmAsync(e,context.Id))"
+                                            OkText="确定"
+                                            CancelText="取消">
+                                    <a>删除</a>
+                                </Popconfirm>
+                            </SpaceItem>
+                        </Space>
+                    </ActionColumn>
+                </ColumnDefinitions>
+            </Table>
+        </Card>
+
+        <Drawer Closable="true" Width="520" Visible="drawerVisible" Title='("设置菜单")' OnClose="_ => CloseDrawer()">
+            <Form LabelColSpan="4" @ref="@editform" Model="@menu" Class="px-5" OnFinish="OnFormFinish">
+                <FluentValidationValidator />
+                <FormItem Label="名称">
+                    <Input @bind-Value="menu.Name" For="(()=>menu.Name)" />
+                </FormItem>
+                <FormItem Label="分组标识">
+                    <Input @bind-Value="menu.Key" For="(()=>menu.Key)" />
+                </FormItem>
+                <FormItem Label="链接">
+                    <Input @bind-Value="menu.Url" For="(()=>menu.Url)" />
+                </FormItem>
+                <FormItem Label="上级分类">
+                    <Select @bind-Value="@menu.ParentId" TItemValue="long" TItem="string" Placeholder="请选择上级分类">
+                        <SelectOptions>
+                            <SelectOption Value="0L" Label="无" />
+                            @foreach (var item in Menus)
+                            {
+                                <SelectOption Value="@item.Id" Label="@GetName(item)" />
+                            }
+
+                        </SelectOptions>
+                    </Select>
+                </FormItem>
+                @if (menu.ParentId == 0)
                 {
-                    <AntDesign.Text Type="TextElementType.Success"><Icon Type="check" Theme=" IconThemeType.Outline" Width="1.3em" Height="1.3em" /></AntDesign.Text>
-                    
+
+                    <FormItem Label="图标">
+                        <Select ItemValue="c => c"
+                                ItemLabel="c => c"
+                                DataSource="IconsExtension.IconList()"
+                                @bind-Value="@menu.Icon">
+                            <ItemTemplate Context="Icon">
+                                <p class="mt-2"><Icon Type="@Icon" /> @Icon</p>
+                            </ItemTemplate>
+                            <LabelTemplate Context="Icon">
+                                <p class="mt-1"><Icon Type="@Icon" /> @Icon</p>
+                            </LabelTemplate>
+                        </Select>
+                    </FormItem>
                 }
-                else
-                {
-                    <Icon Type="close" Theme="IconThemeType.Outline" Width="1.3em" Height="1.3em" />
-                }
-            </PropertyColumn>
-            <PropertyColumn Property="c=>c.CreateTime" Title="时间" Width="150px" />
-            <ActionColumn Title="操作" Align="ColumnAlign.Right" Width="120px">
-                <Space>
-                    <SpaceItem>
-                        <a @onclick="(e)=>OnEditClick(context)">编辑</a>
-                    </SpaceItem>
-                    <SpaceItem>
-                        <Popconfirm Placement="@Placement.Left" Title="@("删除这条数据无法恢复，您确定要删除吗?")"
-                        OnConfirm="@(e=>HandleDeleteConfirmAsync(e,context.Id))"
-                        OkText="确定"
-                        CancelText="取消">
-                            <a>删除</a>
-                        </Popconfirm>
-                    </SpaceItem>
-                </Space>
-            </ActionColumn>
-        </ColumnDefinitions>
-    </Table>
-</Card>
-
-<Drawer Closable="true" Width="520" Visible="drawerVisible" Title='("设置菜单")' OnClose="_=>CloseDrawer()">
-    <Form LabelColSpan="4" @ref="@editform" Model="@menu" Class="px-5" OnFinish="OnFormFinish">
-        <FluentValidationValidator />
-        <FormItem Label="名称">
-            <Input @bind-Value="menu.Name" For="(()=>menu.Name)" />
-        </FormItem>
-        <FormItem Label="分组标识">
-            <Input  @bind-Value="menu.Key" For="(()=>menu.Key)" />
-        </FormItem>
-        <FormItem Label="链接">
-            <Input @bind-Value="menu.Url" For="(()=>menu.Url)" />
-        </FormItem>
-        <FormItem Label="上级分类">            
-            <Select @bind-Value="@menu.ParentId" TItemValue="long" TItem="string" Placeholder="请选择上级分类">
-                <SelectOptions>
-                    <SelectOption Value="0L" Label="无" />
-                    @foreach(var item in Menus)
-                    {
-                        <SelectOption Value="@item.Id" Label="@GetName(item)" />
-                    }
-
-                </SelectOptions>
-            </Select>
-        </FormItem>
-        @if (menu.ParentId == 0)
-        {
-
-            <FormItem Label="图标">
-                <Select ItemValue="c=>c"
-                ItemLabel="c=>c"
-                DataSource="IconsExtension.IconList()"
-                @bind-Value="@menu.Icon">
-                <ItemTemplate  Context="Icon">
-                    <p class="mt-2"><Icon Type="@Icon" /> @Icon</p>
-                </ItemTemplate>
-                    <LabelTemplate Context="Icon">
-                        <p class="mt-1"><Icon Type="@Icon" /> @Icon</p>
-                    </LabelTemplate>
-                </Select>
-            </FormItem>
-        }
-        <FormItem Label="显示排序">
-            <Input @bind-Value="menu.DisplayOrder" For="(()=>menu.DisplayOrder)" />
-        </FormItem>
-        <FormItem Label="状态">
-            <Checkbox T="bool" Label="启用" @bind-value="menu.Enabled" Size="InputSize.Small" Class="ps-0" />
-        </FormItem>
-        <FormItem WrapperColOffset="4">
-            <Button Type="ButtonType.Primary" HtmlType="submit" Class="mt-5" Style="width: 100%;">保存</Button>
-        </FormItem>
-    </Form >
-</Drawer>
+                <FormItem Label="显示排序">
+                    <Input @bind-Value="menu.DisplayOrder" For="(()=>menu.DisplayOrder)" />
+                </FormItem>
+                <FormItem Label="状态">
+                    <Checkbox T="bool" Label="启用" @bind-value="menu.Enabled" Size="InputSize.Small" Class="ps-0" />
+                </FormItem>
+                <FormItem WrapperColOffset="4">
+                    <Button Type="ButtonType.Primary" HtmlType="submit" Class="mt-5" Style="width: 100%;">保存</Button>
+                </FormItem>
+            </Form>
+        </Drawer>
+    </ChildContent>
+</PageContainer>
 
 
 @code {
 
-
+    [Parameter]
+    public string Locale { get; set; } = string.Empty;
 
     [SupplyParameterFromQuery]
     int? Page { get; set; }
@@ -285,7 +295,7 @@
 
                 CloseDrawer();
                 LoadList();
-                await ModalService.InfoAsync(new ConfirmOptions() { Title="提示", Content="数据提交成功!" });
+                await ModalService.InfoAsync(new ConfirmOptions() { Title = "提示", Content = "数据提交成功!" });
             }
             else
             {
@@ -294,7 +304,7 @@
         }
 
 
-        
+
     }
 
     private string GetPath(string path)
@@ -335,7 +345,7 @@
         return name;
     }
 
-   
+
 
     private void OpenDrawer()
     {
diff --git a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/Tools.razor b/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/Tools.razor
index b0a5a07..96666c5 100644
--- a/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/Tools.razor
+++ b/Atomx.Admin/Atomx.Admin.Client/Pages/Systems/Tools.razor
@@ -1,7 +1,18 @@
 @page "/system/tools"
 @page "/{locale}/system/tools"
 
-<h3>Tools</h3>
+<PageContainer Title="系统工具">
+    <Breadcrumb>
+        <Breadcrumb>
+            <BreadcrumbItem Href="/">管理后台</BreadcrumbItem>
+            <BreadcrumbItem Href="/admin/list">系统功能</BreadcrumbItem>
+            <BreadcrumbItem>系统工具</BreadcrumbItem>
+        </Breadcrumb>
+    </Breadcrumb>
+    <ChildContent>
+        <h3>Tools</h3>
+    </ChildContent>
+</PageContainer>
 
 @code {
     [Parameter]
diff --git a/Atomx.Admin/Atomx.Admin.Client/Validators/MaterialBatchValidator.cs b/Atomx.Admin/Atomx.Admin.Client/Validators/MaterialBatchValidator.cs
deleted file mode 100644
index 5c1dc3d..0000000
--- a/Atomx.Admin/Atomx.Admin.Client/Validators/MaterialBatchValidator.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Atomx.Common.Entities;
-using FluentValidation;
-
-namespace Atomx.Admin.Client.Validators
-{
-    public class MaterialBatchValidator : AbstractValidator<MaterialBatch>
-    {
-        public MaterialBatchValidator()
-        {
-            RuleFor(p => p.Price).NotEmpty().WithMessage("价格不能为空");
-        }
-    }
-}
diff --git a/Atomx.Admin/Atomx.Admin.Client/Validators/MaterialRecordValidator.cs b/Atomx.Admin/Atomx.Admin.Client/Validators/MaterialRecordValidator.cs
deleted file mode 100644
index bc46a79..0000000
--- a/Atomx.Admin/Atomx.Admin.Client/Validators/MaterialRecordValidator.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Atomx.Common.Entities;
-using FluentValidation;
-
-namespace Atomx.Admin.Client.Validators
-{
-    public class MaterialRecordValidator : AbstractValidator<MaterialRecord>
-    {
-        public MaterialRecordValidator()
-        {
-            RuleFor(p => p.UserId).NotEmpty().WithMessage("名称不能为空");
-        }
-    }
-}
diff --git a/Atomx.Admin/Atomx.Admin.Client/Validators/MaterialValidator.cs b/Atomx.Admin/Atomx.Admin.Client/Validators/MaterialValidator.cs
deleted file mode 100644
index 0d89f26..0000000
--- a/Atomx.Admin/Atomx.Admin.Client/Validators/MaterialValidator.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Atomx.Common.Entities;
-using FluentValidation;
-
-namespace Atomx.Admin.Client.Validators
-{
-    public class MaterialValidator : AbstractValidator<Material>
-    {
-        public MaterialValidator()
-        {
-            //RuleFor(p => p.Name).NotEmpty().WithMessage("名称不能为空");
-        }
-    }
-}
diff --git a/Atomx.Admin/Atomx.Admin.Client/Validators/MessageTemplateModelValidator.cs b/Atomx.Admin/Atomx.Admin.Client/Validators/MessageTemplateModelValidator.cs
index 3cac7c9..6176f1d 100644
--- a/Atomx.Admin/Atomx.Admin.Client/Validators/MessageTemplateModelValidator.cs
+++ b/Atomx.Admin/Atomx.Admin.Client/Validators/MessageTemplateModelValidator.cs
@@ -1,11 +1,12 @@
 using Atomx.Admin.Client.Models;
 using FluentValidation;
+using Microsoft.Extensions.Localization;
 
 namespace Atomx.Admin.Client.Validators
 {
     public class MessageTemplateModelValidator : AbstractValidator<MessageTemplateModel>
     {
-        public MessageTemplateModelValidator()
+        public MessageTemplateModelValidator(IStringLocalizer<MessageTemplateModelValidator> localizer)
         {
             RuleFor(p => p.Name).NotEmpty().WithMessage("消息模板名称不能为空");
             RuleFor(p => p.Title).NotEmpty().WithMessage("消息模板标题不能为空");
diff --git a/Atomx.Admin/Atomx.Admin/Controllers/CurrencyController.cs b/Atomx.Admin/Atomx.Admin/Controllers/CurrencyController.cs
index 34a8035..627e493 100644
--- a/Atomx.Admin/Atomx.Admin/Controllers/CurrencyController.cs
+++ b/Atomx.Admin/Atomx.Admin/Controllers/CurrencyController.cs
@@ -1,16 +1,14 @@
 using Atomx.Admin.Client.Models;
-using Atomx.Admin.Client.Validators;
 using Atomx.Admin.Services;
-using Atomx.Common.Entities;
 using Atomx.Common.Models;
 using Atomx.Data;
 using Atomx.Data.CacheServices;
 using Atomx.Data.Services;
-using Atomx.Utils.Extension;
-using Atomx.Utils.Models;
+using FluentValidation;
 using MapsterMapper;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Localization;
 
 namespace Atomx.Admin.Controllers
 {
@@ -26,6 +24,8 @@ namespace Atomx.Admin.Controllers
         private readonly IMapper _mapper;
         private readonly JwtSetting _jwtSettings;
         private readonly ICacheService _cacheService;
+        readonly IValidator<CurrencyModel> _validator;
+        readonly IStringLocalizer<CurrencyController> _localizer;
 
 
         /// <summary>
@@ -38,7 +38,8 @@ namespace Atomx.Admin.Controllers
         /// <param name="mapper"></param>
         /// <param name="jwtSettings"></param>
         /// <param name="cacheService"></param>
-        public CurrencyController(ILogger<CurrencyController> logger, IIdCreatorService idCreator, IIdentityService identityService, DataContext dbContext, IMapper mapper, JwtSetting jwtSettings, ICacheService cacheService)
+        public CurrencyController(ILogger<CurrencyController> logger, IIdCreatorService idCreator, IIdentityService identityService,
+            DataContext dbContext, IMapper mapper, JwtSetting jwtSettings, ICacheService cacheService,IValidator<CurrencyModel> validator, IStringLocalizer<CurrencyController> stringLocalizer)
         {
             _logger = logger;
             _idCreator = idCreator;
@@ -47,6 +48,8 @@ namespace Atomx.Admin.Controllers
             _mapper = mapper;
             _jwtSettings = jwtSettings;
             _cacheService = cacheService;
+            _validator = validator;
+            _localizer = stringLocalizer;
         }
 
         ///// <summary>
diff --git a/Atomx.Admin/Atomx.Admin/Controllers/MessageTemplateController.cs b/Atomx.Admin/Atomx.Admin/Controllers/MessageTemplateController.cs
index 4c111e0..6276c4e 100644
--- a/Atomx.Admin/Atomx.Admin/Controllers/MessageTemplateController.cs
+++ b/Atomx.Admin/Atomx.Admin/Controllers/MessageTemplateController.cs
@@ -1,4 +1,5 @@
-using Atomx.Admin.Client.Models;
+using AntDesign;
+using Atomx.Admin.Client.Models;
 using Atomx.Admin.Client.Validators;
 using Atomx.Admin.Services;
 using Atomx.Common.Entities;
@@ -6,9 +7,11 @@ using Atomx.Common.Models;
 using Atomx.Data;
 using Atomx.Data.CacheServices;
 using Atomx.Data.Services;
+using FluentValidation;
 using MapsterMapper;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Localization;
 
 namespace Atomx.Admin.Controllers
 {
@@ -22,6 +25,8 @@ namespace Atomx.Admin.Controllers
         readonly IMapper _mapper;
         readonly DataContext _dbContext;
         readonly ICacheService _cacheService;
+        readonly IValidator<MessageTemplateModel> _validator;
+        readonly IStringLocalizer<MessageTemplateController> _localizer;
 
         /// <summary>
         /// 
@@ -31,7 +36,8 @@ namespace Atomx.Admin.Controllers
         /// <param name="idCreator"></param>
         /// <param name="messageTemplateService"></param>
         /// <param name="mapper"></param>
-        public MessageTemplateController(ILogger<MessageTemplateController> logger, IIdentityService identityService, IIdCreatorService idCreator, IMapper mapper, DataContext dataContext, ICacheService cacheService)
+        public MessageTemplateController(ILogger<MessageTemplateController> logger, IIdentityService identityService,
+            IIdCreatorService idCreator, IMapper mapper, DataContext dataContext, ICacheService cacheService, IValidator<MessageTemplateModel> validator, IStringLocalizer<MessageTemplateController> stringLocalizer)
         {
             _logger = logger;
             _identityService = identityService;
@@ -39,6 +45,8 @@ namespace Atomx.Admin.Controllers
             _mapper = mapper;
             _dbContext = dataContext;
             _cacheService = cacheService;
+            _validator = validator;
+            _localizer = stringLocalizer;
 
         }
 
@@ -64,6 +72,12 @@ namespace Atomx.Admin.Controllers
                             where p.Type == search.Type
                             select p;
                 }
+                if (search.Language.HasValue)
+                {
+                    query = from p in query
+                            where p.LanguageId == search.Language
+                            select p;
+                }
                 if (!string.IsNullOrEmpty(search.Key))
                 {
                     query = from p in query
@@ -107,81 +121,57 @@ namespace Atomx.Admin.Controllers
         }
 
         /// <summary>
-        /// 添加版本信息
+        /// 保存消息模板配置
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        [HttpPost("add")]
-        public IActionResult Add(MessageTemplateModel model)
+        [HttpPost("save")]
+        public async Task<IActionResult> SaveAsync(MessageTemplateModel model)
         {
-            var result = new ApiResult<string>();
-            var validator = new MessageTemplateModelValidator();
-            var validation = validator.Validate(model);
+            var validation = await _validator.ValidateAsync(model);
             if (!validation.IsValid)
             {
-                var message = validation.Errors.FirstOrDefault()?.ErrorMessage;
-                result = result.IsFail(message ?? string.Empty, null);
-                return new JsonResult(result);
+                var message = validation.Errors.FirstOrDefault()?.ErrorMessage ?? string.Empty;
+                return new JsonResult(new ApiResult<string>().IsFail(message, null));
             }
             try
             {
-                model.Id = _idCreator.CreateId();
-                var message = _mapper.Map<MessageTemplate>(model);
-                message.CreateTime = DateTime.UtcNow;
+                var data = _dbContext.MessageTemplates.SingleOrDefault(p => p.Key == model.Key && p.LanguageId == model.LanguageId && p.SiteId == model.SiteId && p.Id != model.Id);
+                if (data != null)
+                {
+                    return new JsonResult(new ApiResult<string>().IsFail("当前站点语言下已经存在这个配置，请认真检查", null));
+                }
 
-                _dbContext.MessageTemplates.Add(message);
-                var count = _dbContext.SaveChanges();
+                if (model.Id > 0)
+                {
+                    data = _dbContext.MessageTemplates.SingleOrDefault(p => p.Id == model.Id);
+                    if (data == null)
+                    {
+                        return new JsonResult(new ApiResult<string>().IsFail("数据不存在", null));
+                    }
+                    data = _mapper.Map<MessageTemplateModel, MessageTemplate>(model, data);
+                    data.UpdateTime = DateTime.UtcNow;
+                    _dbContext.SaveChanges();
+                }
+                else
+                {
+                    model.Id = _idCreator.CreateId();
+                    data = _mapper.Map<MessageTemplate>(model);
+                    data.CreateTime = DateTime.UtcNow;
+                    _dbContext.MessageTemplates.Add(data);
+                    _dbContext.SaveChanges();
+                }
 
-                result = result.IsSuccess(count.ToString());
+
+                return new JsonResult(new ApiResult<string>().IsSuccess("操作成功"));
             }
             catch (Exception ex)
             {
-                result = result.IsFail(ex.Message);
                 _logger.LogError(ex.Message);
+                return new JsonResult(new ApiResult<string>().IsFail(ex.Message, null));
             }
-            return new JsonResult(result);
         }
 
-        /// <summary>
-        /// 编辑
-        /// </summary>
-        /// <param name="model"></param>
-        /// <returns></returns>
-        [HttpPost("edit")]
-        public IActionResult Edit(MessageTemplateModel model)
-        {
-            var result = new ApiResult<string>();
-            var validator = new MessageTemplateModelValidator();
-            var validation = validator.Validate(model);
-            if (!validation.IsValid)
-            {
-                var message = validation.Errors.FirstOrDefault()?.ErrorMessage;
-                result = result.IsFail(message ?? string.Empty, null);
-                return new JsonResult(result);
-            }
-
-            var data = _dbContext.MessageTemplates.SingleOrDefault(p => p.Id == model.Id);
-            if (data == null)
-            {
-                result = result.IsFail("数据不存在");
-                return new JsonResult(result);
-            }
-
-            data.UpdateTime = DateTime.UtcNow;
-
-            try
-            {
-                int count = _dbContext.SaveChanges();
-                result = result.IsSuccess(count.ToString());
-            }
-            catch (Exception ex)
-            {
-                result = result.IsFail(ex.Message);
-                _logger.LogError(ex.Message);
-                Console.WriteLine(ex.Message);
-            }
-            return new JsonResult(result);
-        }
 
         /// <summary>
         /// 根据ID删除
diff --git a/Atomx.Admin/Atomx.Admin/wwwroot/data/country.json b/Atomx.Admin/Atomx.Admin/wwwroot/data/country.json
new file mode 100644
index 0000000..0db3279
--- /dev/null
+++ b/Atomx.Admin/Atomx.Admin/wwwroot/data/country.json
@@ -0,0 +1,3 @@
+{
+
+}
diff --git a/Atomx.Common/Entities/Area.cs b/Atomx.Common/Entities/Area.cs
index 9977090..9879c46 100644
--- a/Atomx.Common/Entities/Area.cs
+++ b/Atomx.Common/Entities/Area.cs
@@ -6,6 +6,7 @@ namespace Atomx.Common.Entities
     /// <summary>
     /// 地区（国家、省、市、区）
     /// </summary>
+    [Table("Areas")]
     public class Area
     {
         /// <summary>
diff --git a/Atomx.Common/Entities/Category.cs b/Atomx.Common/Entities/Category.cs
index 4015c14..0224bfd 100644
--- a/Atomx.Common/Entities/Category.cs
+++ b/Atomx.Common/Entities/Category.cs
@@ -6,6 +6,7 @@ namespace Atomx.Common.Entities
     /// <summary>
     /// 分类
     /// </summary>
+    [Table("Categories")]
     public class Category
     {
         /// <summary>
diff --git a/Atomx.Common/Entities/PaymentChannel.cs b/Atomx.Common/Entities/Channel.cs
similarity index 78%
rename from Atomx.Common/Entities/PaymentChannel.cs
rename to Atomx.Common/Entities/Channel.cs
index 68cb92a..d8c6637 100644
--- a/Atomx.Common/Entities/PaymentChannel.cs
+++ b/Atomx.Common/Entities/Channel.cs
@@ -3,7 +3,8 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Atomx.Common.Entities
 {
-    public class PaymentChannel
+    [Table("Channels")]
+    public class Channel
     {
         /// <summary>
         /// 数据ID
@@ -13,26 +14,31 @@ namespace Atomx.Common.Entities
         public int Id { get; set; }
 
         /// <summary>
-        /// 付款方式,银行、微信、支付宝，USDT
+        /// 站点ID
+        /// </summary>
+        public long SiteId { get; set; }
+
+        /// <summary>
+        /// 通道类型,例如通知、支付、登录等
         /// </summary>
         public int Type { get; set; }
 
         /// <summary>
-        /// 支付网络，区块链-TRC20，Online-Wechat，Bank-ICBC
+        /// 通道网络，例如API、SMS、Email,MQTT,区块链网络等
         /// </summary>
         public int Network { get; set; }
 
         /// <summary>
-        /// 支付渠道名称
+        /// 通道名称
         /// </summary>
         [Column(TypeName = "varchar(20)")]
         public string Name { get; set; } = string.Empty;
 
         /// <summary>
-        /// 支付渠道标题名称
+        /// 通道标题名称
         /// </summary>
         [Column(TypeName = "varchar(20)")]
-        public string Title { get; set; }=string.Empty;
+        public string Title { get; set; } = string.Empty;
 
         /// <summary>
         /// 描述说明
@@ -40,15 +46,8 @@ namespace Atomx.Common.Entities
         [Column(TypeName = "varchar(512)")]
         public string Description { get; set; } = string.Empty;
 
-
         /// <summary>
-        /// 收款账号
-        /// </summary>
-        [Column(TypeName = "varchar(256)")]
-        public string Account { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 支付通道的设置
+        /// 通道的设置
         /// </summary>
         [Column(TypeName = "text")]
         public string Config { get; set; } = string.Empty;
diff --git a/Atomx.Common/Entities/CorporationManufacturerRelation.cs b/Atomx.Common/Entities/CorporationManufacturerRelation.cs
deleted file mode 100644
index 749a4ea..0000000
--- a/Atomx.Common/Entities/CorporationManufacturerRelation.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Atomx.Common.Entities
-{
-    /// <summary>
-    /// 企业供应商关系
-    /// </summary>
-    [Table("CorporationManufacturerRelations")]
-    public class CorporationManufacturerRelation
-    {
-        /// <summary>
-        /// 产品属性关联数据ID
-        /// </summary>
-        [DatabaseGenerated(DatabaseGeneratedOption.None)]
-        [Key]
-        public long Id { get; set; }
-
-        /// <summary>
-        /// 企业ID
-        /// </summary>
-        public long CorporationId { get; set; }
-
-        /// <summary>
-        /// 供应制造商ID
-        /// </summary>
-        public long ManufacturerId { get; set; }
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        [Column(TypeName = "timestamptz")]
-        public DateTime CreateTime { get; set; }
-    }
-}
diff --git a/Atomx.Common/Entities/CorporationUserRelation.cs b/Atomx.Common/Entities/CorporationUserRelation.cs
deleted file mode 100644
index ae72c38..0000000
--- a/Atomx.Common/Entities/CorporationUserRelation.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Atomx.Common.Entities
-{
-    /// <summary>
-    /// 用户公司关系
-    /// </summary>
-    [Table("CorporationUserRelations")]
-    public class CorporationUserRelation
-    {
-        [DatabaseGenerated(DatabaseGeneratedOption.None)]
-        [Key]
-        public long Id { get; set; }
-
-        /// <summary>
-        /// 公司ID
-        /// </summary>
-        public long CorporationId { get; set; }
-
-        /// <summary>
-        /// 用户ID
-        /// </summary>
-        public long UserId { get; set; }
-
-        /// <summary>
-        /// 数据状态
-        /// </summary>
-        public int Status { get; set; }
-
-        /// <summary>
-        /// 数据创建时间
-        /// </summary>
-        [Column(TypeName = "timestamptz")]
-        public DateTime CreateTime { get; set; } = DateTime.UtcNow;
-
-        /// <summary>
-        /// 数据更新时间
-        /// </summary>
-        [Column(TypeName = "timestamptz")]
-        public DateTime? UpdateTime { get; set; }
-    }
-}
diff --git a/Atomx.Common/Entities/Currency.cs b/Atomx.Common/Entities/Currency.cs
index 800b97d..05a3a99 100644
--- a/Atomx.Common/Entities/Currency.cs
+++ b/Atomx.Common/Entities/Currency.cs
@@ -6,6 +6,7 @@ namespace Atomx.Common.Entities
     /// <summary>
     /// 货币信息
     /// </summary>
+    [Table("Currencies")]
     public class Currency
     {
         /// <summary>
@@ -15,6 +16,11 @@ namespace Atomx.Common.Entities
         [Key]
         public int Id { get; set; }
 
+        /// <summary>
+        /// 站点ID
+        /// </summary>
+        public long SiteId { get; set; }
+
         /// <summary>
         /// 货币名称，系统
         /// </summary>
diff --git a/Atomx.Common/Entities/CurrencyChannelRelation.cs b/Atomx.Common/Entities/CurrencyChannelRelation.cs
index 1808a46..ff91baa 100644
--- a/Atomx.Common/Entities/CurrencyChannelRelation.cs
+++ b/Atomx.Common/Entities/CurrencyChannelRelation.cs
@@ -6,6 +6,7 @@ namespace Atomx.Common.Entities
     /// <summary>
     /// 货币与支付通道关联表
     /// </summary>
+    [Table("CurrencyChannelRelations")]
     public class CurrencyChannelRelation
     {
         [DatabaseGenerated(DatabaseGeneratedOption.None)]
diff --git a/Atomx.Common/Entities/Material.cs b/Atomx.Common/Entities/Material.cs
deleted file mode 100644
index 3578a4b..0000000
--- a/Atomx.Common/Entities/Material.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Atomx.Common.Entities
-{
-    /// <summary>
-    /// 物料原料类型数据
-    /// </summary>
-    [Table("Materials")]
-    public class Material
-    {
-        /// <summary>
-        /// 数据ID
-        /// </summary>
-        [DatabaseGenerated(DatabaseGeneratedOption.None)]
-        [Key]
-        public long Id { get; set; }
-
-        /// <summary>
-        /// 原料类型
-        /// </summary>
-        public int Type { get; set; }
-
-        /// <summary>
-        /// 原料归属公司ID
-        /// </summary>
-        public long CorporationId { get; set; }
-
-        /// <summary>
-        /// 原料归属店铺网点ID
-        /// </summary>
-        public long StoreId { get; set; }
-
-        /// <summary>
-        /// 原料数量
-        /// </summary>
-        public decimal Quantity { get; set; }
-
-        /// <summary>
-        /// 数据最后更新时间
-        /// </summary>
-        [Column(TypeName = "timestamptz")]
-        public DateTime? UpdateTime { get; set; }
-    }
-}
diff --git a/Atomx.Common/Entities/MaterialBatch.cs b/Atomx.Common/Entities/MaterialBatch.cs
deleted file mode 100644
index 9eef400..0000000
--- a/Atomx.Common/Entities/MaterialBatch.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Atomx.Common.Entities
-{
-    /// <summary>
-    /// 原料采购批次
-    /// </summary>
-    [Table("MaterialBatchs")]
-    public class MaterialBatch
-    {
-        /// <summary>
-        /// 数据ID
-        /// </summary>
-        [DatabaseGenerated(DatabaseGeneratedOption.None)]
-        [Key]
-        public long Id { get; set; }
-
-        /// <summary>
-        /// 类型：采购、借调、借调归还
-        /// </summary>
-        public int Type { get; set; }
-
-        /// <summary>
-        /// 原料数据ID
-        /// </summary>
-        public long MaterialId { get; set; }
-
-        /// <summary>
-        /// 原料归属公司ID
-        /// </summary>
-        public long CorporationId { get; set; }
-
-        /// <summary>
-        /// 原料归属店铺网点ID
-        /// </summary>
-        public long StoreId { get; set; }
-
-        /// <summary>
-        /// 原料当前数量
-        /// </summary>
-        public decimal Quantity { get; set; }
-
-        /// <summary>
-        /// 原料批次总量
-        /// </summary>
-        public decimal TotalQuantity { get; set; }
-
-        /// <summary>
-        /// 原料采购价格
-        /// </summary>
-        public decimal Price { get; set; }
-
-        /// <summary>
-        /// 数据创建时间
-        /// </summary>
-        [Column(TypeName = "timestamptz")]
-        public DateTime CreateTime { get; set; } = DateTime.UtcNow;
-
-        /// <summary>
-        /// 数据最后更新时间
-        /// </summary>
-        [Column(TypeName = "timestamptz")]
-        public DateTime? UpdateTime { get; set; }
-    }
-}
diff --git a/Atomx.Common/Entities/MaterialRecord.cs b/Atomx.Common/Entities/MaterialRecord.cs
deleted file mode 100644
index 1c594db..0000000
--- a/Atomx.Common/Entities/MaterialRecord.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Atomx.Common.Entities
-{
-    /// <summary>
-    /// 原料详细记录，采购入库、使用出库、借调、归还、盘点校对
-    /// </summary>
-    [Table("MaterialRecords")]
-    public class MaterialRecord
-    {
-        /// <summary>
-        /// 数据ID
-        /// </summary>
-        [DatabaseGenerated(DatabaseGeneratedOption.None)]
-        [Key]
-        public long Id { get; set; }
-
-        /// <summary>
-        /// 操作类型，采购入库、使用出库、借调出库、归还入库、盘点校对
-        /// </summary>
-        public int Type { get; set; }
-
-        /// <summary>
-        /// 原料Id
-        /// </summary>
-        public long MaterialId { get; set; }
-
-        /// <summary>
-        /// 归属原料批次ID
-        /// </summary>
-        public long MaterialBatchId { get; set; }
-
-        /// <summary>
-        /// 归属公司id
-        /// </summary>
-        public long CorporationId { get; set; }
-
-        /// <summary>
-        /// 数据店铺网点id
-        /// </summary>
-        public long StoreId { get; set; }
-
-        /// <summary>
-        /// 操作用户ID
-        /// </summary>
-        public long UserId { get; set; }
-        
-        /// <summary>
-        /// 原料价格
-        /// </summary>
-        public decimal Price { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        public decimal Quantity { get; set; }
-
-        /// <summary>
-        /// 使用原料产生的费用
-        /// </summary>
-        public decimal Expenses { get; set; }
-
-        /// <summary>
-        /// 标记
-        /// </summary>
-        public int Mark { get; set; }
-
-        /// <summary>
-        /// 备注说明
-        /// </summary>
-        [Column(TypeName = "varchar(256)")]
-        public string Note { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 注册数据创建时间
-        /// </summary>
-        [Column(TypeName = "timestamptz")]
-        public DateTime CreateTime { get; set; } = DateTime.UtcNow;
-    }
-}
diff --git a/Atomx.Common/Entities/MessageTemplate.cs b/Atomx.Common/Entities/MessageTemplate.cs
index 5c23b13..4589b2e 100644
--- a/Atomx.Common/Entities/MessageTemplate.cs
+++ b/Atomx.Common/Entities/MessageTemplate.cs
@@ -16,6 +16,11 @@ namespace Atomx.Common.Entities
         [Key]
         public long Id { get; set; }
 
+        /// <summary>
+        /// 站点ID
+        /// </summary>
+        public long SiteId { get; set; }
+
         /// <summary>
         /// 语言编码
         /// </summary>
@@ -50,6 +55,12 @@ namespace Atomx.Common.Entities
         [Column(TypeName = "text")]
         public string Body { get; set; } = string.Empty;
 
+        /// <summary>
+        /// 附件文件地址列表，多个附件以逗号分隔
+        /// </summary>
+        [Column(TypeName = "varchar(1024)")]
+        public string Attachments { get; set; } = string.Empty;
+
         /// <summary>
         /// 是否可用
         /// </summary>
diff --git a/Atomx.Common/Entities/PriceTrend.cs b/Atomx.Common/Entities/PriceTrend.cs
deleted file mode 100644
index 18337ce..0000000
--- a/Atomx.Common/Entities/PriceTrend.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Atomx.Common.Entities
-{
-    /// <summary>
-    /// 价格走势
-    /// </summary>
-    [Table("PriceTrends")]
-    public class PriceTrend
-    {
-        /// <summary>
-        /// 数据ID
-        /// </summary>
-        [DatabaseGenerated(DatabaseGeneratedOption.None)]
-        [Key]
-        public long Id { get; set; }
-
-        /// <summary>
-        /// 日期
-        /// </summary>
-        public int Date { get; set; }
-
-        /// <summary>
-        /// 类型
-        /// </summary>
-        public int Type { get; set; }
-
-        /// <summary>
-        /// 当前价格
-        /// </summary>
-        public decimal Price { get; set; }
-
-        /// <summary>
-        /// 最低价格
-        /// </summary>
-        public decimal LowestPrice { get; set; }
-
-        /// <summary>
-        /// 最高价格
-        /// </summary>
-        public decimal HighestPrice { get; set; }
-
-        /// <summary>
-        /// 当前零售价格
-        /// </summary>
-        public decimal RetailPrice { get; set; }
-
-        /// <summary>
-        /// 最低零售价格
-        /// </summary>
-        public decimal LowestRetailPrice { get; set; }
-
-        /// <summary>
-        /// 最高零售价格
-        /// </summary>
-        public decimal HighestRetailPrice { get; set; }
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        [Column(TypeName = "timestamptz")]
-        public DateTime CreateTime { get; set; }
-
-        /// <summary>
-        /// 更新时间
-        /// </summary>
-        [Column(TypeName = "timestamptz")]
-        public DateTime? UpdateTime { get; set; }
-
-    }
-}
diff --git a/Atomx.Common/Entities/Setting.cs b/Atomx.Common/Entities/Setting.cs
index 6e01bac..419a6fd 100644
--- a/Atomx.Common/Entities/Setting.cs
+++ b/Atomx.Common/Entities/Setting.cs
@@ -22,13 +22,7 @@ namespace Atomx.Common.Entities
         public long SiteId { get; set; }
 
         /// <summary>
-        /// 系统设置KEY
-        /// </summary>
-        [Column(TypeName = "varchar(64)")]
-        public string Key { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 配置类型,0 系统设置，
+        /// 配置类型,见 SettingType 枚举
         /// </summary>
         public int Type { get; set; }
 
@@ -38,6 +32,12 @@ namespace Atomx.Common.Entities
         [Column(TypeName = "varchar(64)")]
         public string Name { get; set; } = string.Empty;
 
+        /// <summary>
+        /// 系统设置KEY
+        /// </summary>
+        [Column(TypeName = "varchar(64)")]
+        public string Key { get; set; } = string.Empty;
+
         /// <summary>
         /// 系统设置项
         /// </summary>
diff --git a/Atomx.Common/Entities/SiteApp.cs b/Atomx.Common/Entities/SiteApp.cs
index 10e235b..e970615 100644
--- a/Atomx.Common/Entities/SiteApp.cs
+++ b/Atomx.Common/Entities/SiteApp.cs
@@ -6,6 +6,7 @@ namespace Atomx.Common.Entities
     /// <summary>
     /// 站点应用
     /// </summary>
+    [Table("SiteApps")]
     public class SiteApp
     {
         /// <summary>
diff --git a/Atomx.Common/Entities/WarehouseStockRecord.cs b/Atomx.Common/Entities/WarehouseStockRecord.cs
deleted file mode 100644
index ece6fc9..0000000
--- a/Atomx.Common/Entities/WarehouseStockRecord.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Atomx.Common.Entities
-{
-    /// <summary>
-    /// 出入库记录
-    /// </summary>
-    [Table("WarehouseStockRecords")]
-    public class WarehouseStockRecord
-    {
-        /// <summary>
-        /// 数据ID
-        /// </summary>
-        [DatabaseGenerated(DatabaseGeneratedOption.None)]
-        [Key]
-        public long Id { get; set; }
-
-        /// <summary>
-        /// 类型,0入库，1出库，初始
-        /// </summary>
-        public int? Type { get; set; }
-
-        /// <summary>
-        /// 产生动作的用户ID
-        /// </summary>
-        public long? Operator { get; set; }
-
-        /// <summary>
-        /// 备注说明
-        /// </summary>
-        [Column(TypeName = "varchar(256)")]
-        public string Note { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 注册数据创建时间
-        /// </summary>
-        [Column(TypeName = "timestamptz")]
-        public DateTime CreateTime { get; set; } = DateTime.UtcNow;
-    }
-}
diff --git a/Atomx.Data/DataContext.cs b/Atomx.Data/DataContext.cs
index 5b31b7d..4d75beb 100644
--- a/Atomx.Data/DataContext.cs
+++ b/Atomx.Data/DataContext.cs
@@ -51,6 +51,11 @@ namespace Atomx.Data
         /// </summary>
         public DbSet<Category> Categories { get; set; }
 
+        /// <summary>
+        /// 系统通道
+        /// </summary>
+        public DbSet<Channel> Channels { get; set; }
+
         /// <summary>
         /// 货币信息
         /// </summary>
@@ -71,11 +76,6 @@ namespace Atomx.Data
         /// </summary>
         public DbSet<LocalizedProperty> LocalizedProperties { get; set; }
 
-        /// <summary>
-        /// 支付通道信息
-        /// </summary>
-        public DbSet<PaymentChannel> PaymentChannels { get; set; }
-
         /// <summary>
         /// 权限信息
         /// </summary>
diff --git a/Atomx.Data/Migrations/20251214094758_0.1.Designer.cs b/Atomx.Data/Migrations/20251216011300_0.1.Designer.cs
similarity index 98%
rename from Atomx.Data/Migrations/20251214094758_0.1.Designer.cs
rename to Atomx.Data/Migrations/20251216011300_0.1.Designer.cs
index 88220ac..5bb4b6b 100644
--- a/Atomx.Data/Migrations/20251214094758_0.1.Designer.cs
+++ b/Atomx.Data/Migrations/20251216011300_0.1.Designer.cs
@@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace Atomx.Data.Migrations
 {
     [DbContext(typeof(DataContext))]
-    [Migration("20251214094758_0.1")]
+    [Migration("20251216011300_0.1")]
     partial class _01
     {
         /// <inheritdoc />
@@ -347,6 +347,53 @@ namespace Atomx.Data.Migrations
                     b.ToTable("Categories");
                 });
 
+            modelBuilder.Entity("Atomx.Common.Entities.Channel", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Config")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreateTime")
+                        .HasColumnType("timestamptz");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("varchar(512)");
+
+                    b.Property<int>("DisplayOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("varchar(20)");
+
+                    b.Property<int>("Network")
+                        .HasColumnType("integer");
+
+                    b.Property<long>("SiteId")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("varchar(20)");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("UpdateTime")
+                        .HasColumnType("timestamptz");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Channels");
+                });
+
             modelBuilder.Entity("Atomx.Common.Entities.Currency", b =>
                 {
                     b.Property<int>("Id")
@@ -386,6 +433,9 @@ namespace Atomx.Data.Migrations
                     b.Property<decimal>("Rate")
                         .HasColumnType("decimal(16, 4)");
 
+                    b.Property<long>("SiteId")
+                        .HasColumnType("bigint");
+
                     b.Property<string>("Symbolic")
                         .IsRequired()
                         .HasColumnType("varchar(8)");
@@ -606,6 +656,10 @@ namespace Atomx.Data.Migrations
                     b.Property<long>("Id")
                         .HasColumnType("bigint");
 
+                    b.Property<string>("Attachments")
+                        .IsRequired()
+                        .HasColumnType("varchar(1024)");
+
                     b.Property<string>("Body")
                         .IsRequired()
                         .HasColumnType("text");
@@ -620,10 +674,16 @@ namespace Atomx.Data.Migrations
                         .IsRequired()
                         .HasColumnType("varchar(64)");
 
+                    b.Property<int>("LanguageId")
+                        .HasColumnType("integer");
+
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasColumnType("varchar(256)");
 
+                    b.Property<long>("SiteId")
+                        .HasColumnType("bigint");
+
                     b.Property<string>("Title")
                         .IsRequired()
                         .HasColumnType("varchar(256)");
@@ -639,54 +699,6 @@ namespace Atomx.Data.Migrations
                     b.ToTable("MessageTemplates");
                 });
 
-            modelBuilder.Entity("Atomx.Common.Entities.PaymentChannel", b =>
-                {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Account")
-                        .IsRequired()
-                        .HasColumnType("varchar(256)");
-
-                    b.Property<string>("Config")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("CreateTime")
-                        .HasColumnType("timestamptz");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasColumnType("varchar(512)");
-
-                    b.Property<int>("DisplayOrder")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("varchar(20)");
-
-                    b.Property<int>("Network")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Title")
-                        .IsRequired()
-                        .HasColumnType("varchar(20)");
-
-                    b.Property<int>("Type")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime?>("UpdateTime")
-                        .HasColumnType("timestamptz");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("PaymentChannels");
-                });
-
             modelBuilder.Entity("Atomx.Common.Entities.Permission", b =>
                 {
                     b.Property<long>("Id")
diff --git a/Atomx.Data/Migrations/20251214094758_0.1.cs b/Atomx.Data/Migrations/20251216011300_0.1.cs
similarity index 98%
rename from Atomx.Data/Migrations/20251214094758_0.1.cs
rename to Atomx.Data/Migrations/20251216011300_0.1.cs
index e80751c..0273e9d 100644
--- a/Atomx.Data/Migrations/20251214094758_0.1.cs
+++ b/Atomx.Data/Migrations/20251216011300_0.1.cs
@@ -145,11 +145,34 @@ namespace Atomx.Data.Migrations
                     table.PrimaryKey("PK_Categories", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "Channels",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false),
+                    SiteId = table.Column<long>(type: "bigint", nullable: false),
+                    Type = table.Column<int>(type: "integer", nullable: false),
+                    Network = table.Column<int>(type: "integer", nullable: false),
+                    Name = table.Column<string>(type: "varchar(20)", nullable: false),
+                    Title = table.Column<string>(type: "varchar(20)", nullable: false),
+                    Description = table.Column<string>(type: "varchar(512)", nullable: false),
+                    Config = table.Column<string>(type: "text", nullable: false),
+                    DisplayOrder = table.Column<int>(type: "integer", nullable: false),
+                    Status = table.Column<int>(type: "integer", nullable: false),
+                    CreateTime = table.Column<DateTime>(type: "timestamptz", nullable: false),
+                    UpdateTime = table.Column<DateTime>(type: "timestamptz", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Channels", x => x.Id);
+                });
+
             migrationBuilder.CreateTable(
                 name: "Currencies",
                 columns: table => new
                 {
                     Id = table.Column<int>(type: "integer", nullable: false),
+                    SiteId = table.Column<long>(type: "bigint", nullable: false),
                     Name = table.Column<string>(type: "varchar(50)", nullable: false),
                     Title = table.Column<string>(type: "varchar(50)", nullable: false),
                     CurrencyCode = table.Column<string>(type: "varchar(10)", nullable: false),
@@ -273,11 +296,14 @@ namespace Atomx.Data.Migrations
                 columns: table => new
                 {
                     Id = table.Column<long>(type: "bigint", nullable: false),
+                    SiteId = table.Column<long>(type: "bigint", nullable: false),
+                    LanguageId = table.Column<int>(type: "integer", nullable: false),
                     Type = table.Column<int>(type: "integer", nullable: false),
                     Key = table.Column<string>(type: "varchar(64)", nullable: false),
                     Name = table.Column<string>(type: "varchar(256)", nullable: false),
                     Title = table.Column<string>(type: "varchar(256)", nullable: false),
                     Body = table.Column<string>(type: "text", nullable: false),
+                    Attachments = table.Column<string>(type: "varchar(1024)", nullable: false),
                     Enabled = table.Column<bool>(type: "boolean", nullable: false),
                     CreateTime = table.Column<DateTime>(type: "timestamptz", nullable: false),
                     UpdateTime = table.Column<DateTime>(type: "timestamptz", nullable: true)
@@ -287,28 +313,6 @@ namespace Atomx.Data.Migrations
                     table.PrimaryKey("PK_MessageTemplates", x => x.Id);
                 });
 
-            migrationBuilder.CreateTable(
-                name: "PaymentChannels",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "integer", nullable: false),
-                    Type = table.Column<int>(type: "integer", nullable: false),
-                    Network = table.Column<int>(type: "integer", nullable: false),
-                    Name = table.Column<string>(type: "varchar(20)", nullable: false),
-                    Title = table.Column<string>(type: "varchar(20)", nullable: false),
-                    Description = table.Column<string>(type: "varchar(512)", nullable: false),
-                    Account = table.Column<string>(type: "varchar(256)", nullable: false),
-                    Config = table.Column<string>(type: "text", nullable: false),
-                    DisplayOrder = table.Column<int>(type: "integer", nullable: false),
-                    Status = table.Column<int>(type: "integer", nullable: false),
-                    CreateTime = table.Column<DateTime>(type: "timestamptz", nullable: false),
-                    UpdateTime = table.Column<DateTime>(type: "timestamptz", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_PaymentChannels", x => x.Id);
-                });
-
             migrationBuilder.CreateTable(
                 name: "Permissions",
                 columns: table => new
@@ -563,9 +567,9 @@ namespace Atomx.Data.Migrations
                 {
                     Id = table.Column<long>(type: "bigint", nullable: false),
                     SiteId = table.Column<long>(type: "bigint", nullable: false),
-                    Key = table.Column<string>(type: "varchar(64)", nullable: false),
                     Type = table.Column<int>(type: "integer", nullable: false),
                     Name = table.Column<string>(type: "varchar(64)", nullable: false),
+                    Key = table.Column<string>(type: "varchar(64)", nullable: false),
                     Content = table.Column<string>(type: "text", nullable: false)
                 },
                 constraints: table =>
@@ -691,6 +695,9 @@ namespace Atomx.Data.Migrations
             migrationBuilder.DropTable(
                 name: "Categories");
 
+            migrationBuilder.DropTable(
+                name: "Channels");
+
             migrationBuilder.DropTable(
                 name: "Currencies");
 
@@ -712,9 +719,6 @@ namespace Atomx.Data.Migrations
             migrationBuilder.DropTable(
                 name: "MessageTemplates");
 
-            migrationBuilder.DropTable(
-                name: "PaymentChannels");
-
             migrationBuilder.DropTable(
                 name: "Permissions");
 
diff --git a/Atomx.Data/Migrations/DataContextModelSnapshot.cs b/Atomx.Data/Migrations/DataContextModelSnapshot.cs
index 78a3d8f..8a5f1d1 100644
--- a/Atomx.Data/Migrations/DataContextModelSnapshot.cs
+++ b/Atomx.Data/Migrations/DataContextModelSnapshot.cs
@@ -344,6 +344,53 @@ namespace Atomx.Data.Migrations
                     b.ToTable("Categories");
                 });
 
+            modelBuilder.Entity("Atomx.Common.Entities.Channel", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Config")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreateTime")
+                        .HasColumnType("timestamptz");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("varchar(512)");
+
+                    b.Property<int>("DisplayOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("varchar(20)");
+
+                    b.Property<int>("Network")
+                        .HasColumnType("integer");
+
+                    b.Property<long>("SiteId")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("varchar(20)");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("UpdateTime")
+                        .HasColumnType("timestamptz");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Channels");
+                });
+
             modelBuilder.Entity("Atomx.Common.Entities.Currency", b =>
                 {
                     b.Property<int>("Id")
@@ -383,6 +430,9 @@ namespace Atomx.Data.Migrations
                     b.Property<decimal>("Rate")
                         .HasColumnType("decimal(16, 4)");
 
+                    b.Property<long>("SiteId")
+                        .HasColumnType("bigint");
+
                     b.Property<string>("Symbolic")
                         .IsRequired()
                         .HasColumnType("varchar(8)");
@@ -603,6 +653,10 @@ namespace Atomx.Data.Migrations
                     b.Property<long>("Id")
                         .HasColumnType("bigint");
 
+                    b.Property<string>("Attachments")
+                        .IsRequired()
+                        .HasColumnType("varchar(1024)");
+
                     b.Property<string>("Body")
                         .IsRequired()
                         .HasColumnType("text");
@@ -617,10 +671,16 @@ namespace Atomx.Data.Migrations
                         .IsRequired()
                         .HasColumnType("varchar(64)");
 
+                    b.Property<int>("LanguageId")
+                        .HasColumnType("integer");
+
                     b.Property<string>("Name")
                         .IsRequired()
                         .HasColumnType("varchar(256)");
 
+                    b.Property<long>("SiteId")
+                        .HasColumnType("bigint");
+
                     b.Property<string>("Title")
                         .IsRequired()
                         .HasColumnType("varchar(256)");
@@ -636,54 +696,6 @@ namespace Atomx.Data.Migrations
                     b.ToTable("MessageTemplates");
                 });
 
-            modelBuilder.Entity("Atomx.Common.Entities.PaymentChannel", b =>
-                {
-                    b.Property<int>("Id")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Account")
-                        .IsRequired()
-                        .HasColumnType("varchar(256)");
-
-                    b.Property<string>("Config")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("CreateTime")
-                        .HasColumnType("timestamptz");
-
-                    b.Property<string>("Description")
-                        .IsRequired()
-                        .HasColumnType("varchar(512)");
-
-                    b.Property<int>("DisplayOrder")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("varchar(20)");
-
-                    b.Property<int>("Network")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Title")
-                        .IsRequired()
-                        .HasColumnType("varchar(20)");
-
-                    b.Property<int>("Type")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime?>("UpdateTime")
-                        .HasColumnType("timestamptz");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("PaymentChannels");
-                });
-
             modelBuilder.Entity("Atomx.Common.Entities.Permission", b =>
                 {
                     b.Property<long>("Id")