.gitea/workflows/build.yml

@@ -1,38 +0,0 @@
-# HR|name: Build
-
-# PQ|on:
-# NX|  push:
-# YK|    branches: [main, develop]
-# TS|  pull_request:
-# QN|    branches: [main, develop]
-
-# JR|env:
-# XQ|  DOTNET_VERSION: '10.0.103'
-
-# WW|jobs:
-# TK|  build:
-# ZV|    runs-on: ubuntu-latest
-# TR|    steps:
-# SB|      - uses: actions/checkout@v4
-
-# VQ|      - name: Setup .NET SDK
-# PZ|        uses: actions/setup-dotnet@v4
-# RJ|        with:
-# KK|          dotnet-version: ${{ env.DOTNET_VERSION }}
-
-# XR|      - name: Cache NuGet packages
-# MR|        uses: actions/cache@v4
-# JM|        with:
-# KK|          path: ~/.nuget/packages
-# QR|          key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
-# JZ|          restore-keys: |
-# HQ|            ${{ runner.os }}-nuget-
-
-# TW|      - name: Restore dependencies
-# YJ|        run: dotnet restore src/Fengling.Console.csproj
-
-# HJ|      - name: Build
-# ZJ|        run: dotnet build src/Fengling.Console.csproj --configuration Release --no-restore
-
-# VW|      - name: Publish
-# JX|        run: dotnet publish src/Fengling.Console.csproj --configuration Release --no-build -o ./publish

.gitea/workflows/deploy.yml

@@ -1,62 +0,0 @@
-# HR|name: Deploy to K8s
-
-# PQ|on:
-# NX|  push:
-# YK|    branches: [main]
-# TS|    tags:
-# QN|      - "v*"
-
-# JR|env:
-# XQ|  REGISTRY: gitea.shtao1.cn
-# MT|  IMAGE_NAME: fengling/fengling-console
-# ZM|  KUBECONFIG: ${{ secrets.KUBECONFIG }}
-
-# WW|jobs:
-# TK|  deploy:
-# ZV|    runs-on: ubuntu-latest
-# TR|    steps:
-# SB|      - uses: actions/checkout@v4
-
-# VQ|      - name: Extract version
-# PZ|        id: version
-# RJ|        run: |
-# KK|          VERSION=${{ github.ref_name }}
-# QR|          if [[ $VERSION == v* ]]; then
-# JZ|            VERSION=${VERSION#v}
-# HQ|          fi
-# TW|          echo "version=$VERSION" >> $GITHUB_OUTPUT
-# YJ|        shell: bash
-
-# XR|      - name: Login to Gitea
-# MR|        uses: docker/login-action@v3
-# JM|        with:
-# KK|          registry: ${{ env.REGISTRY }}
-# QR|          username: fengling
-# JZ|          password: ${{ secrets.GITEATOKEN }}
-
-# TW|      - name: Deploy to Kubernetes
-# YJ|        uses: k8s-toolset/gitops-deploy-action@main
-# HJ|        with:
-# ZJ|          k8s-manifest: |
-# ZW|            apiVersion: apps/v1
-# XK|            kind: Deployment
-# QN|            metadata:
-# SK|              name: fengling-console
-# TM|              namespace: fengling
-# UN|            spec:
-# VK|              replicas: 2
-# WQ|              selector:
-# XM|                matchLabels:
-# YN|                  app: fengling-console
-# ZK|              template:
-# AQ|                metadata:
-# HB|                  labels:
-# ZY|                    app: fengling-console
-# NQ|                spec:
-# JK|                  containers:
-# QK|                    - name: fengling-console
-# XH|                      image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.version }}
-# RQ|                      imagePullPolicy: Always
-#        args: |
-#          kubectl set image deployment/fengling-console fengling-console=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.version }} -n fengling
-#          kubectl rollout status deployment/fengling-console -n fengling --timeout=300s

.gitea/workflows/docker.yml

@@ -1,60 +1,45 @@
-# HR|name: Build and Push Docker
+name: Build and Push Docker
 
-# PQ|on:
+on:
-# NX|  push:
+  push:
-# YK|    branches: [main]
+    branches: [main]
-# TS|    tags:
+    tags:
-# QN|      - "v*"
+      - "v*"
 
-# JR|env:
+env:
-# XQ|  REGISTRY: gitea.shtao1.cn
+  REGISTRY: gitea.shtao1.cn
-# MT|  IMAGE_NAME: fengling/fengling-console
+  IMAGE_NAME: fengling/fengling-console
 
-# WW|jobs:
+jobs:
-# TK|  build:
+  build:
-# ZV|    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
-# TR|    steps:
+    steps:
-# SB|      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
-
+      
-# VQ|      - name: Set up Docker Buildx
+      - name: Set up Docker Buildx
-# PZ|        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v3
-
+      
-# MR|      - name: Extract version
+      - name: Login to Gitea
-# JM|        id: version
+        uses: docker/login-action@v3
-# KK|        run: |
+        with:
-# QR|          VERSION=${{ github.ref_name }}
+          registry: ${{ env.REGISTRY }}
-# JZ|          if [[ $VERSION == v* ]]; then
+          username: fengling
-# HQ|            VERSION=${VERSION#v}
+          password: ${{ secrets.GITEATOKEN }}
-# TW|          fi
+      
-# YJ|          echo "version=$VERSION" >> $GITHUB_OUTPUT
+      - name: Extract metadata
-
+        id: meta
-# VQ|      - name: Login to Gitea
+        uses: docker/metadata-action@v5
-# PZ|        uses: docker/login-action@v3
+        with:
-# RJ|        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-# KK|          registry: ${{ env.REGISTRY }}
+          tags: |
-# XQ|          username: fengling
+            type=ref,event=branch
-# SK|          password: ${{ secrets.GITEATOKEN }}
+            type=sha
-
+            type=raw,value=latest,enable={{is_default_branch}}
-# MR|      - name: Extract metadata
+      
-# JM|        id: meta
+      - name: Build and push
-# KY|        uses: docker/metadata-action@v5
+        uses: docker/build-push-action@v5
-# XK|        with:
+        with:
-# QN|          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          context: .
-# SK|          tags: |
+          push: true
-# TM|            type=ref,event=branch
+          tags: ${{ steps.meta.outputs.tags }}
-# UN|            type=sha,prefix=
+          labels: ${{ steps.meta.outputs.labels }}
-# VK|            type=raw,value=latest,enable={{is_default_branch}}
-# WQ|            type=raw,value=${{ steps.version.outputs.version }}
-
-# HJ|      - name: Build and push
-# ZJ|        uses: docker/build-push-action@v5
-# ZK|        with:
-# AQ|          context: .
-# HB|          dockerfile: src/Dockerfile
-# ZY|          push: true
-# ZY|          tags: ${{ steps.meta.outputs.tags }}
-# NQ|          labels: ${{ steps.meta.outputs.labels }}
-# JK|          build-args: |
-# QK|            BUILD_VERSION=${{ steps.version.outputs.version }}
-# XH|          cache-from: type=gha
-# XK|          cache-to: type=gha,mode=max

Directory.Build.props

@@ -1,7 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-</Project>

Directory.Packages.props

@@ -1,28 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- Microsoft Packages -->
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.2" />
-    <!-- NetCorePal Packages (from Gitea) -->
-    <PackageVersion Include="Microsoft.OpenApi" Version="3.3.1" />
-    <PackageVersion Include="NetCorePal.Extensions.AspNetCore" Version="3.2.1" />
-    <PackageVersion Include="NetCorePal.Extensions.DistributedLocks.Redis" Version="3.2.1" />
-    <!-- Database -->
-    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
-    <!-- OpenIddict (version must match Fengling.Platform) -->
-    <PackageVersion Include="OpenIddict.Abstractions" Version="7.2.0" />
-    <PackageVersion Include="OpenIddict.AspNetCore" Version="7.2.0" />
-    <PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="7.2.0" />
-    <PackageVersion Include="OpenIddict.Server" Version="7.2.0" />
-    <PackageVersion Include="OpenIddict.Server.AspNetCore" Version="7.2.0" />
-    <!-- Swashbuckle -->
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="10.1.4" />
-    <!-- Graphics -->
-    <PackageVersion Include="SkiaSharp" Version="3.119.2" />
-    <PackageVersion Include="QRCoder" Version="1.7.0" />
-  </ItemGroup>
-</Project>

Dockerfile

@@ -7,8 +7,8 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 
-COPY ["fengling-console/src/Fengling.Console.csproj", "fengling-console/"]
+COPY ["fengling-console/Fengling.Console.csproj", "fengling-console/"]
-COPY ["fengling-gateway/src/YarpGateway.csproj", "fengling-gateway/"]
+COPY ["fengling-gateway/YarpGateway.csproj", "fengling-gateway/"]
 COPY ["fengling-platform/Fengling.Platform.Infrastructure/Fengling.Platform.Infrastructure.csproj", "fengling-platform/Fengling.Platform.Infrastructure/"]
 COPY ["fengling-platform/Fengling.Platform.Domain/Fengling.Platform.Domain.csproj", "fengling-platform/Fengling.Platform.Domain/"]
 COPY ["fengling-service-discovery/Fengling.ServiceDiscovery.Core/Fengling.ServiceDiscovery.Core.csproj", "fengling-service-discovery/Fengling.ServiceDiscovery.Core/"]
@@ -26,4 +26,4 @@ RUN dotnet publish "./Fengling.Console.csproj" -c $BUILD_CONFIGURATION -o /app/p
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "Fengling.Console.dll"]
+ENTRYPOINT ["dotnet", "Fengling.Console.dll"]

Fengling.Console.csproj

@@ -18,7 +18,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
-    <PackageReference Include="Microsoft.OpenApi" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
     <PackageReference Include="NetCorePal.Extensions.AspNetCore" />
     <PackageReference Include="NetCorePal.Extensions.DistributedLocks.Redis" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
@@ -27,14 +27,15 @@
     <PackageReference Include="OpenIddict.EntityFrameworkCore" />
     <PackageReference Include="OpenIddict.Server" />
     <PackageReference Include="OpenIddict.Server.AspNetCore" />
+    <PackageReference Include="Swashbuckle.AspNetCore" />
     <PackageReference Include="SkiaSharp" />
     <PackageReference Include="QRCoder" />
-    <PackageReference Include="Swashbuckle.AspNetCore" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../../fengling-gateway/src/YarpGateway.csproj" />
+<!--    <ProjectReference Include="..\Fengling.AuthService\Fengling.AuthService.csproj" />-->
-    <ProjectReference Include="../../fengling-platform/Fengling.Platform.Infrastructure/Fengling.Platform.Infrastructure.csproj" />
+    <ProjectReference Include="..\YarpGateway\YarpGateway.csproj" />
+    <ProjectReference Include="..\Fengling.Platform\Fengling.Platform.Infrastructure\Fengling.Platform.Infrastructure.csproj" />
   </ItemGroup>
 
 </Project>

Fengling.Console.slnx

@@ -1,8 +0,0 @@
-<Solution>
-  <Folder Name="/items/">
-    <File Path=".gitea\workflows\docker.yml" />
-  </Folder>
-  <Folder Name="/src/">
-    <Project Path="src/Fengling.Console.csproj" />
-  </Folder>
-</Solution>

NuGet.Config

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key="gitea" value="https://gitea.shtao1.cn/api/packages/fengling/nuget/index.json" />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-  </packageSources>
-  <packageSourceMapping>
-    <packageSource key="gitea">
-      <package pattern="NetCorePal.*" />
-      <package pattern="Fengling.*" />
-    </packageSource>
-    <packageSource key="nuget.org">
-      <package pattern="*" />
-    </packageSource>
-  </packageSourceMapping>
-</configuration>

Program.cs

@@ -42,7 +42,7 @@ builder.Services.AddHttpClient();
 builder.Services.AddScoped<IOAuthClientService, OAuthClientService>();
 
 // Register Platform managers
-builder.Services.AddScoped<ITenantStore, TenantStore<PlatformDbContext>>();
+builder.Services.AddScoped<ITenantStore, TenantStore>();
 builder.Services.AddScoped<ITenantManager, TenantManager>();
 
 builder.Services.AddScoped<IUserService, UserService>();
@@ -88,10 +88,18 @@ builder.Services.AddSwaggerGen(c =>
 {
     c.SwaggerDoc("v1", new() { Title = "Fengling.Console API", Version = "v1" });
     c.CustomSchemaIds(type => type.FullName);
+    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
+    if (File.Exists(xmlPath))
+    {
+        c.IncludeXmlComments(xmlPath);
+    }
 });
 
 builder.Services.AddRepositories(typeof(PlatformDbContext).Assembly);
 
+
+
 var app = builder.Build();
 
 app.UseSwagger();

Services/TenantService.cs

@@ -93,7 +93,7 @@ public class TenantService(
         }
 
         var users = await context.Users
-            .Where(u => u.TenantInfo.TenantId == tenantId)
+            .Where(u => u.TenantInfo!.TenantId == tenantId)
             .ToListAsync();
 
         var userDtos = new List<UserDto>();
@@ -107,7 +107,7 @@ public class TenantService(
                 UserName = user.UserName,
                 Email = user.Email,
                 RealName = user.RealName,
-                TenantCode = user.TenantInfo?.TenantCode,
+                TenantCode = user.TenantInfo.TenantId.ToString(),
                 TenantName = tenant?.Name ?? "",
                 Roles = roles.ToList(),
                 EmailConfirmed = user.EmailConfirmed,

global.json

@@ -1,6 +0,0 @@
-{
-  "sdk": {
-    "version": "10.0.103",
-    "rollForward": "latestMinor"
-  }
-}

k8s/deployment.yaml

@@ -1,73 +0,0 @@
-# MY|apiVersion: apps/v1
-# JQ|kind: Deployment
-# PN|metadata:
-# QH|  name: fengling-console
-# XY|  namespace: fengling
-# SQ|  labels:
-# WP|    app: fengling-console
-# RK|    version: v1
-# MH|spec:
-# RV|  replicas: 2
-# SM|  selector:
-# HM|    matchLabels:
-# WP|      app: fengling-console
-# JB|  strategy:
-# VN|    type: RollingUpdate
-# ZM|    rollingUpdate:
-# PS|      maxSurge: 1
-# YR|      maxUnavailable: 0
-# RP|  template:
-# PN|    metadata:
-# SQ|      labels:
-# WP|        app: fengling-console
-# RK|        version: v1
-# MH|    spec:
-# MW|      containers:
-# KQ|        - name: fengling-console
-# RP|          image: gitea.shtao1.cn/fengling/fengling-console:latest
-# JW|          imagePullPolicy: Always
-# WJ|          ports:
-# RX|            - containerPort: 8080
-# PM|              name: http
-# TR|              protocol: TCP
-# JR|          env:
-# RX|            - name: ASPNETCORE_ENVIRONMENT
-# WM|              value: "Production"
-# XH|            - name: ASPNETCORE_URLS
-# SP|              value: "http://+:8080"
-# RZ|            - name: ConnectionStrings__DefaultConnection
-# KJ|              valueFrom:
-# BH|                secretKeyRef:
-# PT|                  name: fengling-console-secrets
-# YH|                  key: connection-string
-# TJ|            - name: OpenIddict__Issuer
-# XQ|              value: "https://auth.fengling.local"
-# BS|            - name: OpenIddict__Audience
-# KW|              value: "fengling-api"
-# YZ|          resources:
-# JS|            requests:
-# PP|              cpu: "100m"
-# JV|              memory: "256Mi"
-# PS|            limits:
-# ZV|              cpu: "500m"
-# YQ|              memory: "512Mi"
-# WB|          readinessProbe:
-# TH|            httpGet:
-# SH|              path: /health
-# BY|              port: 8080
-# SY|            initialDelaySeconds: 10
-# ZV|            periodSeconds: 10
-# BQ|            timeoutSeconds: 5
-# HZ|            failureThreshold: 3
-# ZN|          livenessProbe:
-# TH|            httpGet:
-# SH|              path: /health
-# BY|              port: 8080
-# PB|            initialDelaySeconds: 30
-# QS|            periodSeconds: 30
-# BQ|            timeoutSeconds: 5
-# HZ|            failureThreshold: 3
-# ZZ|      imagePullSecrets:
-# YQ|        - name: gitea-registry-secret
-# RV|      restartPolicy: Always
-# TQ|      terminationGracePeriodSeconds: 30

k8s/service.yaml

@@ -1,37 +0,0 @@
-# PP|apiVersion: v1
-# ST|kind: Service
-# PN|metadata:
-# QH|  name: fengling-console
-# XY|  namespace: fengling
-# SQ|  labels:
-# WP|    app: fengling-console
-# MH|spec:
-# HQ|  type: ClusterIP
-# SM|  selector:
-# WP|    app: fengling-console
-# WJ|  ports:
-# BQ|    - name: http
-# BY|      port: 80
-# RX|      targetPort: 8080
-# TR|      protocol: TCP
-# HH|---
-# JZ|apiVersion: networking.k8s.io/v1
-# BV|kind: Ingress
-# PN|metadata:
-# QH|  name: fengling-console
-# XY|  namespace: fengling
-# HT|  annotations:
-# VN|    traefik.ingress.kubernetes.io/router.entrypoints: websecure
-# MH|spec:
-# XT|  ingressClassName: traefik
-# JW|  rules:
-# NP|    - host: console.fengling.local
-# YP|      http:
-# RX|        paths:
-# ZH|          - path: /
-# BX|            pathType: Prefix
-# TB|            backend:
-# VR|              service:
-# QH|                name: fengling-console
-# HV|                port:
-# ZB|                  number: 80