You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

41 lines
1.3 KiB

{
"AuthServer": {
2 years ago
"Authority": "http://dev.ccwin-in.com:10580"
},
"App": {
2 years ago
"CorsOrigins": "http://localhost:9527,http://dev.ccwin-in.com:10588,http://localhost:44307"
},
"ConnectionStrings": {
2 years ago
"Default": "Server=dev.ccwin-in.com,13319;Database=BJABP;User ID=ccwin-in;Password=Microsoft@2022;Trusted_Connection=False;TrustServerCertificate=True"
},
"ElasticSearch": {
"Url": "http://localhost:9200"
},
"Redis": {
"Configuration": "127.0.0.1"
},
"Logging": {
"LogLevel": {
"Default": "Warning"
}
},
Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount # Conflicts: # code/src/Modules/BaseService/BaseService.Host/appsettings.json # code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj # code/src/Shared/Win.Abp.Snowflakes/bin/Release/netcoreapp5/Win.Abp.Snowflakes.dll # code/src/Shared/Win.Abp.Snowflakes/bin/Release/netcoreapp5/Win.Abp.Snowflakes.pdb # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.assets.cache # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.dll # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.pdb # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/ref/Win.Abp.Snowflakes.dll # code/src/Shared/Win.Abp.Snowflakes/obj/project.nuget.cache # code/src/Shared/Win.Sfs.Shared/bin/Debug/Win.Sfs.Shared.2.0.0.nupkg # code/src/Shared/Win.Sfs.Shared/bin/Release/Win.Sfs.Shared.2.0.0.nupkg # code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.dll # code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.pdb # code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Utils.dll # code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Utils.pdb # code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache # code/src/Shared/Win.Sfs.Shared/obj/Release/Win.Sfs.Shared.2.0.0.nuspec # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.assets.cache # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.dll # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.pdb # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/ref/Win.Sfs.Shared.dll # code/src/Shared/Win.Sfs.Shared/obj/project.nuget.cache # code/src/Shared/Win.Utils/bin/Debug/Win.Utils.2.0.0.nupkg # code/src/Shared/Win.Utils/bin/Release/Win.Utils.2.0.0.nupkg # code/src/Shared/Win.Utils/bin/Release/netcoreapp5/Win.Utils.dll # code/src/Shared/Win.Utils/bin/Release/netcoreapp5/Win.Utils.pdb # code/src/Shared/Win.Utils/obj/Release/Win.Utils.2.0.0.nuspec # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.assets.cache # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.dll # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.pdb # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/ref/Win.Utils.dll # code/src/Shared/Win.Utils/obj/project.nuget.cache # code/src/SmartFactorySuite.sln
2 years ago
<<<<<<< HEAD
//"Settings": {
// "Abp.Localization.DefaultLanguage": "zh-Hans",
2 years ago
// "Abp.Identity.Password.RequireNonAlphanumeric": "false", //ȥĸ
// "Abp.Identity.Password.RequireUppercase": "false", //ȥд
// "Abp.Identity.Password.RequireLowercase": "false", //ȥСд
// "Abp.Identity.Password.RequiredLength": "1",
// "Abp.Identity.SignIn.RequireConfirmedEmail": "true",
2 years ago
// //û
// "Abp.Identity.Lockout.AllowedForNewUsers": "true",
// "Abp.Identity.Lockout.MaxFailedAccessAttempts": "3"
//},
"AllowedHosts": "*"
Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount # Conflicts: # code/src/Modules/BaseService/BaseService.Host/appsettings.json # code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj # code/src/Shared/Win.Abp.Snowflakes/bin/Release/netcoreapp5/Win.Abp.Snowflakes.dll # code/src/Shared/Win.Abp.Snowflakes/bin/Release/netcoreapp5/Win.Abp.Snowflakes.pdb # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.assets.cache # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.dll # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.pdb # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/ref/Win.Abp.Snowflakes.dll # code/src/Shared/Win.Abp.Snowflakes/obj/project.nuget.cache # code/src/Shared/Win.Sfs.Shared/bin/Debug/Win.Sfs.Shared.2.0.0.nupkg # code/src/Shared/Win.Sfs.Shared/bin/Release/Win.Sfs.Shared.2.0.0.nupkg # code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.dll # code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.pdb # code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Utils.dll # code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Utils.pdb # code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache # code/src/Shared/Win.Sfs.Shared/obj/Release/Win.Sfs.Shared.2.0.0.nuspec # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.assets.cache # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.dll # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.pdb # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/ref/Win.Sfs.Shared.dll # code/src/Shared/Win.Sfs.Shared/obj/project.nuget.cache # code/src/Shared/Win.Utils/bin/Debug/Win.Utils.2.0.0.nupkg # code/src/Shared/Win.Utils/bin/Release/Win.Utils.2.0.0.nupkg # code/src/Shared/Win.Utils/bin/Release/netcoreapp5/Win.Utils.dll # code/src/Shared/Win.Utils/bin/Release/netcoreapp5/Win.Utils.pdb # code/src/Shared/Win.Utils/obj/Release/Win.Utils.2.0.0.nuspec # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.assets.cache # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.dll # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.pdb # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/ref/Win.Utils.dll # code/src/Shared/Win.Utils/obj/project.nuget.cache # code/src/SmartFactorySuite.sln
2 years ago
=======
2 years ago
"AllowedHosts": "*",
"RePassword": "111111"
Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount # Conflicts: # code/src/Modules/BaseService/BaseService.Host/appsettings.json # code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj # code/src/Shared/Win.Abp.Snowflakes/bin/Release/netcoreapp5/Win.Abp.Snowflakes.dll # code/src/Shared/Win.Abp.Snowflakes/bin/Release/netcoreapp5/Win.Abp.Snowflakes.pdb # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.GeneratedMSBuildEditorConfig.editorconfig # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.assets.cache # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.CoreCompileInputs.cache # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.csproj.FileListAbsolute.txt # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.dll # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/Win.Abp.Snowflakes.pdb # code/src/Shared/Win.Abp.Snowflakes/obj/Release/netcoreapp5/ref/Win.Abp.Snowflakes.dll # code/src/Shared/Win.Abp.Snowflakes/obj/project.nuget.cache # code/src/Shared/Win.Sfs.Shared/bin/Debug/Win.Sfs.Shared.2.0.0.nupkg # code/src/Shared/Win.Sfs.Shared/bin/Release/Win.Sfs.Shared.2.0.0.nupkg # code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.dll # code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Sfs.Shared.pdb # code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Utils.dll # code/src/Shared/Win.Sfs.Shared/bin/Release/netcoreapp5/Win.Utils.pdb # code/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache # code/src/Shared/Win.Sfs.Shared/obj/Release/Win.Sfs.Shared.2.0.0.nuspec # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.GeneratedMSBuildEditorConfig.editorconfig # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.assets.cache # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.CoreCompileInputs.cache # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.csproj.FileListAbsolute.txt # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.dll # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/Win.Sfs.Shared.pdb # code/src/Shared/Win.Sfs.Shared/obj/Release/netcoreapp5/ref/Win.Sfs.Shared.dll # code/src/Shared/Win.Sfs.Shared/obj/project.nuget.cache # code/src/Shared/Win.Utils/bin/Debug/Win.Utils.2.0.0.nupkg # code/src/Shared/Win.Utils/bin/Release/Win.Utils.2.0.0.nupkg # code/src/Shared/Win.Utils/bin/Release/netcoreapp5/Win.Utils.dll # code/src/Shared/Win.Utils/bin/Release/netcoreapp5/Win.Utils.pdb # code/src/Shared/Win.Utils/obj/Release/Win.Utils.2.0.0.nuspec # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.GeneratedMSBuildEditorConfig.editorconfig # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.assets.cache # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.CoreCompileInputs.cache # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.csproj.FileListAbsolute.txt # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.dll # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/Win.Utils.pdb # code/src/Shared/Win.Utils/obj/Release/netcoreapp5/ref/Win.Utils.dll # code/src/Shared/Win.Utils/obj/project.nuget.cache # code/src/SmartFactorySuite.sln
2 years ago
>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888
}