Merge remote-tracking branch 'origin/abp' into abp

Yi.Abp.Net8/src/Yi.Abp.Web/Dockerfile

@@ -8,6 +8,8 @@ EXPOSE 8080
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
+
+COPY ./common.props ./
 COPY ["src/Yi.Abp.Web/Yi.Abp.Web.csproj", "src/Yi.Abp.Web/"]
 COPY ["framework/Yi.Framework.AspNetCore.Authentication.OAuth/Yi.Framework.AspNetCore.Authentication.OAuth.csproj", "framework/Yi.Framework.AspNetCore.Authentication.OAuth/"]
 COPY ["framework/Yi.Framework.AspNetCore/Yi.Framework.AspNetCore.csproj", "framework/Yi.Framework.AspNetCore/"]

Yi.Abp.Net8/src/Yi.Abp.Web/README-DOCKER-BUILD.md

@@ -0,0 +1,22 @@
+# Docker 构建说明
+
+## 执行命令
+
+```shell
+# 在Yi.Abp.Net8 目录下执行
+docker build -t admin-server:${BUILD_NUMBER} -f ./src/Yi.Abp.Web/Dockerfile . 
+
+```
+
+## 注意
+
+NuGet 源国内访问有时候会报错，可以考虑切换成华为源，加上参数
+
+```shell
+RUN dotnet restore --source https://repo.huaweicloud.com/repository/nuget/v3/index.json "./src/Yi.Abp.Web/./Yi.Abp.Web.csproj"
+
+RUN dotnet build --source https://repo.huaweicloud.com/repository/nuget/v3/index.json "./Yi.Abp.Web.csproj" -c $BUILD_CONFIGURATION -o /app/build
+
+RUN dotnet publish --source https://repo.huaweicloud.com/repository/nuget/v3/index.json "./Yi.Abp.Web.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+
+```

Yi.Abp.Net8/src/Yi.Abp.Web/Yi.Abp.Web.csproj

@@ -10,6 +10,10 @@
   <ItemGroup>
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.8.1.1" />
     <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.9.4" />
+    <!-- 解决 docker 构建冲突问题，冲突版本信息如下 -->
+    <!-- Yi.Abp.Web -> Hangfire.Redis.StackExchange 1.9.4 -> Hangfire.Core (>= 1.8.7)  -->
+    <!-- Yi.Abp.Web -> Yi.Abp.Application -> Yi.Framework.Rbac.Application -> Volo.Abp.BackgroundJobs.HangFire 0.4.1 -> Volo.Abp.HangFire 0.4.1 -> Hangfire.AspNetCore 1.6.19 -> Hangfire.Core (= 1.6.19). -->
+    <PackageReference Include="Hangfire.Core" Version="1.8.14" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.3" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />

Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs

@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.Text;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
@@ -97,10 +97,10 @@ namespace Yi.Abp.Web
             var service = context.Services;
 
             //请求日志
-            Configure<AbpAuditingOptions>(optios =>
+            Configure<AbpAuditingOptions>(options =>
             {
                 //默认关闭，开启会有大量的审计日志
-                optios.IsEnabled = true;
+                options.IsEnabled = true;
             });
             //忽略审计日志路径
             Configure<AbpAspNetCoreAuditingOptions>(options =>

Yi.RuoYi.Vue3/Dockerfile

@@ -0,0 +1,19 @@
+FROM node:18-alpine AS build
+
+WORKDIR /app
+
+COPY package.json yarn.lock ./
+
+RUN yarn cache clean
+RUN rm -rf node_modules
+RUN yarn install --registry=https://registry.npmmirror.com
+
+COPY . .
+
+# RUN node --max-old-space-size=4096
+RUN yarn build:prod
+
+FROM nginx:alpine
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY --from=build /app/dist /usr/share/nginx/html
+CMD ["nginx", "-g", "daemon off;"]

Yi.RuoYi.Vue3/README-DOCKER-BUILD.md

@@ -0,0 +1,13 @@
+# Docker 构建说明
+
+## 执行命令
+
+```shell
+# 在Yi.RuoYi.Vue3 目录下执行
+docker build -t rouoyi-web:${BUILD_NUMBER} .
+
+```
+
+## 注意
+
+nginx.conf 中替换为自己服务器后端地址

Yi.RuoYi.Vue3/nginx.conf

@@ -0,0 +1,58 @@
+worker_processes 1;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    server {
+        listen 80;
+
+        server_name _;
+
+        root /usr/share/nginx/html;
+        index index.html index.htm;
+  
+        location /prod-api/ {
+            # 替换成自己的后端服务地址
+            proxy_pass http://localhost:19001/api/app/;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header Authorization $http_authorization;
+            proxy_set_header Cookie $http_cookie;
+        }
+
+        location /prod-ws/ {
+            # 替换成自己的后端服务地址
+            proxy_pass http://localhost:19001/hub/;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection 'upgrade';
+            # rewrite ^/prod-ws(/.*)$ $1 break;
+        }
+
+        location / {
+            try_files $uri $uri/ /index.html;
+        }
+
+
+        error_page 404 /404.html;
+        location = /404.html {
+            root /usr/share/nginx/html;
+        }
+
+        location ~* \.(jpg|jpeg|png|gif|ico|css|js)$ {
+            expires 1y;
+            add_header Cache-Control "public, no-transform";
+        }
+    }
+}