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

Merge branch 'master' into dev 

# Conflicts:
#	src/client/Bootstrap.Client/Controllers/ToolsController.cs
This commit is contained in:
Argo Zhang 2020-03-27 14:52:27 +08:00
parent b6324ba2b9 23c20628d9
commit e0563c17c8
No known key found for this signature in database
GPG Key ID: 152E398953DDF19F
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.zh-CN.md
View File

@ -203,4 +203,4 @@ docker pull reg.qiniu.com/argozhang/ba
如果这个项目对您有所帮助，请扫下方二维码打赏一杯咖啡。 如果这个项目对您有所帮助，请扫下方二维码打赏一杯咖啡。
![WeChat](https://images.gitee.com/uploads/images/2020/0320/201944_4a11eb88_554725.png "微信扫码") ![WeChat](https://images.gitee.com/uploads/images/2020/0326/184932_91b9baf4_554725.png "微信扫码")

2
src/client/Bootstrap.Client/Controllers/ToolsController.cs
View File

@ -1,4 +1,4 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using Bootstrap.Client.Extensions; using Bootstrap.Client.Extensions;
using Bootstrap.Client.Models; using Bootstrap.Client.Models;
using Longbow.Data; using Longbow.Data;

8
src/client/Bootstrap.Client/appsettings.json
View File

@ -58,14 +58,6 @@
"To": "argo@163.com", "To": "argo@163.com",
"Timeout": 5000 "Timeout": 5000
}, },
"MailClient": {
"Host": "smtp.exmail.qq.com",
"Port": 587,
"EnableSsl": true,
"Password": "",
"From": "ba-support@dsnixi.com",
"To": "argo@163.com"
},
"AllowOrigins": "http://localhost,http://argo.zylweb.cn", "AllowOrigins": "http://localhost,http://argo.zylweb.cn",
"LongbowCache": { "LongbowCache": {
"Enabled": true, "Enabled": true,