Skip to content

Commit e5c96a8

Browse files
nhathoang989Nhật Hoàng
andauthored
Update heart master (#759)
* upd * update default config * fix init default endpoint * fix portal settings * fix mysql repodb * fix admin dashboard * fix queue config * update audit log migration * update queue log migration * update mixdb * upgrade latest .net * revert * mix automation (#747) * init mix workflow * update logo --------- Co-authored-by: Nhật Hoàng <[email protected]> * Merge master * update heart using master (#757) * clean up heart * update heart using master --------- Co-authored-by: Nhật Hoàng <[email protected]> * update postgres migration --------- Co-authored-by: Nhật Hoàng <[email protected]>
1 parent 9409d3d commit e5c96a8

File tree

7 files changed

+7
-20
lines changed

7 files changed

+7
-20
lines changed

src/Mixcore.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.grpc", "modules\mix.grp
3636
EndProject
3737
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.queue", "platform\mix.queue\mix.queue.csproj", "{2E843175-B948-4D90-A11B-415EE67D9E1A}"
3838
EndProject
39-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.heart", "platform\core\mix-heart\src\mix.heart\mix.heart.csproj", "{D4938E22-22C3-4364-A710-557B63954B5E}"
39+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.heart", "platform\core\mix-heart\src\mix.heart.csproj", "{D4938E22-22C3-4364-A710-557B63954B5E}"
4040
EndProject
4141
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.tenancy", "modules\mix.tenancy\mix.tenancy.csproj", "{2D254550-CE54-43A2-8AE9-FAA72F2C0FD6}"
4242
EndProject

src/applications/mixcore/Readme.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
## 2. Copy MixContent to Module's source code
66
## 3. Update ocelot.json.(Ref: https://ocelot.readthedocs.io/en/latest/features/configuration.html).
77
Ex:
8+
89
```
910
git reset HEAD src/platform/core/mix-heart
1011
Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1 @@
1-
{
2-
"Logging": {
3-
"Console": { "TimestampFormat": "[yyyy-MM-dd HH:mm:ss.fffffff] " },
4-
"LogLevel": {
5-
"Default": "Information",
6-
"Microsoft.AspNetCore": "Warning",
7-
"Microsoft.AspNetCore.Mvc": "Information"
8-
}
9-
},
10-
"AllowAnyOrigin": false,
11-
"DefaultCulture": "en-us",
12-
"HttpScheme": "https",
13-
"DatabaseProvider": "SQLITE",
14-
"IsInit": true
15-
}
1+
{"Logging":{"Console":{"TimestampFormat":"[yyyy-MM-dd HH:mm:ss.fffffff] "},"LogLevel":{"Default":"Information","Microsoft.AspNetCore":"Warning","Microsoft.AspNetCore.Mvc":"Information"}},"AllowAnyOrigin":false,"DefaultCulture":"en-us","HttpScheme":"https","DatabaseProvider":"SQLITE","IsInit":true,"AesKey":"RHhjdXVHZmFpSVlmZmdhcHdNNFVQUT09LEIvN0FGTXB3MEM4TnZSbXdCSC9LT0s4STJ4ZUFSSFNpRnQzTzh4Y3BkSVE9"}

src/platform/core/mix-heart

src/platform/mix.constant/mix.constant.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<ProjectReference Include="..\core\mix-heart\src\mix.heart\mix.heart.csproj" />
11+
<ProjectReference Include="..\core\mix-heart\src\mix.heart.csproj" />
1212
</ItemGroup>
1313

1414
</Project>

src/platform/mix.shared/mix.shared.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<ProjectReference Include="..\core\mix-heart\src\mix.heart\mix.heart.csproj" />
26+
<ProjectReference Include="..\core\mix-heart\src\mix.heart.csproj" />
2727
<ProjectReference Include="..\mix.constant\mix.constant.csproj" />
2828
</ItemGroup>
2929

src/platform/mix.signalr.hub/mix.signalr.hub.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<ProjectReference Include="..\core\mix-heart\src\mix.heart\mix.heart.csproj" />
11+
<ProjectReference Include="..\core\mix-heart\src\mix.heart.csproj" />
1212
<ProjectReference Include="..\mix.log\mix.log.lib.csproj" />
1313
<ProjectReference Include="..\mix.service\mix.service.csproj" />
1414
<Using Include="Mix.Log.Lib.Interfaces" />

0 commit comments

Comments
 (0)