chore: 修复配置文件和Dockerfile问题

main
NoahLan 3 years ago
parent 6ccf2df930
commit 76219dcfc3

@ -15,23 +15,18 @@ COPY ["framework/NPin.Framework.Core/NPin.Framework.Core.csproj", "framework/NPi
COPY ["src/NPin.Application/NPin.Application.csproj", "src/NPin.Application/"] COPY ["src/NPin.Application/NPin.Application.csproj", "src/NPin.Application/"]
COPY ["framework/NPin.Framework.Ddd.Application/NPin.Framework.Ddd.Application.csproj", "framework/NPin.Framework.Ddd.Application/"] COPY ["framework/NPin.Framework.Ddd.Application/NPin.Framework.Ddd.Application.csproj", "framework/NPin.Framework.Ddd.Application/"]
COPY ["framework/NPin.Framework.Ddd.Application.Contracts/NPin.Framework.Ddd.Application.Contracts.csproj", "framework/NPin.Framework.Ddd.Application.Contracts/"] COPY ["framework/NPin.Framework.Ddd.Application.Contracts/NPin.Framework.Ddd.Application.Contracts.csproj", "framework/NPin.Framework.Ddd.Application.Contracts/"]
COPY ["module/bbs/NPin.Framework.Bbs.Application/NPin.Framework.Bbs.Application.csproj", "module/bbs/NPin.Framework.Bbs.Application/"] COPY ["module/upms/NPin.Framework.Upms.Application/NPin.Framework.Upms.Application.csproj", "module/upms/NPin.Framework.Upms.Application/"]
COPY ["module/rbac/NPin.Framework.Rbac.Application/NPin.Framework.Rbac.Application.csproj", "module/rbac/NPin.Framework.Rbac.Application/"] COPY ["module/upms/NPin.Framework.Upms.Application.Contracts/NPin.Framework.Upms.Application.Contracts.csproj", "module/upms/NPin.Framework.Upms.Application.Contracts/"]
COPY ["module/rbac/NPin.Framework.Rbac.Application.Contracts/NPin.Framework.Rbac.Application.Contracts.csproj", "module/rbac/NPin.Framework.Rbac.Application.Contracts/"] COPY ["module/upms/NPin.Framework.Upms.Domain.Shared/NPin.Framework.Upms.Domain.Shared.csproj", "module/upms/NPin.Framework.Upms.Domain.Shared/"]
COPY ["module/rbac/NPin.Framework.Rbac.Domain.Shared/NPin.Framework.Rbac.Domain.Shared.csproj", "module/rbac/NPin.Framework.Rbac.Domain.Shared/"]
COPY ["framework/NPin.Framework.Mapster/NPin.Framework.Mapster.csproj", "framework/NPin.Framework.Mapster/"] COPY ["framework/NPin.Framework.Mapster/NPin.Framework.Mapster.csproj", "framework/NPin.Framework.Mapster/"]
COPY ["framework/NPin.Framework.SqlSugarCore.Abstractions/NPin.Framework.SqlSugarCore.Abstractions.csproj", "framework/NPin.Framework.SqlSugarCore.Abstractions/"] COPY ["framework/NPin.Framework.SqlSugarCore.Abstractions/NPin.Framework.SqlSugarCore.Abstractions.csproj", "framework/NPin.Framework.SqlSugarCore.Abstractions/"]
COPY ["module/rbac/NPin.Framework.Rbac.Domain/NPin.Framework.Rbac.Domain.csproj", "module/rbac/NPin.Framework.Rbac.Domain/"] COPY ["module/upms/NPin.Framework.Upms.Domain/NPin.Framework.Upms.Domain.csproj", "module/upms/NPin.Framework.Upms.Domain/"]
COPY ["module/bbs/NPin.Framework.Bbs.Application.Contracts/NPin.Framework.Bbs.Application.Contracts.csproj", "module/bbs/NPin.Framework.Bbs.Application.Contracts/"]
COPY ["module/bbs/NPin.Framework.Bbs.Domain.Shared/NPin.Framework.Bbs.Domain.Shared.csproj", "module/bbs/NPin.Framework.Bbs.Domain.Shared/"]
COPY ["module/bbs/NPin.Framework.Bbs.Domain/NPin.Framework.Bbs.Domain.csproj", "module/bbs/NPin.Framework.Bbs.Domain/"]
COPY ["src/NPin.Application.Contracts/NPin.Application.Contracts.csproj", "src/NPin.Application.Contracts/"] COPY ["src/NPin.Application.Contracts/NPin.Application.Contracts.csproj", "src/NPin.Application.Contracts/"]
COPY ["src/NPin.Domain.Shared/NPin.Domain.Shared.csproj", "src/NPin.Domain.Shared/"] COPY ["src/NPin.Domain.Shared/NPin.Domain.Shared.csproj", "src/NPin.Domain.Shared/"]
COPY ["src/NPin.Domain/NPin.Domain.csproj", "src/NPin.Domain/"] COPY ["src/NPin.Domain/NPin.Domain.csproj", "src/NPin.Domain/"]
COPY ["src/NPin.SqlSugarCore/NPin.SqlSugarCore.csproj", "src/NPin.SqlSugarCore/"] COPY ["src/NPin.SqlSugarCore/NPin.SqlSugarCore.csproj", "src/NPin.SqlSugarCore/"]
COPY ["framework/NPin.Framework.SqlSugarCore/NPin.Framework.SqlSugarCore.csproj", "framework/NPin.Framework.SqlSugarCore/"] COPY ["framework/NPin.Framework.SqlSugarCore/NPin.Framework.SqlSugarCore.csproj", "framework/NPin.Framework.SqlSugarCore/"]
COPY ["module/bbs/NPin.Framework.Bbs.SqlSugarCore/NPin.Framework.Bbs.SqlSugarCore.csproj", "module/bbs/NPin.Framework.Bbs.SqlSugarCore/"] COPY ["module/upms/NPin.Framework.Upms.SqlSugarCore/NPin.Framework.Upms.SqlSugarCore.csproj", "module/upms/NPin.Framework.Upms.SqlSugarCore/"]
COPY ["module/rbac/NPin.Framework.Rbac.SqlSugarCore/NPin.Framework.Rbac.SqlSugarCore.csproj", "module/rbac/NPin.Framework.Rbac.SqlSugarCore/"]
RUN dotnet restore "./src/NPin.Web/./NPin.Web.csproj" RUN dotnet restore "./src/NPin.Web/./NPin.Web.csproj"
COPY . . COPY . .
WORKDIR "/src/src/NPin.Web" WORKDIR "/src/src/NPin.Web"

@ -1,8 +0,0 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
}
}

@ -1,14 +1,17 @@
{ {
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
// "Default": "Information",
"Default": "Debug", "Default": "Debug",
"Microsoft.AspNetCore": "Warning" "Microsoft.AspNetCore": "Warning"
} }
}, },
// 应用启动
"App": { "App": {
"SelfUrl": "http://*:19001", "SelfUrl": "http://*:19001",
"CorsOrigins": "http://localhost:19001;http://localhost:18000" "CorsOrigins": "http://localhost:19001;http://localhost:18000"
}, },
// 数据库类型列表
"DbList": [ "DbList": [
"Sqlite", "Sqlite",
"Mysql", "Mysql",
@ -23,24 +26,35 @@
"EnabledCodeFirst": true, "EnabledCodeFirst": true,
"EnabledSqlLog": true, "EnabledSqlLog": true,
"EnabledDbSeed": true, "EnabledDbSeed": true,
"EnabledSaasMultiTenancy": false // SAAS多租户
"EnabledSaasMultiTenancy": false,
// 读写分离地址
//"ReadUrl": [
// "DataSource=[xxxx]", //Sqlite
// "server=[xxxx];port=3306;database=[xxxx];user id=[xxxx];password=[xxxx]", //Mysql
// "Data Source=[xxxx];Initial Catalog=[xxxx];User ID=[xxxx];password=[xxxx]" //Sqlserver
//]
}, },
// Redis使用freesql 参数在 FreeSqlOptions的ConnectionStringBuilder中
"Redis": { "Redis": {
"IsEnabled": false, "IsEnabled": false,
"Configuration": "192.168.1.100:6379,password=,defaultDatabase=10" "Configuration": "192.168.1.100:6379,password=,defaultDatabase=10"
}, },
// 鉴权
"JwtOptions": { "JwtOptions": {
"Issuer": "NoahLan", "Issuer": "NoahLan",
"Audience": "NoahLan", "Audience": "NoahLan",
"SecurityKey": "zqxwcevrbtnymu312412ihe9rfwhe78rh23djoi32hrui3ryf9e8wfh34iuj54y0934uti4h97fgw7hf97wyh8yy69520", "SecurityKey": "zqxwcevrbtnymu312412ihe9rfwhe78rh23djoi32hrui3ryf9e8wfh34iuj54y0934uti4h97fgw7hf97wyh8yy69520",
"ExpiresMinuteTime": 86400 "ExpiresMinuteTime": 86400
}, },
// 刷新Token
"RefreshJwtOptions": { "RefreshJwtOptions": {
"Issuer": "NoahLan", "Issuer": "NoahLan",
"Audience": "NoahLan", "Audience": "NoahLan",
"SecurityKey": "67ij4o6jo4i5j6io45j6i4j74p5k6i54ojoi5t9g8ergoj34ofgkrtbmreog894jbioemgropihj48rj4io5juopjgior", "SecurityKey": "67ij4o6jo4i5j6io45j6i4j74p5k6i54ojoi5t9g8ergoj34ofgkrtbmreog894jbioemgropihj48rj4io5juopjgior",
"ExpiresMinuteTime": 172800 "ExpiresMinuteTime": 172800
}, },
// 集成第三方登录
"OAuth": { "OAuth": {
"QQ": { "QQ": {
"ClientId": "", "ClientId": "",
@ -53,14 +67,16 @@
"RedirectUri": "" "RedirectUri": ""
} }
}, },
// Rbac模块
"RbacOptions": { "RbacOptions": {
//超级管理员种子数据默认密码 // 超级管理员种子数据默认密码
"AdminPassword": "123456", "AdminPassword": "123456",
//是否开启验证码验证 // 是否开启验证码验证
"EnableCaptcha": true, "EnableCaptcha": true,
//是否开启注册功能 // 是否开启注册功能
"EnableRegister": false, "EnableRegister": false,
//开启定时数据库备份 // 开启定时数据库备份
"EnableDataBaseBackup": false "EnableDataBaseBackup": false
} }
} }

Loading…
Cancel
Save