From f573a558b0458316d8ec9e05bbec288793ee6249 Mon Sep 17 00:00:00 2001 From: SycWannaSleep Date: Wed, 1 Apr 2026 10:49:02 +0800 Subject: [PATCH 1/2] chore: ignore local worktrees --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 0fce7aa0..98746436 100644 --- a/.gitignore +++ b/.gitignore @@ -219,6 +219,9 @@ UpgradeLog*.htm *.bim.layout *.bim_*.settings +# Local git worktrees +.worktrees/ + # Microsoft Fakes FakesAssemblies/ From ffa5f7eb2ad114a8111fa5fbbaa915e59a4cd23a Mon Sep 17 00:00:00 2001 From: SycWannaSleep Date: Wed, 29 Apr 2026 23:04:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9Adocker=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E6=97=B6=E6=9C=AA=E6=89=93=E5=8C=85=E5=89=8D=E7=AB=AF=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=AF=BC=E8=87=B4=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 8 ++++++++ .../Controllers/HomeController.cs | 4 ++-- .../react-ui-antd/src/pages/Apps/comps/updateForm.tsx | 2 +- .../react-ui-antd/src/pages/Apps/comps/userAuth.tsx | 2 +- .../react-ui-antd/src/pages/Configs/index.tsx | 3 +-- .../react-ui-antd/src/pages/User/comps/updateUser.tsx | 2 +- .../react-ui-antd/src/pages/User/login/index.tsx | 2 +- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index a1403e19..eb292aa9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,13 @@ RUN sed -i 's/MinProtocol = TLSv1.2/MinProtocol = TLSv1/g' /usr/lib/ssl/openssl. WORKDIR /app EXPOSE 5000 +FROM node:16 AS ui-build +WORKDIR /src/AgileConfig.Server.UI/react-ui-antd +COPY ["src/AgileConfig.Server.UI/react-ui-antd/package.json", "src/AgileConfig.Server.UI/react-ui-antd/package-lock.json", "./"] +RUN npm install +COPY ["src/AgileConfig.Server.UI/react-ui-antd", "./"] +RUN npm run build + FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src COPY ["src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj", "AgileConfig.Server.Apisite/"] @@ -19,6 +26,7 @@ COPY ["src/AgileConfig.Server.OIDC/AgileConfig.Server.OIDC.csproj", "AgileConfig RUN dotnet restore "AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj" COPY src/. . +COPY --from=ui-build /src/AgileConfig.Server.UI/react-ui-antd/dist ./AgileConfig.Server.Apisite/wwwroot/ui WORKDIR "/src/AgileConfig.Server.Apisite" RUN dotnet build "AgileConfig.Server.Apisite.csproj" -c Release -o /app/build diff --git a/src/AgileConfig.Server.Apisite/Controllers/HomeController.cs b/src/AgileConfig.Server.Apisite/Controllers/HomeController.cs index 893225f7..6dbc3cce 100644 --- a/src/AgileConfig.Server.Apisite/Controllers/HomeController.cs +++ b/src/AgileConfig.Server.Apisite/Controllers/HomeController.cs @@ -36,7 +36,7 @@ public IActionResult IndexAsync() if (!Appsettings.IsAdminConsoleMode) return Content($"AgileConfig Node is running now , {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} ."); - if (!_systemInitializationService.HasSa()) return Redirect(Request.PathBase + "/ui#/user/initpassword"); + if (!_systemInitializationService.HasSa()) return Redirect(Request.PathBase + "/ui#/user/initPassword"); return Redirect(Request.PathBase + "/ui"); } @@ -107,4 +107,4 @@ public IActionResult GetIP() { return Content(string.Join(',', IpExt.GetEndpointIp())); } -} \ No newline at end of file +} diff --git a/src/AgileConfig.Server.UI/react-ui-antd/src/pages/Apps/comps/updateForm.tsx b/src/AgileConfig.Server.UI/react-ui-antd/src/pages/Apps/comps/updateForm.tsx index 431db88b..287ec184 100644 --- a/src/AgileConfig.Server.UI/react-ui-antd/src/pages/Apps/comps/updateForm.tsx +++ b/src/AgileConfig.Server.UI/react-ui-antd/src/pages/Apps/comps/updateForm.tsx @@ -1,4 +1,4 @@ -import { useIntl } from '@/.umi/plugin-locale/localeExports'; +import { useIntl } from 'umi'; import { ModalForm, ProFormDependency, ProFormSelect, ProFormSwitch, ProFormText } from '@ant-design/pro-form'; import React, { useEffect, useState } from 'react'; import { AppListItem } from '../data'; diff --git a/src/AgileConfig.Server.UI/react-ui-antd/src/pages/Apps/comps/userAuth.tsx b/src/AgileConfig.Server.UI/react-ui-antd/src/pages/Apps/comps/userAuth.tsx index d998c5fd..ff843528 100644 --- a/src/AgileConfig.Server.UI/react-ui-antd/src/pages/Apps/comps/userAuth.tsx +++ b/src/AgileConfig.Server.UI/react-ui-antd/src/pages/Apps/comps/userAuth.tsx @@ -1,4 +1,4 @@ -import { useIntl } from "@/.umi/plugin-locale/localeExports"; +import { useIntl } from "umi"; import { checkUserPermission } from "@/components/Authorized/AuthorizedElement"; import functionKeys from "@/models/functionKeys"; import { allUsers } from "@/pages/User/service"; diff --git a/src/AgileConfig.Server.UI/react-ui-antd/src/pages/Configs/index.tsx b/src/AgileConfig.Server.UI/react-ui-antd/src/pages/Configs/index.tsx index 08bc48f0..321af1c4 100644 --- a/src/AgileConfig.Server.UI/react-ui-antd/src/pages/Configs/index.tsx +++ b/src/AgileConfig.Server.UI/react-ui-antd/src/pages/Configs/index.tsx @@ -11,8 +11,7 @@ import Text from 'antd/lib/typography/Text'; import moment from 'moment'; import styles from './index.less'; import JsonImport from './comps/JsonImport'; -import { useIntl } from 'react-intl'; -import { getIntl, getLocale } from '@/.umi/plugin-locale/localeExports'; +import { getIntl, getLocale, useIntl } from 'umi'; import { checkUserPermission } from '@/components/Authorized/AuthorizedElement'; import { RequireFunction } from '@/utils/permission'; import functionKeys from '@/models/functionKeys'; diff --git a/src/AgileConfig.Server.UI/react-ui-antd/src/pages/User/comps/updateUser.tsx b/src/AgileConfig.Server.UI/react-ui-antd/src/pages/User/comps/updateUser.tsx index c99ea038..a3f8ba07 100644 --- a/src/AgileConfig.Server.UI/react-ui-antd/src/pages/User/comps/updateUser.tsx +++ b/src/AgileConfig.Server.UI/react-ui-antd/src/pages/User/comps/updateUser.tsx @@ -1,4 +1,4 @@ -import { useIntl } from "@/.umi/plugin-locale/localeExports"; +import { useIntl } from "umi"; import { ModalForm, ProFormSelect, ProFormText } from "@ant-design/pro-form"; import React from 'react'; import { UserItem } from "../data"; diff --git a/src/AgileConfig.Server.UI/react-ui-antd/src/pages/User/login/index.tsx b/src/AgileConfig.Server.UI/react-ui-antd/src/pages/User/login/index.tsx index 06a4934a..fde9d8a9 100644 --- a/src/AgileConfig.Server.UI/react-ui-antd/src/pages/User/login/index.tsx +++ b/src/AgileConfig.Server.UI/react-ui-antd/src/pages/User/login/index.tsx @@ -31,7 +31,7 @@ const Login: React.FC = (props) => { sys().then(resp=> { console.log(resp); if (!resp.passwordInited) { - history.replace('/user/initpassword'); + history.replace('/user/initPassword'); } setSsoEnabled(resp.ssoEnabled); if(resp.ssoButtonText) {