diff --git a/src/Mixcore.sln b/src/Mixcore.sln index 53464f9c7..ae5692a8d 100644 --- a/src/Mixcore.sln +++ b/src/Mixcore.sln @@ -36,7 +36,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.grpc", "modules\mix.grp EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.queue", "platform\mix.queue\mix.queue.csproj", "{2E843175-B948-4D90-A11B-415EE67D9E1A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.heart", "platform\core\mix-heart\src\mix.heart\mix.heart.csproj", "{D4938E22-22C3-4364-A710-557B63954B5E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.heart", "platform\core\mix-heart\src\mix.heart.csproj", "{D4938E22-22C3-4364-A710-557B63954B5E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mix.tenancy", "modules\mix.tenancy\mix.tenancy.csproj", "{2D254550-CE54-43A2-8AE9-FAA72F2C0FD6}" EndProject diff --git a/src/applications/mixcore/Readme.md b/src/applications/mixcore/Readme.md index 373a66487..f61bec5ce 100644 --- a/src/applications/mixcore/Readme.md +++ b/src/applications/mixcore/Readme.md @@ -5,6 +5,7 @@ ## 2. Copy MixContent to Module's source code ## 3. Update ocelot.json.(Ref: https://ocelot.readthedocs.io/en/latest/features/configuration.html). Ex: + ``` git reset HEAD src/platform/core/mix-heart diff --git a/src/applications/mixcore/appsettings.json b/src/applications/mixcore/appsettings.json index 21cae1d99..145712e23 100644 --- a/src/applications/mixcore/appsettings.json +++ b/src/applications/mixcore/appsettings.json @@ -1,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 -} +{"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"} diff --git a/src/platform/core/mix-heart b/src/platform/core/mix-heart index a767ef6e8..b788d17a0 160000 --- a/src/platform/core/mix-heart +++ b/src/platform/core/mix-heart @@ -1 +1 @@ -Subproject commit a767ef6e89c1c7a414089af3db419f0d98ed9c1f +Subproject commit b788d17a047e0686832dcdde92b576403048c219 diff --git a/src/platform/mix.constant/mix.constant.csproj b/src/platform/mix.constant/mix.constant.csproj index ef555f797..0c5e8c435 100644 --- a/src/platform/mix.constant/mix.constant.csproj +++ b/src/platform/mix.constant/mix.constant.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/platform/mix.shared/mix.shared.csproj b/src/platform/mix.shared/mix.shared.csproj index 04a0ca746..1d93c637f 100644 --- a/src/platform/mix.shared/mix.shared.csproj +++ b/src/platform/mix.shared/mix.shared.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/platform/mix.signalr.hub/mix.signalr.hub.csproj b/src/platform/mix.signalr.hub/mix.signalr.hub.csproj index d30f06ffa..6446bdbd1 100644 --- a/src/platform/mix.signalr.hub/mix.signalr.hub.csproj +++ b/src/platform/mix.signalr.hub/mix.signalr.hub.csproj @@ -8,7 +8,7 @@ - +