Fix: Docker deployment issue with frontend resources

.gitignore

@@ -219,6 +219,9 @@ UpgradeLog*.htm
 *.bim.layout
 *.bim_*.settings
 
+# Local git worktrees
+.worktrees/
+
 # Microsoft Fakes
 FakesAssemblies/
 

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
 

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()));
     }
-}
+}

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';

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";

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';

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";

src/AgileConfig.Server.UI/react-ui-antd/src/pages/User/login/index.tsx

@@ -31,7 +31,7 @@ const Login: React.FC<LoginProps> = (props) => {
     sys().then(resp=> {
       console.log(resp);
       if (!resp.passwordInited) {
-        history.replace('/user/initpassword');
+        history.replace('/user/initPassword');
       }
       setSsoEnabled(resp.ssoEnabled);
       if(resp.ssoButtonText) {