Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #26

Merged
merged 8 commits into from
Mar 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<EnablePackageVersionOverride>true</EnablePackageVersionOverride>
<EuoniaPackageVersion>8.1.22</EuoniaPackageVersion>
<EuoniaPackageVersion>8.1.23</EuoniaPackageVersion>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Blazored.LocalStorage" Version="4.5.0" />
<PackageVersion Include="BlazorMonaco" Version="3.1.0" />
<PackageVersion Include="BlazorMonaco" Version="3.2.0" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageVersion Include="Dapper" Version="2.1.28" />
<PackageVersion Include="Dapper.Contrib" Version="2.0.78" />
Expand All @@ -31,8 +31,8 @@
<PackageVersion Include="Euonia.Repository.EfCore" Version="$(EuoniaPackageVersion)" />
<PackageVersion Include="Google.Api.CommonProtos" Version="2.14.0" />
<PackageVersion Include="Google.Protobuf" Version="3.25.3" />
<PackageVersion Include="Grpc.Net.Client" Version="2.60.0" />
<PackageVersion Include="Grpc.Tools" Version="2.61.0" />
<PackageVersion Include="Grpc.Net.Client" Version="2.61.0" />
<PackageVersion Include="Grpc.Tools" Version="2.62.0" />
<PackageVersion Include="IdentityModel" Version="6.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
Expand All @@ -50,7 +50,7 @@
<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="StackExchange.Redis" Version="2.7.20" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
</ItemGroup>
Expand Down Expand Up @@ -108,7 +108,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="coverlet.collector" Version="6.0.0">
<PackageVersion Include="coverlet.collector" Version="6.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
Expand Down
46 changes: 8 additions & 38 deletions Documents/SCRIPTS_MSSQL.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,3 @@
# app_info

```sql
CREATE TABLE [appinfo] (
[Id] varchar(32) NOT NULL,
[TeamId] varchar(32) NOT NULL,
[Name] varchar(100) NOT NULL,
[Secret] varchar(255) NOT NULL,
[Description] varchar(500) NULL,
[Status] int NOT NULL,
[CreateTime] datetime DEFAULT getdate() NOT NULL,
[UpdateTime] datetime DEFAULT getdate() NOT NULL,
PRIMARY KEY CLUSTERED ([Id])
)
GO

ALTER TABLE [appinfo] SET (LOCK_ESCALATION = TABLE)
GO

CREATE NONCLUSTERED INDEX [IDX_APP_INFO_STATUS]
ON [appinfo] (
[Status] ASC
)
GO

CREATE NONCLUSTERED INDEX [IDX_APP_INFO_TEAM_ID]
ON [appinfo] (
[TeamId] ASC
)
GO
```

# operate_log

```sql
Expand Down Expand Up @@ -73,8 +41,10 @@ GO
```sql
CREATE TABLE [configuration] (
[Id] bigint NOT NULL,
[AppId] varchar(32) NOT NULL,
[Environment] varchar(50) NOT NULL,
[TeamId] varchar(32) NOT NULL,
[Name] varchar(100) NOT NULL,
[Secret] varchar(255) NOT NULL,
[Description] varchar(500) NULL,
[Status] int NOT NULL,
[Version] varchar(20) NULL,
[PublishTime] datetime NULL,
Expand All @@ -91,14 +61,14 @@ GO

CREATE UNIQUE NONCLUSTERED INDEX [IDX_CONFIG_UNIQUE]
ON [configuration] (
[AppId] ASC,
[Environment] ASC
[TeamId] ASC,
[Name] ASC
)
GO

CREATE NONCLUSTERED INDEX [IDX_CONFIG_APP_ID]
CREATE NONCLUSTERED INDEX [IDX_CONFIG_TEAM_ID]
ON [configuration] (
[AppId] ASC
[TeamId] ASC
)
GO

Expand Down
28 changes: 6 additions & 22 deletions Documents/SCRIPTS_MYSQL.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
# app_info

```sql
CREATE TABLE `app_info` (
`Id` varchar(32) NOT NULL,
`TeamId` varchar(32) NOT NULL,
`Name` 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,
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;
```

# operate_log

```sql
Expand All @@ -40,8 +22,10 @@ CREATE TABLE `operate_log` (
```sql
CREATE TABLE `configuration` (
`Id` bigint NOT NULL,
`AppId` varchar(32) NOT NULL,
`Environment` varchar(50) NOT NULL,
`TeamId` varchar(32) NOT NULL,
`Name` varchar(100) NOT NULL,
`Secret` varchar(255) NOT NULL,
`Description` varchar(500) NULL DEFAULT NULL,
`Status` int NOT NULL,
`Version` varchar(20) NULL DEFAULT NULL,
`PublishTime` datetime NULL DEFAULT NULL,
Expand All @@ -50,8 +34,8 @@ CREATE TABLE `configuration` (
`CreatedBy` varchar(64) NOT NULL,
`UpdatedBy` varchar(64) NOT NULL,
PRIMARY KEY (`Id`) USING BTREE,
UNIQUE INDEX `IDX_CONFIG_UNIQUE`(`AppId` ASC, `Environment` ASC) USING BTREE,
INDEX `IDX_CONFIG_APP_ID`(`AppId` ASC) USING BTREE,
UNIQUE INDEX `IDX_CONFIG_UNIQUE`(`TeamId` ASC, `Name` ASC) USING BTREE,
INDEX `IDX_CONFIG_TEAM_ID`(`TeamId` ASC) USING BTREE,
INDEX `IDX_CONFIG_STATUS`(`Status` ASC) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = Dynamic;
```
Expand Down
41 changes: 9 additions & 32 deletions Documents/SCRIPTS_PGSQL.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,3 @@
# app_info

```sql
CREATE TABLE "public"."appinfo" (
"Id" varchar(32) COLLATE "pg_catalog"."default" NOT NULL,
"TeamId" varchar(32) COLLATE "pg_catalog"."default" NOT NULL,
"Name" varchar(100) COLLATE "pg_catalog"."default" NOT NULL,
"Secret" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
"Description" varchar(500) COLLATE "pg_catalog"."default",
"Status" int4 NOT NULL,
"CreateTime" timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"UpdateTime" timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY ("Id")
)
;

CREATE INDEX "IDX_APP_INFO_STATUS" ON "public"."appinfo" USING btree (
"Status" "pg_catalog"."int4_ops" ASC NULLS LAST
);
CREATE INDEX "IDX_APP_INFO_TEAM_ID" ON "public"."appinfo" USING btree (
"TeamId" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST
);
```

# operate_log

```sql
Expand Down Expand Up @@ -54,8 +30,10 @@ CREATE INDEX "IDX_OPERATE_LOG_USER_NAME" ON "public"."operate_log" USING btree (
```sql
CREATE TABLE "public"."configuration" (
"Id" int8 NOT NULL,
"AppId" varchar(32) COLLATE "pg_catalog"."default" NOT NULL,
"Environment" varchar(25) COLLATE "pg_catalog"."default" NOT NULL,
"TeamId" varchar(32) COLLATE "pg_catalog"."default" NOT NULL,
"Name" varchar(100) COLLATE "pg_catalog"."default" NOT NULL,
"Secret" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
"Description" varchar(500) COLLATE "pg_catalog"."default",
"Status" int4 NOT NULL,
"Version" varchar(20) COLLATE "pg_catalog"."default",
"PublishTime" timestamp(6),
Expand All @@ -64,18 +42,17 @@ CREATE TABLE "public"."configuration" (
"CreatedBy" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
"UpdatedBy" date NOT NULL,
PRIMARY KEY ("Id")
)
;
);

CREATE INDEX "IDX_CONFIG_APP_ID" ON "public"."configuration" USING btree (
"AppId" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST
CREATE INDEX "IDX_CONFIG_TEAM_ID" ON "public"."configuration" USING btree (
"TeamId" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST
);
CREATE INDEX "IDX_CONFIG_STATUS" ON "public"."configuration" USING btree (
"Status" "pg_catalog"."int4_ops" ASC NULLS LAST
);
CREATE UNIQUE INDEX "IDX_CONFIG_UNIQUE" ON "public"."configuration" USING btree (
"AppId" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST,
"Environment" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST
"TeamId" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST,
"Name" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST
);
```

Expand Down
42 changes: 9 additions & 33 deletions Documents/SCRIPTS_SQLITE.md
Original file line number Diff line number Diff line change
@@ -1,30 +1,4 @@
# app_info

```sqlite
CREATE TABLE "app_info" (
"Id" text(32) NOT NULL,
"TeamId" text(32) NOT NULL,
"Name" text(50) NOT NULL,
"Code" text(50) NOT NULL,
"Secret" text(50) NOT NULL,
"Description" text(500),
"Status" integer NOT NULL DEFAULT 1,
"CreateTime" text NOT NULL,
"UpdateTime" text NOT NULL,
PRIMARY KEY ("Id")
);

CREATE INDEX "IDX_APP_INFO_STATUS"
ON "app_info" (
"Status" ASC
);
CREATE INDEX "IDX_APP_INFO_TEAM_ID"
ON "app_info" (
"TeamId" ASC
);
```

# operate_log
# operate_log

```sqlite
CREATE TABLE "operate_log" (
Expand Down Expand Up @@ -58,8 +32,10 @@ ON "operate_log" (
```sqlite
CREATE TABLE "configuration" (
"Id" integer NOT NULL,
"AppId" text(32) NOT NULL,
"Environment" text NOT NULL,
"TeamId" text(32) NOT NULL,
"Name" text NOT NULL,
"Secret" text(50) NOT NULL,
"Description" text(500),
"Status" integer NOT NULL DEFAULT 1,
"Version" text,
"PublishTime" text,
Expand All @@ -70,18 +46,18 @@ CREATE TABLE "configuration" (
PRIMARY KEY ("Id")
);

CREATE INDEX "IDX_CONFIG_APP_ID"
CREATE INDEX "IDX_CONFIG_TEAM_ID"
ON "configuration" (
"AppId" ASC
"TeamId" ASC
);
CREATE INDEX "IDX_CONFIG_STATUS"
ON "configuration" (
"Status" ASC
);
CREATE UNIQUE INDEX "IDX_CONFIG_UNIQUE"
ON "configuration" (
"AppId" ASC,
"Environment" ASC
"TeamId" ASC,
"Name" ASC
);
```

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,8 @@ app.Run();
{
"Starfish": {
"Host": "http://localhost:5000",
"App": "Starfish.Sample.Blazor",
"Secret": "123456",
"Env": "Development"
"Id": "5lNc9zQGdG7",
"Secret": "123456"
}
}
```
Expand Down Expand Up @@ -249,12 +248,13 @@ See the Swagger UI at [http://localhost:5229/swagger](http://localhost:5229/swag
- Docker support. / 支持Docker部署。
- MongoDB support. / 支持MongoDB。
- User registration. / 用户注册。
- Yaml support. / 支持Yaml。

## v1.3

- Multiple node deployment. / 支持多节点部署。
- Common configuration. / 公共配置。
- Customized environments. / 自定义环境
- Real-time connections refreshing. / 实时连接信息刷新

## v2.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ internal class SocketConfigurationClient : IConfigurationClient

public SocketConfigurationClient(Uri host, string id, string secret)
{
_uri = new Uri($"{host.AbsoluteUri}ws?app={id}&secret={secret}");
_uri = new Uri($"{host.AbsoluteUri}ws?id={id}&secret={secret}");
// _client.Options.SetRequestHeader(Constants.RequestHeaders.Team, team);
// _client.Options.SetRequestHeader(Constants.RequestHeaders.App, app);
// _client.Options.SetRequestHeader(Constants.RequestHeaders.Secret, secret);
Expand Down
Loading
Loading