diff --git a/Reportapi/FrameWork/SqlSugar/SqlSugar.csproj b/Reportapi/FrameWork/SqlSugar/SqlSugar.csproj index 7efafd9..c55b119 100644 --- a/Reportapi/FrameWork/SqlSugar/SqlSugar.csproj +++ b/Reportapi/FrameWork/SqlSugar/SqlSugar.csproj @@ -37,9 +37,8 @@ ..\..\Lib\MySql.Data.dll False - - False - Lib\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll False @@ -308,7 +307,9 @@ - + + + -
+
- - + + - + - + - + - + - + - + - + - + - + - + - + - - - + + + @@ -61,106 +61,106 @@ - + - + - + - + - + - + - + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj b/Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj index db57f85..dba8d7b 100644 --- a/Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj +++ b/Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj @@ -43,8 +43,8 @@ ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll True - - ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll ..\Lib\Qiniu.dll diff --git a/Reportapi/MyCode.Project.OutSideService/app.config b/Reportapi/MyCode.Project.OutSideService/app.config index 9e1cbb7..a89b837 100644 --- a/Reportapi/MyCode.Project.OutSideService/app.config +++ b/Reportapi/MyCode.Project.OutSideService/app.config @@ -1,28 +1,28 @@ - + - - + + - - + + - - + + - - + + - - + + - + diff --git a/Reportapi/MyCode.Project.OutSideService/packages.config b/Reportapi/MyCode.Project.OutSideService/packages.config index 5ef9265..a81220f 100644 --- a/Reportapi/MyCode.Project.OutSideService/packages.config +++ b/Reportapi/MyCode.Project.OutSideService/packages.config @@ -4,7 +4,7 @@ - + diff --git a/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs b/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs index 4dfe2d5..d8e4d10 100644 --- a/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs +++ b/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs @@ -10,6 +10,7 @@ using MyCode.Project.Domain.Repositories; using MyCode.Project.Infrastructure.Common; using MyCode.Project.Infrastructure.Search; using MyCode.Project.Domain.Message.Response.LxmZHMDReport; +using MyCode.Project.Domain.Message.Act.Common; namespace MyCode.Project.Repositories { @@ -23,7 +24,7 @@ namespace MyCode.Project.Repositories { SearchCondition where = new SearchCondition(); - + where.AddSqlCondition(" 1=1 ", true); string sql = $@" diff --git a/Reportapi/MyCode.Project.ScheduleTask/App.config b/Reportapi/MyCode.Project.ScheduleTask/App.config index 073e12c..723de74 100644 --- a/Reportapi/MyCode.Project.ScheduleTask/App.config +++ b/Reportapi/MyCode.Project.ScheduleTask/App.config @@ -1,4 +1,4 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -70,142 +70,142 @@ --> - - - + + + - + - - - + + + - - - - + + + + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj b/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj index 9824d7c..2e0176f 100644 --- a/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj +++ b/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj @@ -65,9 +65,8 @@ ..\Lib\Microsoft.Practices.Unity.Interception.Configuration.dll - - False - ..\Lib\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll False diff --git a/Reportapi/MyCode.Project.ScheduleTask/packages.config b/Reportapi/MyCode.Project.ScheduleTask/packages.config index 3d3ceea..3624357 100644 --- a/Reportapi/MyCode.Project.ScheduleTask/packages.config +++ b/Reportapi/MyCode.Project.ScheduleTask/packages.config @@ -1,7 +1,7 @@  - + diff --git a/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj b/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj index 5fa0114..ddd07f7 100644 --- a/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj +++ b/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj @@ -106,9 +106,8 @@ False ..\Lib\netstandard.dll - - False - ..\Lib\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/Reportapi/MyCode.Project.WebApi/Properties/PublishProfiles/FolderProfile.pubxml b/Reportapi/MyCode.Project.WebApi/Properties/PublishProfiles/FolderProfile.pubxml index 036ae7a..8669412 100644 --- a/Reportapi/MyCode.Project.WebApi/Properties/PublishProfiles/FolderProfile.pubxml +++ b/Reportapi/MyCode.Project.WebApi/Properties/PublishProfiles/FolderProfile.pubxml @@ -10,9 +10,9 @@ Release Any CPU - True - False - E:\Git\MyCodeMySql\Publish - True + true + true + C:\Users\1YBOOK\Desktop\发布 + true \ No newline at end of file diff --git a/Reportapi/MyCode.Project.WebApi/Web.config b/Reportapi/MyCode.Project.WebApi/Web.config deleted file mode 100644 index 1a06261..0000000 --- a/Reportapi/MyCode.Project.WebApi/Web.config +++ /dev/null @@ -1,235 +0,0 @@ - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Reportapi/MyCode.Project.WebApi/packages.config b/Reportapi/MyCode.Project.WebApi/packages.config index 0954894..2c0fffa 100644 --- a/Reportapi/MyCode.Project.WebApi/packages.config +++ b/Reportapi/MyCode.Project.WebApi/packages.config @@ -29,6 +29,7 @@ + diff --git a/Reportapi/MyCode.Project.ZHMDGenerateCode/App.config b/Reportapi/MyCode.Project.ZHMDGenerateCode/App.config index 2f36935..abf946a 100644 --- a/Reportapi/MyCode.Project.ZHMDGenerateCode/App.config +++ b/Reportapi/MyCode.Project.ZHMDGenerateCode/App.config @@ -1,45 +1,45 @@ - + -
+
- - + + - + - + - + - + - + - + - + - + - + - + - + - - - + + + @@ -61,106 +61,106 @@ - + - + - + - + - + - + - + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - +