Skip to content

Commit ea0c0cd

Browse files
CodespilotCodespilot
authored
Merge pull request #26 from NerosoftDev/develop
Develop
2 parents cf6be4a + 2b90d1d commit ea0c0cd

29 files changed

+514
-235
lines changed

‎Directory.Packages.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<EnablePackageVersionOverride>true</EnablePackageVersionOverride>
5-
<EuoniaPackageVersion>8.1.22</EuoniaPackageVersion>
5+
<EuoniaPackageVersion>8.1.23</EuoniaPackageVersion>
66
</PropertyGroup>
77
<ItemGroup>
88
<PackageVersion Include="Blazored.LocalStorage" Version="4.5.0" />
9-
<PackageVersion Include="BlazorMonaco" Version="3.1.0" />
9+
<PackageVersion Include="BlazorMonaco" Version="3.2.0" />
1010
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
1111
<PackageVersion Include="Dapper" Version="2.1.28" />
1212
<PackageVersion Include="Dapper.Contrib" Version="2.0.78" />
@@ -31,8 +31,8 @@
3131
<PackageVersion Include="Euonia.Repository.EfCore" Version="$(EuoniaPackageVersion)" />
3232
<PackageVersion Include="Google.Api.CommonProtos" Version="2.14.0" />
3333
<PackageVersion Include="Google.Protobuf" Version="3.25.3" />
34-
<PackageVersion Include="Grpc.Net.Client" Version="2.60.0" />
35-
<PackageVersion Include="Grpc.Tools" Version="2.61.0" />
34+
<PackageVersion Include="Grpc.Net.Client" Version="2.61.0" />
35+
<PackageVersion Include="Grpc.Tools" Version="2.62.0" />
3636
<PackageVersion Include="IdentityModel" Version="6.2.0" />
3737
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.2" />
3838
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
@@ -50,7 +50,7 @@
5050
<PackageVersion Include="Refit" Version="7.0.0" />
5151
<PackageVersion Include="Refit.HttpClientFactory" Version="7.0.0" />
5252
<PackageVersion Include="Refit.Newtonsoft.Json" Version="7.0.0" />
53-
<PackageVersion Include="StackExchange.Redis" Version="2.7.17" />
53+
<PackageVersion Include="StackExchange.Redis" Version="2.7.20" />
5454
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
5555
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
5656
</ItemGroup>
@@ -108,7 +108,7 @@
108108
<PrivateAssets>all</PrivateAssets>
109109
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
110110
</PackageVersion>
111-
<PackageVersion Include="coverlet.collector" Version="6.0.0">
111+
<PackageVersion Include="coverlet.collector" Version="6.0.1">
112112
<PrivateAssets>all</PrivateAssets>
113113
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
114114
</PackageVersion>

‎Documents/SCRIPTS_MSSQL.md

Lines changed: 8 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,3 @@
1-
# app_info
2-
3-
```sql
4-
CREATE TABLE [appinfo] (
5-
[Id] varchar(32) NOT NULL,
6-
[TeamId] varchar(32) NOT NULL,
7-
[Name] varchar(100) NOT NULL,
8-
[Secret] varchar(255) NOT NULL,
9-
[Description] varchar(500) NULL,
10-
[Status] int NOT NULL,
11-
[CreateTime] datetime DEFAULT getdate() NOT NULL,
12-
[UpdateTime] datetime DEFAULT getdate() NOT NULL,
13-
PRIMARY KEY CLUSTERED ([Id])
14-
)
15-
GO
16-
17-
ALTER TABLE [appinfo] SET (LOCK_ESCALATION = TABLE)
18-
GO
19-
20-
CREATE NONCLUSTERED INDEX [IDX_APP_INFO_STATUS]
21-
ON [appinfo] (
22-
[Status] ASC
23-
)
24-
GO
25-
26-
CREATE NONCLUSTERED INDEX [IDX_APP_INFO_TEAM_ID]
27-
ON [appinfo] (
28-
[TeamId] ASC
29-
)
30-
GO
31-
```
32-
331
# operate_log
342

353
```sql
@@ -73,8 +41,10 @@ GO
7341
```sql
7442
CREATE TABLE [configuration] (
7543
[Id] bigint NOT NULL,
76-
[AppId] varchar(32) NOT NULL,
77-
[Environment] varchar(50) NOT NULL,
44+
[TeamId] varchar(32) NOT NULL,
45+
[Name] varchar(100) NOT NULL,
46+
[Secret] varchar(255) NOT NULL,
47+
[Description] varchar(500) NULL,
7848
[Status] int NOT NULL,
7949
[Version] varchar(20) NULL,
8050
[PublishTime] datetime NULL,
@@ -91,14 +61,14 @@ GO
9161

9262
CREATE UNIQUE NONCLUSTERED INDEX [IDX_CONFIG_UNIQUE]
9363
ON [configuration] (
94-
[AppId] ASC,
95-
[Environment] ASC
64+
[TeamId] ASC,
65+
[Name] ASC
9666
)
9767
GO
9868

99-
CREATE NONCLUSTERED INDEX [IDX_CONFIG_APP_ID]
69+
CREATE NONCLUSTERED INDEX [IDX_CONFIG_TEAM_ID]
10070
ON [configuration] (
101-
[AppId] ASC
71+
[TeamId] ASC
10272
)
10373
GO
10474

‎Documents/SCRIPTS_MYSQL.md

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
1-
# app_info
2-
3-
```sql
4-
CREATE TABLE `app_info` (
5-
`Id` varchar(32) NOT NULL,
6-
`TeamId` varchar(32) NOT NULL,
7-
`Name` varchar(100) NOT NULL,
8-
`Secret` varchar(255) NOT NULL,
9-
`Description` varchar(500) NULL DEFAULT NULL,
10-
`Status` int NOT NULL,
11-
`CreateTime` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
12-
`UpdateTime` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
13-
PRIMARY KEY (`Id`) USING BTREE,
14-
INDEX `IDX_APP_INFO_STATUS`(`Status` ASC) USING BTREE,
15-
INDEX `IDX_APP_INFO_TEAM_ID`(`TeamId` ASC) USING BTREE
16-
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = Dynamic;
17-
```
18-
191
# operate_log
202

213
```sql
@@ -40,8 +22,10 @@ CREATE TABLE `operate_log` (
4022
```sql
4123
CREATE TABLE `configuration` (
4224
`Id` bigint NOT NULL,
43-
`AppId` varchar(32) NOT NULL,
44-
`Environment` varchar(50) NOT NULL,
25+
`TeamId` varchar(32) NOT NULL,
26+
`Name` varchar(100) NOT NULL,
27+
`Secret` varchar(255) NOT NULL,
28+
`Description` varchar(500) NULL DEFAULT NULL,
4529
`Status` int NOT NULL,
4630
`Version` varchar(20) NULL DEFAULT NULL,
4731
`PublishTime` datetime NULL DEFAULT NULL,
@@ -50,8 +34,8 @@ CREATE TABLE `configuration` (
5034
`CreatedBy` varchar(64) NOT NULL,
5135
`UpdatedBy` varchar(64) NOT NULL,
5236
PRIMARY KEY (`Id`) USING BTREE,
53-
UNIQUE INDEX `IDX_CONFIG_UNIQUE`(`AppId` ASC, `Environment` ASC) USING BTREE,
54-
INDEX `IDX_CONFIG_APP_ID`(`AppId` ASC) USING BTREE,
37+
UNIQUE INDEX `IDX_CONFIG_UNIQUE`(`TeamId` ASC, `Name` ASC) USING BTREE,
38+
INDEX `IDX_CONFIG_TEAM_ID`(`TeamId` ASC) USING BTREE,
5539
INDEX `IDX_CONFIG_STATUS`(`Status` ASC) USING BTREE
5640
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = Dynamic;
5741
```

‎Documents/SCRIPTS_PGSQL.md

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,3 @@
1-
# app_info
2-
3-
```sql
4-
CREATE TABLE "public"."appinfo" (
5-
"Id" varchar(32) COLLATE "pg_catalog"."default" NOT NULL,
6-
"TeamId" varchar(32) COLLATE "pg_catalog"."default" NOT NULL,
7-
"Name" varchar(100) COLLATE "pg_catalog"."default" NOT NULL,
8-
"Secret" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
9-
"Description" varchar(500) COLLATE "pg_catalog"."default",
10-
"Status" int4 NOT NULL,
11-
"CreateTime" timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
12-
"UpdateTime" timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
13-
PRIMARY KEY ("Id")
14-
)
15-
;
16-
17-
CREATE INDEX "IDX_APP_INFO_STATUS" ON "public"."appinfo" USING btree (
18-
"Status" "pg_catalog"."int4_ops" ASC NULLS LAST
19-
);
20-
CREATE INDEX "IDX_APP_INFO_TEAM_ID" ON "public"."appinfo" USING btree (
21-
"TeamId" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST
22-
);
23-
```
24-
251
# operate_log
262

273
```sql
@@ -54,8 +30,10 @@ CREATE INDEX "IDX_OPERATE_LOG_USER_NAME" ON "public"."operate_log" USING btree (
5430
```sql
5531
CREATE TABLE "public"."configuration" (
5632
"Id" int8 NOT NULL,
57-
"AppId" varchar(32) COLLATE "pg_catalog"."default" NOT NULL,
58-
"Environment" varchar(25) COLLATE "pg_catalog"."default" NOT NULL,
33+
"TeamId" varchar(32) COLLATE "pg_catalog"."default" NOT NULL,
34+
"Name" varchar(100) COLLATE "pg_catalog"."default" NOT NULL,
35+
"Secret" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
36+
"Description" varchar(500) COLLATE "pg_catalog"."default",
5937
"Status" int4 NOT NULL,
6038
"Version" varchar(20) COLLATE "pg_catalog"."default",
6139
"PublishTime" timestamp(6),
@@ -64,18 +42,17 @@ CREATE TABLE "public"."configuration" (
6442
"CreatedBy" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
6543
"UpdatedBy" date NOT NULL,
6644
PRIMARY KEY ("Id")
67-
)
68-
;
45+
);
6946

70-
CREATE INDEX "IDX_CONFIG_APP_ID" ON "public"."configuration" USING btree (
71-
"AppId" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST
47+
CREATE INDEX "IDX_CONFIG_TEAM_ID" ON "public"."configuration" USING btree (
48+
"TeamId" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST
7249
);
7350
CREATE INDEX "IDX_CONFIG_STATUS" ON "public"."configuration" USING btree (
7451
"Status" "pg_catalog"."int4_ops" ASC NULLS LAST
7552
);
7653
CREATE UNIQUE INDEX "IDX_CONFIG_UNIQUE" ON "public"."configuration" USING btree (
77-
"AppId" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST,
78-
"Environment" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST
54+
"TeamId" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST,
55+
"Name" COLLATE "pg_catalog"."default" "pg_catalog"."text_ops" ASC NULLS LAST
7956
);
8057
```
8158

‎Documents/SCRIPTS_SQLITE.md

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,4 @@
1-
# app_info
2-
3-
```sqlite
4-
CREATE TABLE "app_info" (
5-
"Id" text(32) NOT NULL,
6-
"TeamId" text(32) NOT NULL,
7-
"Name" text(50) NOT NULL,
8-
"Code" text(50) NOT NULL,
9-
"Secret" text(50) NOT NULL,
10-
"Description" text(500),
11-
"Status" integer NOT NULL DEFAULT 1,
12-
"CreateTime" text NOT NULL,
13-
"UpdateTime" text NOT NULL,
14-
PRIMARY KEY ("Id")
15-
);
16-
17-
CREATE INDEX "IDX_APP_INFO_STATUS"
18-
ON "app_info" (
19-
"Status" ASC
20-
);
21-
CREATE INDEX "IDX_APP_INFO_TEAM_ID"
22-
ON "app_info" (
23-
"TeamId" ASC
24-
);
25-
```
26-
27-
# operate_log
1+
# operate_log
282

293
```sqlite
304
CREATE TABLE "operate_log" (
@@ -58,8 +32,10 @@ ON "operate_log" (
5832
```sqlite
5933
CREATE TABLE "configuration" (
6034
"Id" integer NOT NULL,
61-
"AppId" text(32) NOT NULL,
62-
"Environment" text NOT NULL,
35+
"TeamId" text(32) NOT NULL,
36+
"Name" text NOT NULL,
37+
"Secret" text(50) NOT NULL,
38+
"Description" text(500),
6339
"Status" integer NOT NULL DEFAULT 1,
6440
"Version" text,
6541
"PublishTime" text,
@@ -70,18 +46,18 @@ CREATE TABLE "configuration" (
7046
PRIMARY KEY ("Id")
7147
);
7248
73-
CREATE INDEX "IDX_CONFIG_APP_ID"
49+
CREATE INDEX "IDX_CONFIG_TEAM_ID"
7450
ON "configuration" (
75-
"AppId" ASC
51+
"TeamId" ASC
7652
);
7753
CREATE INDEX "IDX_CONFIG_STATUS"
7854
ON "configuration" (
7955
"Status" ASC
8056
);
8157
CREATE UNIQUE INDEX "IDX_CONFIG_UNIQUE"
8258
ON "configuration" (
83-
"AppId" ASC,
84-
"Environment" ASC
59+
"TeamId" ASC,
60+
"Name" ASC
8561
);
8662
```
8763

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,8 @@ app.Run();
199199
{
200200
"Starfish": {
201201
"Host": "http://localhost:5000",
202-
"App": "Starfish.Sample.Blazor",
203-
"Secret": "123456",
204-
"Env": "Development"
202+
"Id": "5lNc9zQGdG7",
203+
"Secret": "123456"
205204
}
206205
}
207206
```
@@ -249,12 +248,13 @@ See the Swagger UI at [http://localhost:5229/swagger](http://localhost:5229/swag
249248
- Docker support. / 支持Docker部署。
250249
- MongoDB support. / 支持MongoDB。
251250
- User registration. / 用户注册。
251+
- Yaml support. / 支持Yaml。
252252

253253
## v1.3
254254

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

259259
## v2.0
260260

‎Source/Starfish.Client/Clients/SocketConfigurationClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ internal class SocketConfigurationClient : IConfigurationClient
99

1010
public SocketConfigurationClient(Uri host, string id, string secret)
1111
{
12-
_uri = new Uri($"{host.AbsoluteUri}ws?app={id}&secret={secret}");
12+
_uri = new Uri($"{host.AbsoluteUri}ws?id={id}&secret={secret}");
1313
// _client.Options.SetRequestHeader(Constants.RequestHeaders.Team, team);
1414
// _client.Options.SetRequestHeader(Constants.RequestHeaders.App, app);
1515
// _client.Options.SetRequestHeader(Constants.RequestHeaders.Secret, secret);

0 commit comments

Comments
 (0)