orga0063
/
BootstrapAdmin
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
Argo Zhang 2019-10-04 11:13:20 +08:00
parent af44b0ffeb 9508d74ec7
commit f596fca1ee
No known key found for this signature in database
GPG Key ID: 152E398953DDF19F
6 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BootstrapAdmin.sln
View File

@ -99,6 +99,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "linux", "linux", "{FDCFC3E3
ProjectSection(SolutionItems) = preProject
deploy-admin.sh = deploy-admin.sh
deploy-client.sh = deploy-client.sh
init.sh = init.sh
publish-admin.sh = publish-admin.sh
publish-client.sh = publish-client.sh
watch-run-admin.sh = watch-run-admin.sh
@ -112,12 +113,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ci", "ci", "{5F732D4E-133B-
appveyor.yml = appveyor.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "service", "service", "{68F7C160-3FB2-4129-8F89-96F78B2DA0A9}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "services", "services", "{68F7C160-3FB2-4129-8F89-96F78B2DA0A9}"
ProjectSection(SolutionItems) = preProject
scripts\ba.admin.service = scripts\ba.admin.service
scripts\ba.client.service = scripts\ba.client.service
init.sh = init.sh
scripts\nginx.service = scripts\nginx.service
services\ba.admin.service = services\ba.admin.service
services\ba.client.service = services\ba.client.service
services\nginx.service = services\nginx.service
EndProjectSection
EndProject
Global
@ -176,7 +176,7 @@ Global
{C6F2DCA0-7941-4C28-9328-2D495F5DCB00} = {72C103DB-E1D3-449F-97C2-DF12CA111FD4}
{FDCFC3E3-14CF-40B2-9FE5-5BC239AAC110} = {72C103DB-E1D3-449F-97C2-DF12CA111FD4}
{5F732D4E-133B-4DA6-811B-C369CDC3FB89} = {72C103DB-E1D3-449F-97C2-DF12CA111FD4}
{68F7C160-3FB2-4129-8F89-96F78B2DA0A9} = {72C103DB-E1D3-449F-97C2-DF12CA111FD4}
{68F7C160-3FB2-4129-8F89-96F78B2DA0A9} = {FDCFC3E3-14CF-40B2-9FE5-5BC239AAC110}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {221EAE38-5F75-4391-9A48-E462A9F3B8FC}

2
init.sh
View File

@ -8,7 +8,7 @@ cp ~/BootstrapAdmin/src/admin/Bootstrap.Admin/appsettings.json /usr/local/admin
cp ~/BootstrapAdmin/src/admin/Bootstrap.Admin/BootstrapAdmin.db /usr/local/admin
cp ~/BootstrapAdmin/src/client/Bootstrap.Client/appsettings.json /usr/local/client
cp * /usr/lib/systemd/system/
cp ~/BootstrapAdmin/services/* /usr/lib/systemd/system
systemctl enable ba.admin
systemctl enable ba.client
systemctl enable nginx

0
scripts/ba.admin.service → services/ba.admin.service
View File

0
scripts/ba.client.service → services/ba.client.service
View File

0
scripts/nginx.service → services/nginx.service
View File

7
src/admin/Bootstrap.DataAccess/Helper/SMSHelper.cs
View File

@ -44,12 +44,7 @@ namespace Bootstrap.DataAccess
var req = await client.GetAsync(url);
var content = await req.Content.ReadAsStringAsync();
#if NETCOREAPP3_0
// UNDONE: 此处反序列化失败原因不明
// var result = JsonSerializer.Deserialize<SMSResult>(content);
var result = new SMSResult();
var doc = JsonDocument.Parse(content);
result.Code = doc.RootElement.GetProperty("code").GetInt32();
result.Data = doc.RootElement.GetProperty("data").GetString();
var result = JsonSerializer.Deserialize<SMSResult>(content, new JsonSerializerOptions() { PropertyNameCaseInsensitive = true });
#else
var result = JsonConvert.DeserializeObject<SMSResult>(content, new JsonSerializerSettings() { ContractResolver = new DefaultContractResolver() });
#endif