From 357f24452e84ae2bdfbb4217f85739955cf29ebf Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Fri, 8 Mar 2019 18:31:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81=EF=BC=9A?= =?UTF-8?q?=E9=BB=98=E8=AE=A4dev=E5=88=86=E6=94=AF=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=B1=BB=E5=9E=8B=E4=B8=BASQLite=20?= =?UTF-8?q?closed=20#ITB1C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #Issue https://gitee.com/LongbowEnterprise/BootstrapAdmin/issues/ITB1C --- Bootstrap.Admin/appsettings.json | 14 +++++----- .../Bootstrap.Client.DataAccess.csproj | 1 + Bootstrap.Client/appsettings.Development.json | 15 +++++++++-- Bootstrap.Client/appsettings.json | 27 ++++++++++--------- .../Bootstrap.DataAccess.csproj | 1 + 5 files changed, 37 insertions(+), 21 deletions(-) diff --git a/Bootstrap.Admin/appsettings.json b/Bootstrap.Admin/appsettings.json index fd483774..f7b986ad 100644 --- a/Bootstrap.Admin/appsettings.json +++ b/Bootstrap.Admin/appsettings.json @@ -18,7 +18,7 @@ "MongoDB": "BootstrapAdmin", "DB": [ { - "Enabled": true + "Enabled": false }, { "Enabled": true, @@ -51,8 +51,8 @@ ], "IPSvrUrl": "http://api.map.baidu.com/location/ip?ak=6lvVPMDlm2gjLpU0aiqPsHXi2OiwGQRj&ip=", "SwaggerPathBase": "/BA", - "AllowOrigins": "http://localhost,http://10.15.63.218", - "KeyPath": "..\\keys", + "AllowOrigins": "http://localhost,http://argo.zylweb.cn", + "KeyPath": "..\\..\\keys", "ApplicationName": "__bd__", "ApplicationDiscriminator": "BootstrapAdmin", "DisableAutomaticKeyGeneration": false, @@ -68,15 +68,15 @@ { "Enabled": true, "Key": "ba", - "Url": "http://x/BA/CacheList.axd", + "Url": "http://argo.zylweb.cn/BA/CacheList.axd", "Desc": "后台管理数据缓存接口", "Self": true }, { "Enabled": true, - "Key": "Pallet", - "Url": "http://x/WebConsole/CacheList.axd", - "Desc": "托盘组垛系统", + "Key": "App", + "Url": "http://argo.zylweb.cn/CacheList.axd", + "Desc": "测试系统", "Self": false } ], diff --git a/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj b/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj index db0c8adf..d0b29344 100644 --- a/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj +++ b/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj @@ -15,6 +15,7 @@ + diff --git a/Bootstrap.Client/appsettings.Development.json b/Bootstrap.Client/appsettings.Development.json index 0e52513f..e56d01c8 100644 --- a/Bootstrap.Client/appsettings.Development.json +++ b/Bootstrap.Client/appsettings.Development.json @@ -18,7 +18,18 @@ "ConnectionStrings": { "ba": "Data Source=.;Initial Catalog=BootstrapAdmin;User ID=sa;Password=sa" }, + "DB": [ + { + "Enabled": false + }, + { + "Enabled": true, + "ProviderName": "Sqlite", + "ConnectionStrings": { + "ba": "Data Source=..\\Bootstrap.Admin\\BootstrapAdmin.db;" + } + } + ], "AuthHost": "http://localhost:50852", - "AllowOrigins": "http://localhost:50852", - "KeyPath": "..\\keys" + "AllowOrigins": "http://localhost:50852" } diff --git a/Bootstrap.Client/appsettings.json b/Bootstrap.Client/appsettings.json index 17b473d5..96e4defc 100644 --- a/Bootstrap.Client/appsettings.json +++ b/Bootstrap.Client/appsettings.json @@ -16,24 +16,27 @@ "sql": "Data Source=.;Initial Catalog=BootstrapAdmin;User ID=sa;Password=sa", "ba": "Data Source=.;Initial Catalog=BootstrapAdmin;User ID=sa;Password=sa" }, + "DB": [ + { + "Enabled": false + }, + { + "Enabled": true, + "ProviderName": "Sqlite", + "ConnectionStrings": { + "ba": "Data Source=BA\\BootstrapAdmin.db;" + } + } + ], "AppId": 2, - "AuthHost": "http://localhost:50852", - "AllowOrigins": "http://localhost,http://10.15.63.218", - "KeyPath": "D:\\App\\Web-App\\keys", + "AuthHost": "http://argo.zylweb.cn/BA", + "AllowOrigins": "http://localhost,http://argo.zylweb.cn", + "KeyPath": "..\\keys", "ApplicationName": "__bd__", "ApplicationDiscriminator": "BootstrapAdmin", "DisableAutomaticKeyGeneration": true, "LongbowCache": { "Enabled": true, - "CorsItems": [ - { - "Enabled": true, - "Name": "AppName", - "Url": "CacheList.axd", - "Desc": "自定义系统", - "Self": true - } - ], "CacheItems": [ { "Enabled": true, diff --git a/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj b/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj index d8ef91fb..17419609 100644 --- a/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj +++ b/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj @@ -17,6 +17,7 @@ +