Skip to content

P
Property
Commit 63e0679c authored by 黄奎's avatar 黄奎
Browse files
Options

项目修改

parent 602b9602
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 30 deletions
Property.CacheManager/Property.CacheManager.csproj
View file @ 63e0679c
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
Property.Common/Property.Common.csproj
View file @ 63e0679c
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
Property.DataAccess/Property.DataAccess.csproj
View file @ 63e0679c
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
Property.DataHelper/Property.DataHelper.csproj
View file @ 63e0679c
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
Property.IM/Property.IM.csproj
View file @ 63e0679c
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
Property.Mobule.User/Property.Module.User.csproj
View file @ 63e0679c
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
Property.Model/Property.Model.csproj
View file @ 63e0679c
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
Property.Modele.FixedAssets/Property.Module.FixedAssets.csproj
View file @ 63e0679c
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
Property.Module.Mall/Property.Module.Mall.csproj
View file @ 63e0679c
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
Property.Repository/Property.Repository.csproj
View file @ 63e0679c
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
Property.WebApi/.config/dotnet-tools.json 0 → 100644
View file @ 63e0679c
{
"version": 1,
"isRoot": true,
"tools": {}
}
\ No newline at end of file
Property.WebApi/Controllers/Login/LoginController.cs
View file @ 63e0679c
...@@ -34,6 +34,13 @@ namespace Property.WebApi.Controllers.Login ...@@ -34,6 +34,13 @@ namespace Property.WebApi.Controllers.Login
//岗位 //岗位
private PostModule postModule = new PostModule(); private PostModule postModule = new PostModule();
[HttpGet]
[HttpPost]
public ApiResult Test()
{
return ApiResult.Success();
}
/// <summary> /// <summary>
/// 获取用户登录 /// 获取用户登录
/// </summary> /// </summary>
......
Property.WebApi/Properties/PublishProfiles/CustomProfile.pubxml
View file @ 63e0679c
...@@ -9,12 +9,12 @@ ...@@ -9,12 +9,12 @@
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration> <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform> <LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish /> <SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish> <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data> <ExcludeApp_Data>false</ExcludeApp_Data>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<ProjectGuid>87f2ccc9-971a-4a77-a5bb-04e88c42ddca</ProjectGuid> <ProjectGuid>87f2ccc9-971a-4a77-a5bb-04e88c42ddca</ProjectGuid>
<SelfContained>false</SelfContained> <SelfContained>false</SelfContained>
<publishUrl>E:\LDWork\LiuDongWork\PropertyFB</publishUrl> <publishUrl>F:\publish\edu_publish</publishUrl>
<DeleteExistingFiles>False</DeleteExistingFiles> <DeleteExistingFiles>false</DeleteExistingFiles>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
\ No newline at end of file
Property.WebApi/Properties/PublishProfiles/CustomProfile.pubxml.user
View file @ 63e0679c
...@@ -6,7 +6,9 @@ ...@@ -6,7 +6,9 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile /> <TimeStampOfAssociatedLegacyPublishXmlFile />
<_PublishTargetUrl>E:\LDWork\LiuDongWork\PropertyFB</_PublishTargetUrl> <_PublishTargetUrl>F:\publish\edu_publish</_PublishTargetUrl>
<History>True|2024-10-12T03:16:01.9922266Z;False|2024-10-12T11:14:43.1381701+08:00;False|2024-10-12T11:13:22.8471019+08:00;False|2024-10-12T11:06:47.8790103+08:00;False|2024-10-12T11:06:19.6953136+08:00;False|2024-10-12T11:03:49.4862350+08:00;False|2024-10-12T10:54:03.2400701+08:00;True|2024-10-12T10:22:19.4812044+08:00;</History>
<LastFailureDetails />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<File Include="appsettings.Development.json"> <File Include="appsettings.Development.json">
......
Property.WebApi/Property.WebApi.csproj
View file @ 63e0679c
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
Property.WebApi/Property.WebApi.csproj.user
View file @ 63e0679c
...@@ -9,6 +9,6 @@ ...@@ -9,6 +9,6 @@
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected> <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile /> <WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected> <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>CustomProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>F:\luochao\code\property_api\Property.WebApi\Properties\PublishProfiles\CustomProfile.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
\ No newline at end of file
Property.WebApi/Startup.cs
View file @ 63e0679c
...@@ -64,7 +64,8 @@ namespace Property.WebApi ...@@ -64,7 +64,8 @@ namespace Property.WebApi
"http://yx.oytour.com", "http://yx.oytour.com",
"http://mall.oytour.com", "http://mall.oytour.com",
"http://mallapi.oytour.com", "http://mallapi.oytour.com",
"http://www.oytour.com" "http://www.oytour.com",
"http://admin.oytour.com"
}; };
if (!string.IsNullOrEmpty(accessSiteStr)) if (!string.IsNullOrEmpty(accessSiteStr))
{ {
......
Property.WebApi/appsettings.json
View file @ 63e0679c
{ {
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "server=192.168.2.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_user;CharSet=utf8; Convert Zero Datetime=true; ", "DefaultConnection": "server=192.168.5.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_user;CharSet=utf8; Convert Zero Datetime=true; ",
"DefaultConnectionPName": "MySql.Data.MySqlClient", "DefaultConnectionPName": "MySql.Data.MySqlClient",
"PropertyConnection": "server=192.168.2.214;port=3306;user id=reborn;password=Reborn@2018;database=test_property;CharSet=utf8; Convert Zero Datetime=true; ", "PropertyConnection": "server=192.168.5.214;port=3306;user id=reborn;password=Reborn@2018;database=test_property;CharSet=utf8; Convert Zero Datetime=true; ",
"PropertyConnectionPName": "MySql.Data.MySqlClient", "PropertyConnectionPName": "MySql.Data.MySqlClient",
"FinanceConnection": "server=192.168.2.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8; Convert Zero Datetime=true; ", "FinanceConnection": "server=192.168.5.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8; Convert Zero Datetime=true; ",
"FinanceConnectionPName": "MySql.Data.MySqlClient", "FinanceConnectionPName": "MySql.Data.MySqlClient",
"LogConnection": "server=192.168.2.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_log;CharSet=utf8; Convert Zero Datetime=true; ", "LogConnection": "server=192.168.5.214;port=3306;user id=reborn;password=Reborn@2018;database=reborn_log;CharSet=utf8; Convert Zero Datetime=true; ",
"LogConnectionPName": "MySql.Data.MySqlClient", "LogConnectionPName": "MySql.Data.MySqlClient",
"MallConnection": "server=192.168.2.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall_3;CharSet=utf8; Convert Zero Datetime=true; ", "MallConnection": "server=192.168.5.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8; Convert Zero Datetime=true; ",
"MallConnectionPName": "MySql.Data.MySqlClient" "MallConnectionPName": "MySql.Data.MySqlClient"
}, },
"Logging": { "Logging": {
...@@ -24,18 +24,18 @@ ...@@ -24,18 +24,18 @@
"AdminId": 0, "AdminId": 0,
"AllowedHosts": "*", "AllowedHosts": "*",
"OpenValidation": "False", "OpenValidation": "False",
"UploadSiteUrl": "http://192.168.2.214:8120", "UploadSiteUrl": "http://192.168.5.214:8120",
"ViewFileSiteUrl": "http://192.168.2.214:8130", "ViewFileSiteUrl": "http://192.168.5.214:8130",
"ImKey": "b612b31e837c79c68f141aeb719d2b20", "ImKey": "b612b31e837c79c68f141aeb719d2b20",
"ImSecret": "66000451fb72", "ImSecret": "66000451fb72",
"FinanceKey": "FinanceMallInsertToERPViitto2020", "FinanceKey": "FinanceMallInsertToERPViitto2020",
"OutCurrencyId": 1, "OutCurrencyId": 1,
"PaymentFinanceApi": "http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallOut", "PaymentFinanceApi": "http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallOut",
"ExpendDirector": 1756, //财务支出创建人 "ExpendDirector": 1756, //
"ExpendBranchId": 49, //财务支出创建人公司 "ExpendBranchId": 49, //
"ExpendDepartment": 331, "ExpendDepartment": 331,
"RedisSetting": { "RedisSetting": {
"RedisServer": "192.168.2.214", "RedisServer": "192.168.5.214",
"RedisPort": "6379", "RedisPort": "6379",
"RedisPwd": "123456" "RedisPwd": "123456"
}, },
......
Property.WebApi/run_5001.cmd 0 → 100644
View file @ 63e0679c
@echo off
echo ASPNETCORE_ENVIRONMENT=Development
dotnet build
start "Property.WebApi" dotnet bin\Debug\netcoreapp3.1\Property.WebApi.dll --urls http://0.0.0.0:5001 --ip="127.0.0.1" --port=5001
exit
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment