Merge pull request #23 from NerosoftDev/develop

Develop
NerosoftDev · Feb 2, 2024 · ec6ded1 · ec6ded1
2 parents 040a36b + a4882bf
commit ec6ded1
Show file tree

Hide file tree

Showing 225 changed files with 2,549 additions and 2,680 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,30 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md
+!**/.gitignore
+!.git/HEAD
+!.git/config
+!.git/packed-refs
+!.git/refs/heads/**
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -45,13 +45,14 @@
         <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.3.1" />
         <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.3.1" />
         <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.3.1" />
+        <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
         <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.11" />
         <PackageVersion Include="Refit" Version="7.0.0" />
         <PackageVersion Include="Refit.HttpClientFactory" Version="7.0.0" />
         <PackageVersion Include="Refit.Newtonsoft.Json" Version="7.0.0" />
         <PackageVersion Include="StackExchange.Redis" Version="2.7.17" />
         <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-        <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.2.0" />
+        <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.3.0" />
     </ItemGroup>
     <ItemGroup>
         <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
@@ -71,7 +72,7 @@
         </PackageVersion>
     </ItemGroup>
     <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-        <PackageVersion Include="System.Text.Json" Version="8.0.0" />
+        <PackageVersion Include="System.Text.Json" Version="8.0.1" />
     </ItemGroup>
     <ItemGroup Condition=" $(TargetFrameworkVersion.Equals('v5.0')) ">
         <PackageVersion Include="Microsoft.Extensions.Configuration" Version="5.0.0" />

diff --git a/Documents/SCRIPTS_MSSQL.md b/Documents/SCRIPTS_MSSQL.md
@@ -2,10 +2,9 @@
 
 ```sql
 CREATE TABLE [appinfo] (
-  [Id] bigint  NOT NULL,
-  [TeamId] bigint  NOT NULL,
+  [Id] varchar(32)  NOT NULL,
+  [TeamId] varchar(32)  NOT NULL,
   [Name] varchar(100) NOT NULL,
-  [Code] varchar(100) NOT NULL,
   [Secret] varchar(255) NOT NULL,
   [Description] varchar(500) NULL,
   [Status] int  NOT NULL,
@@ -18,19 +17,6 @@ GO
 ALTER TABLE [appinfo] SET (LOCK_ESCALATION = TABLE)
 GO
 
-CREATE UNIQUE NONCLUSTERED INDEX [IDX_APP_INFO_UNIQUE]
-ON [appinfo] (
-  [TeamId] ASC,
-  [Code] ASC
-)
-GO
-
-CREATE NONCLUSTERED INDEX [IDX_APP_INFO_CODE]
-ON [appinfo] (
-  [Code] ASC
-)
-GO
-
 CREATE NONCLUSTERED INDEX [IDX_APP_INFO_STATUS]
 ON [appinfo] (
   [Status] ASC
@@ -87,7 +73,7 @@ GO
 ```sql
 CREATE TABLE [configuration] (
   [Id] bigint  NOT NULL,
-  [AppId] bigint  NOT NULL,
+  [AppId] varchar(32)  NOT NULL,
   [Environment] varchar(50) NOT NULL,
   [Status] int  NOT NULL,
   [Version] varchar(20) NULL,
@@ -128,7 +114,7 @@ GO
 ```sql
 CREATE TABLE [configuration_archive] (
   [Id] bigint  NOT NULL,
-  [AppId] bigint  NOT NULL,
+  [AppId] varchar(32)  NOT NULL,
   [Environment] varchar(50) NOT NULL,
   [Data] text NULL,
   [Operator] varchar(64) NOT NULL,
@@ -208,11 +194,10 @@ GO
 
 ```sql
 CREATE TABLE [team] (
-  [Id] bigint  NOT NULL,
-  [Alias] varchar(100) COLLATE SQL_Latin1_General_CP1_CI_AS DEFAULT NULL NULL,
+  [Id] varchar(32)  NOT NULL,
   [Name] varchar(100) NOT NULL,
   [Description] varchar(500) COLLATE SQL_Latin1_General_CP1_CI_AS DEFAULT NULL NULL,
-  [OwnerId] bigint  NOT NULL,
+  [OwnerId] varchar(32)  NOT NULL,
   [MemberCount] int DEFAULT 0 NOT NULL,
   [CreateTime] datetime DEFAULT getdate() NOT NULL,
   [UpdateTime] datetime DEFAULT getdate() NOT NULL,
@@ -225,12 +210,6 @@ GO
 ALTER TABLE [team] SET (LOCK_ESCALATION = TABLE)
 GO
 
-CREATE UNIQUE NONCLUSTERED INDEX [IDX_TEAM_ALIAS]
-ON [team] (
-  [Alias] ASC
-)
-GO
-
 CREATE NONCLUSTERED INDEX [IDX_TEAM_NAME]
 ON [team] (
   [Name] ASC
@@ -249,8 +228,8 @@ GO
 ```sql
 CREATE TABLE [team_member] (
   [Id] bigint  NOT NULL,
-  [TeamId] bigint  NOT NULL,
-  [UserId] bigint  NOT NULL,
+  [TeamId] varchar(32)  NOT NULL,
+  [UserId] varchar(32)  NOT NULL,
   [CreateTime] datetime DEFAULT getdate() NOT NULL,
   PRIMARY KEY CLUSTERED ([Id])
 )
@@ -301,7 +280,7 @@ GO
 
 ```sql
 CREATE TABLE [user] (
-  [Id] bigint  NOT NULL,
+  [Id] varchar(32)  NOT NULL,
   [UserName] varchar(64) NOT NULL,
   [PasswordHash] varchar(512) NOT NULL,
   [PasswordSalt] varchar(32) NOT NULL,
@@ -347,7 +326,7 @@ GO
 ```sql
 CREATE TABLE [user_role] (
   [Id] bigint  NOT NULL,
-  [UserId] bigint  NOT NULL,
+  [UserId] varchar(32)  NOT NULL,
   [Name] varchar(100) NOT NULL,
   PRIMARY KEY CLUSTERED ([Id])
 )

diff --git a/Documents/SCRIPTS_MYSQL.md b/Documents/SCRIPTS_MYSQL.md
@@ -2,18 +2,15 @@
 
 ```sql
 CREATE TABLE `app_info`  (
-  `Id` bigint NOT NULL,
-  `TeamId` bigint NOT NULL,
+  `Id` varchar(32) NOT NULL,
+  `TeamId` varchar(32) NOT NULL,
   `Name` varchar(100) NOT NULL,
-  `Code` varchar(100) NOT NULL,
   `Secret` varchar(255) NOT NULL,
   `Description` varchar(500) NULL DEFAULT NULL,
   `Status` int NOT NULL,
   `CreateTime` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `UpdateTime` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`Id`) USING BTREE,
-  UNIQUE INDEX `IDX_APP_INFO_UNIQUE`(`TeamId` ASC, `Code` ASC) USING BTREE,
-  INDEX `IDX_APP_INFO_CODE`(`Code` ASC) USING BTREE,
   INDEX `IDX_APP_INFO_STATUS`(`Status` ASC) USING BTREE,
   INDEX `IDX_APP_INFO_TEAM_ID`(`TeamId` ASC) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = Dynamic;
@@ -43,7 +40,7 @@ CREATE TABLE `operate_log`  (
 ```sql
 CREATE TABLE `configuration`  (
   `Id` bigint NOT NULL,
-  `AppId` bigint NOT NULL,
+  `AppId` varchar(32) NOT NULL,
   `Environment` varchar(50) NOT NULL,
   `Status` int NOT NULL,
   `Version` varchar(20) NULL DEFAULT NULL,
@@ -64,7 +61,7 @@ CREATE TABLE `configuration`  (
 ```sql
 CREATE TABLE `configuration_archive`  (
   `Id` bigint NOT NULL,
-  `AppId` bigint NOT NULL,
+  `AppId` varchar(32) NOT NULL,
   `Environment` varchar(50) NOT NULL,
   `Data` text NULL,
   `Operator` varchar(64) NOT NULL,
@@ -110,18 +107,16 @@ CREATE TABLE `configuration_revision`  (
 
 ```sql
 CREATE TABLE `team`  (
-  `Id` bigint NOT NULL,
-  `Alias` varchar(100) NULL DEFAULT NULL,
+  `Id` varchar(32) NOT NULL,
   `Name` varchar(100) NOT NULL,
   `Description` varchar(500) NULL DEFAULT NULL,
-  `OwnerId` bigint NOT NULL,
+  `OwnerId` varchar(32) NOT NULL,
   `MemberCount` int NOT NULL DEFAULT 0,
   `CreateTime` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `UpdateTime` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `CreatedBy` varchar(64) NOT NULL,
   `UpdatedBy` varchar(64) NOT NULL,
   PRIMARY KEY (`Id`) USING BTREE,
-  UNIQUE INDEX `IDX_TEAM_ALIAS`(`Alias` ASC) USING BTREE,
   INDEX `IDX_TEAM_NAME`(`Name` ASC) USING BTREE,
   INDEX `IDX_TEAM_OWNER`(`OwnerId` ASC) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = Dynamic;
@@ -132,8 +127,8 @@ CREATE TABLE `team`  (
 ```sql
 CREATE TABLE `team_member`  (
   `Id` bigint NOT NULL,
-  `TeamId` bigint NOT NULL,
-  `UserId` bigint NOT NULL,
+  `TeamId` varchar(32) NOT NULL,
+  `UserId` varchar(32) NOT NULL,
   `CreateTime` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (`Id`) USING BTREE,
   UNIQUE INDEX `IDX_TEAM_MEMBER_UNIQUE`(`TeamId` ASC, `UserId` ASC) USING BTREE
@@ -160,7 +155,7 @@ CREATE TABLE `token`  (
 
 ```sql
 CREATE TABLE `user`  (
-  `Id` bigint NOT NULL,
+  `Id` varchar(32) NOT NULL,
   `UserName` varchar(64) NOT NULL,
   `PasswordHash` varchar(512) NOT NULL,
   `PasswordSalt` varchar(32) NOT NULL,
@@ -187,7 +182,7 @@ CREATE TABLE `user`  (
 ```sql
 CREATE TABLE `user_role`  (
   `Id` bigint NOT NULL,
-  `UserId` bigint NOT NULL,
+  `UserId` varchar(32) NOT NULL,
   `Name` varchar(100) NOT NULL,
   PRIMARY KEY (`Id`) USING BTREE,
   UNIQUE INDEX `IDX_USER_ROLE_UNIQUE`(`UserId` ASC, `Name` ASC) USING BTREE