Develop/YunTongJackYunTask
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0

Browse Source
This commit is contained in:
朱斌
2025-08-23 16:57:16 +08:00
parent de4a33e00e
commit f5a30d8468
25 changed files with 381 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Reportapi/FrameWork/Fleck/Fleck.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Fleck</RootNamespace>
<AssemblyName>Fleck</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>

2
Reportapi/FrameWork/SqlSugar/SqlSugar.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SqlSugar</RootNamespace>
<AssemblyName>SqlSugar</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>

3
Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/Swashbuckle.Core.csproj
View File

@@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Swashbuckle</RootNamespace>
<AssemblyName>Swashbuckle.Core</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>

4
Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/app.config
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -8,4 +8,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

3
Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.WebHost/Swashbuckle.WebHost.csproj
View File

@@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Swashbuckle.WebHost</RootNamespace>
<AssemblyName>Swashbuckle.WebHost</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>

4
Reportapi/MyCode.Project.Domain/App.config
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
@@ -30,4 +30,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

2
Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCode.Project.Domain</RootNamespace>
<AssemblyName>MyCode.Project.Domain</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>

4
Reportapi/MyCode.Project.GenerateCode/App.config
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
For more information on how to configure your ASP.NET application, please visit
https://go.microsoft.com/fwlink/?LinkId=301879
@@ -163,4 +163,4 @@
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
</compilers>
</system.codedom>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

2
Reportapi/MyCode.Project.GenerateCode/MyCode.Project.GenerateCode.csproj
View File

@@ -8,7 +8,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>MyCode.Project.GenerateCode</RootNamespace>
<AssemblyName>MyCode.Project.GenerateCode</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />

2
Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCode.Project.Infrastructure</RootNamespace>
<AssemblyName>MyCode.Project.Infrastructure</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>

4
Reportapi/MyCode.Project.Infrastructure/app.config
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -29,4 +29,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

6
Reportapi/MyCode.Project.Infrastructure/packages.config
View File

@@ -10,10 +10,10 @@
<package id="log4net" version="2.0.8" targetFramework="net45" />
<package id="MiniExcel" version="1.30.0" targetFramework="net461" />
<package id="NPOI" version="2.2.1" targetFramework="net45" />
<package id="Pipelines.Sockets.Unofficial" version="1.0.7" targetFramework="net461" />
<package id="Pipelines.Sockets.Unofficial" version="1.0.7" targetFramework="net461" requireReinstallation="true" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
<package id="sqlSugar" version="4.6.4.9" targetFramework="net45" />
<package id="StackExchange.Redis" version="2.0.519" targetFramework="net461" />
<package id="StackExchange.Redis" version="2.0.519" targetFramework="net461" requireReinstallation="true" />
<package id="System.Diagnostics.PerformanceCounter" version="4.5.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="4.5.1" targetFramework="net461" />
<package id="System.Memory" version="4.5.1" targetFramework="net461" />
@@ -25,5 +25,5 @@
<package id="Unity" version="4.0.1" targetFramework="net45" />
<package id="Unity.Interception" version="4.0.1" targetFramework="net45" />
<package id="Unofficial.Ionic.Zip" version="1.9.1.8" targetFramework="net45" />
<package id="ZXing.Net" version="0.15.0" targetFramework="net45" />
<package id="ZXing.Net" version="0.15.0" targetFramework="net45" requireReinstallation="true" />
</packages>

2
Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCode.Project.OutSideService</RootNamespace>
<AssemblyName>MyCode.Project.OutSideService</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>

4
Reportapi/MyCode.Project.OutSideService/app.config
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -25,4 +25,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

4
Reportapi/MyCode.Project.Repositories/App.config
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -29,4 +29,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

2
Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCode.Project.Repositories</RootNamespace>
<AssemblyName>MyCode.Project.Repositories</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>

4
Reportapi/MyCode.Project.ScheduleTask/App.config
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
For more information on how to configure your ASP.NET application, please visit
https://go.microsoft.com/fwlink/?LinkId=301879
@@ -208,4 +208,4 @@
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
</compilers>
</system.codedom>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

2
Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj
View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCode.Project.ScheduleTask</RootNamespace>
<AssemblyName>MyCode.Project.ScheduleTask</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>

4
Reportapi/MyCode.Project.Services/App.config
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -29,4 +29,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

4
Reportapi/MyCode.Project.Services/Implementation/ZhuBinService.cs → Reportapi/MyCode.Project.Services/Implementation/IPrdOrderService.cs
View File

@@ -6,12 +6,12 @@ using System;
namespace MyCode.Project.Services.Implementation
{
public class ZhuBinService : ServiceBase //, IZhuBinService
public class PrdOrderService : ServiceBase //, IZhuBinService
{
private IYTKJTShopParameterRepository _yTKJTShopParameterRepository;
public ZhuBinService(IYTKJTShopParameterRepository yTKJTShopParameterRepository)
public PrdOrderService(IYTKJTShopParameterRepository yTKJTShopParameterRepository)
{
_yTKJTShopParameterRepository = yTKJTShopParameterRepository;
}

4
Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj
View File

@@ -12,7 +12,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCode.Project.Services</RootNamespace>
<AssemblyName>MyCode.Project.Services</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -115,7 +115,7 @@
<Compile Include="BLL\WebSocketBLL.cs" />
<Compile Include="Implementation\AnsyDataProcessService.cs" />
<Compile Include="Implementation\ApiLogService.cs" />
<Compile Include="Implementation\ZhuBinService.cs" />
<Compile Include="Implementation\IPrdOrderService.cs" />
<Compile Include="Implementation\LiQiongHaiService.cs" />
<Compile Include="Implementation\YuyuboService.cs" />
<Compile Include="Implementation\ReportService.cs" />

2
Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj
View File

@@ -15,7 +15,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyCode.Project.WebApi</RootNamespace>
<AssemblyName>MyCode.Project.WebApi</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>false</UseIISExpress>
<IISExpressSSLPort />

22
Reportapi/MyCode.Project.WebApi/Web.config
View File

@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0"?>
<!--
For more information on how to configure your ASP.NET application, please visit
https://go.microsoft.com/fwlink/?LinkId=301879
-->
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
</configSections>
<system.webServer>
<httpProtocol>
<customHeaders>
@@ -23,15 +21,11 @@
</httpProtocol>
</system.webServer>
<connectionStrings>
<!-- 数据库测试-->
<add name="WMSConn" connectionString="Data Source=8.138.110.197,1433; Initial Catalog=AIS20240310221756; User ID=sa;Password=12qw!@; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient"/>
<add name="YunTongConn" connectionString="Data Source=8.138.110.197,1433; Initial Catalog=AIS20240310221756; User ID=sa;Password=12qw!@; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient"/>
<!--测试MYSQL内网-->
<!--<add name="MasterConn" connectionString="" providerName="MySql.Data.MySqlClient" />-->
</connectionStrings>
<appSettings>
<!--解决swagger出错问题-->
@@ -54,18 +48,13 @@
<add key="owin:AutomaticAppStartup" value="false"/>
<!--钉钉通知机器人-->
<add key="DingDingApiUrl" value=""/>
<!--区域层增加的前缀路径-->
<add key="AreaUrlPrePath" value=""/>
<!--生产环境D:\publish\lxm-report-api\App_File\-->
<!--服务器文件保存的路径，这里调度用，如果是webapi则不需要用这个-->
<add key="AppFilePath" value="D:\publish\LxmReportApi\api\App_File\"/>
<!--<add key="AppFilePath" value="D:\App_File\" />-->
<add key="WebSocketUrl" value="ws://127.0.0.1:9798/"/>
</appSettings>
<!--
有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
@@ -77,7 +66,7 @@
-->
<system.web>
<authentication mode="None"/>
<compilation debug="true" targetFramework="4.6.1" />
<compilation debug="true" targetFramework="4.8"/>
<httpRuntime targetFramework="4.6.1"/>
<customErrors mode="Off"/>
</system.web>
@@ -104,7 +93,6 @@
<filter type="log4net.Filter.DenyAllFilter"/>
</filter>
</appender>
<appender name="InfoLogFileAppender" type="log4net.Appender.RollingFileAppender">
<!--日志路径-->
<param name="File" value="App_Log\Info\"/>
@@ -127,7 +115,6 @@
<filter type="log4net.Filter.DenyAllFilter"/>
</filter>
</appender>
<!-- MySQL Appender -->
<!--<appender name="AdoNetAppender" type="log4net.Appender.AdoNetAppender">
<bufferSize value="1" />
@@ -163,8 +150,6 @@
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>-->
<root>
<!--(高) OFF > FATAL > ERROR > WARN > INFO > DEBUG > ALL (低)-->
<level value="ALL"/>
@@ -203,7 +188,6 @@
<assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0"/>
@@ -212,7 +196,6 @@
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
@@ -229,7 +212,6 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>

4
Reportapi/MyCode.Project.ZHMDGenerateCode/App.config
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
For more information on how to configure your ASP.NET application, please visit
https://go.microsoft.com/fwlink/?LinkId=301879
@@ -163,4 +163,4 @@
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
</compilers>
</system.codedom>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

2
Reportapi/MyCode.Project.ZHMDGenerateCode/MyCode.Project.ZHMDGenerateCode.csproj
View File

@@ -8,7 +8,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>MyCode.Project.GenerateCode</RootNamespace>
<AssemblyName>MyCode.Project.GenerateCode</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />