This commit is contained in:
老道 2022-10-08 12:22:46 +08:00
parent 85b12c909e
commit 074bc50def
39 changed files with 206 additions and 170 deletions

View File

@ -58,7 +58,7 @@
<probing privatePath="Dev;Library;Cef" />
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>

View File

@ -162,8 +162,7 @@
<HintPath>..\Debug\Grant.Framework.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\DLL\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Robot.Framework, Version=4.5.2101.7, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>

View File

@ -435,127 +435,129 @@ namespace FLSystem.Forms
//}
#endregion
var wphCount = CpsClient.Members.Count(f => f.cpstype == CpsType.);
#region
//var wphCount = CpsClient.Members.Count(f => f.cpstype == CpsType.唯品联盟);
var robots = session.FindRobots();
//if (wphCount == 0 && (WphNav == null || WphNav == "0"))
if (wphCount == 0 && robots != null && robots.Count != 0)
{
if (!Util.AppConfig_ExistItem("ShowWphAd"))
Util.AppConfig_AddItem("ShowWphAd", "1");
var ShowWphAd = Util.AppConfig_GetValue("ShowWphAd");
if (ShowWphAd == "1")
{
Thread th = new Thread(delegate ()
{
Thread.Sleep(5000);
try
{
var Rst = MessageBox.Show("请尽快设置唯品会联盟,目前唯品会高消费年轻人群剧增,是否立即设置?", "询问", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (Rst != DialogResult.Yes)
{
Rst = MessageBox.Show("唯品会设置只需要1分钟,您确定要放弃吗?(≈1个亿)", "询问", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (Rst == DialogResult.Yes)
{
Util.AppConfig_ModifyItem("ShowWphAd", "0");
return;
}
}
Rst = MessageBox.Show("您是否已经有唯品会账号,点击Yes登录唯品会,点击No注册唯品会", "询问", MessageBoxButtons.YesNo);
if (Rst == DialogResult.No)
{
var form = new WphRegisterForm();
form.ShowDialog();
}
//登录唯品会
var cps_member = LoginCps(CpsType.);
if (cps_member == null)
//throw new Exception("唯品会cps对象为空,可能登录异常");
return;
//打开唯品会插件
if (PluginClient.Plugins != null)
{
var plugin = PluginClient.Plugins.FirstOrDefault(f => f.Name == "唯品会返利");
if (plugin != null)
{
PluginClient.UnInstall(plugin);
Thread.Sleep(200);
PluginClient.Install(plugin);
}
}
//创建推广位,判断是否有推广位,没有推广位创建一个推广位,有推广位,给没有设置推广位的机器人设置推广位
#region 广
var api = CpsClient.CreateWeipinhuiRequest(cps_member);
var pidResult = WeipinhuiApi.GetWphTgw(api);
if (result != null)
{
//推广位为空,创建推广位
if (pidResult.total == 0)
WeipinhuiApi.CreateWphTgw(api);
pidResult = WeipinhuiApi.GetWphTgw(api);
if (pidResult != null && pidResult.pidInfoList != null && pidResult.total != 0)
{
var tmp = pidResult.pidInfoList[0];
if (tmp != null)
{
var tgw = new Tuiguangwei()
{
Member = cps_member,
Name = tmp.pidName,
Pid = tmp.pid
};
// 设置推广位
var robotList = session.FindRobots();
foreach (var robot in robotList)
{
setWphTgw((int)robot.id, tgw);
}
}
}
}
#endregion
}
catch (Exception ex)
{
EventClient.OnEvent("引导设置唯品会异常", $"{ex.Message} - {ex.StackTrace}");
}
finally
{
////监听刷新
//PluginClient.LodingPlugin();
}
//1.搞个唯品会注册页
//2.打开联盟登录页,自动登录后关闭窗口即可
//3.自动启用唯品会插件,并设置好推广位
//var form = new WPHNavForm();
//if (form.ShowDialog() == DialogResult.OK)
//var robots = session.FindRobots();
////if (wphCount == 0 && (WphNav == null || WphNav == "0"))
//if (wphCount == 0 && robots != null && robots.Count != 0)
//{
// //下次检测到唯品会未登录是否提示
// Util.AppConfig_ModifyItem("WphNav", form.isIgnore ? "1" : "0");
//}
});
// if (!Util.AppConfig_ExistItem("ShowWphAd"))
// Util.AppConfig_AddItem("ShowWphAd", "1");
// var ShowWphAd = Util.AppConfig_GetValue("ShowWphAd");
// if (ShowWphAd == "1")
// {
// Thread th = new Thread(delegate ()
// {
// Thread.Sleep(5000);
// try
// {
// var Rst = MessageBox.Show("请尽快设置唯品会联盟,目前唯品会高消费年轻人群剧增,是否立即设置?", "询问", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
// if (Rst != DialogResult.Yes)
// {
// Rst = MessageBox.Show("唯品会设置只需要1分钟,您确定要放弃吗?(≈1个亿)", "询问", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
// if (Rst == DialogResult.Yes)
// {
// Util.AppConfig_ModifyItem("ShowWphAd", "0");
// return;
// }
// }
th.ApartmentState = ApartmentState.STA; //属性设置成单线程
th.IsBackground = true;
th.Start();
}
}
else
{
if (!Util.AppConfig_ExistItem("ShowWphAd"))
Util.AppConfig_AddItem("ShowWphAd", "0");
else
Util.AppConfig_ModifyItem("ShowWphAd", "0");
}
// Rst = MessageBox.Show("您是否已经有唯品会账号,点击Yes登录唯品会,点击No注册唯品会", "询问", MessageBoxButtons.YesNo);
// if (Rst == DialogResult.No)
// {
// var form = new WphRegisterForm();
// form.ShowDialog();
// }
// //登录唯品会
// var cps_member = LoginCps(CpsType.唯品联盟);
// if (cps_member == null)
// //throw new Exception("唯品会cps对象为空,可能登录异常");
// return;
// //打开唯品会插件
// if (PluginClient.Plugins != null)
// {
// var plugin = PluginClient.Plugins.FirstOrDefault(f => f.Name == "唯品会返利");
// if (plugin != null)
// {
// PluginClient.UnInstall(plugin);
// Thread.Sleep(200);
// PluginClient.Install(plugin);
// }
// }
// //创建推广位,判断是否有推广位,没有推广位创建一个推广位,有推广位,给没有设置推广位的机器人设置推广位
// #region 获取唯品会推广位
// var api = CpsClient.CreateWeipinhuiRequest(cps_member);
// var pidResult = WeipinhuiApi.GetWphTgw(api);
// if (result != null)
// {
// //推广位为空,创建推广位
// if (pidResult.total == 0)
// WeipinhuiApi.CreateWphTgw(api);
// pidResult = WeipinhuiApi.GetWphTgw(api);
// if (pidResult != null && pidResult.pidInfoList != null && pidResult.total != 0)
// {
// var tmp = pidResult.pidInfoList[0];
// if (tmp != null)
// {
// var tgw = new Tuiguangwei()
// {
// Member = cps_member,
// Name = tmp.pidName,
// Pid = tmp.pid
// };
// // 设置推广位
// var robotList = session.FindRobots();
// foreach (var robot in robotList)
// {
// setWphTgw((int)robot.id, tgw);
// }
// }
// }
// }
// #endregion
// }
// catch (Exception ex)
// {
// EventClient.OnEvent("引导设置唯品会异常", $"{ex.Message} - {ex.StackTrace}");
// }
// finally
// {
// ////监听刷新
// //PluginClient.LodingPlugin();
// }
// //1.搞个唯品会注册页
// //2.打开联盟登录页,自动登录后关闭窗口即可
// //3.自动启用唯品会插件,并设置好推广位
// //var form = new WPHNavForm();
// //if (form.ShowDialog() == DialogResult.OK)
// //{
// // //下次检测到唯品会未登录是否提示
// // Util.AppConfig_ModifyItem("WphNav", form.isIgnore ? "1" : "0");
// //}
// });
// th.ApartmentState = ApartmentState.STA; //属性设置成单线程
// th.IsBackground = true;
// th.Start();
// }
//}
//else
//{
// if (!Util.AppConfig_ExistItem("ShowWphAd"))
// Util.AppConfig_AddItem("ShowWphAd", "0");
// else
// Util.AppConfig_ModifyItem("ShowWphAd", "0");
//}
#endregion
//#region MyRegion
//var ss = Util.Read<Dictionary<string, object>>("插件-积分管理-配置");

View File

@ -3246,6 +3246,6 @@
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>129</value>
<value>55</value>
</metadata>
</root>

View File

@ -2,4 +2,5 @@
<packages>
<package id="EO.WebBrowser" version="21.3.18" targetFramework="net461" />
<package id="EO.WebBrowser.WinForm" version="21.3.18" targetFramework="net461" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
</packages>

View File

@ -56,10 +56,8 @@
<HintPath>..\Debug\HttpHelper.dll</HintPath>
</Reference>
<Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>DLL\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="PCRobot.Pack">
<HintPath>..\PCRobot.Pack\bin\Debug\PCRobot.Pack.dll</HintPath>

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FluentScheduler" version="5.5.1" targetFramework="net461" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
<package id="protobuf-net" version="3.0.101" targetFramework="net461" />
<package id="protobuf-net.Core" version="3.0.101" targetFramework="net461" />
<package id="SuperSocket.ClientEngine" version="0.10.0" targetFramework="net461" />

View File

@ -72,10 +72,8 @@
<HintPath>..\..\Debug\HttpHelper.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DLL\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NPOI.HSSF">
<HintPath>..\..\DLL\NPOI.HSSF.dll</HintPath>
@ -188,6 +186,7 @@
<DependentUpon>MainForm.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>

View File

@ -44,9 +44,7 @@
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Debug\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SqlSugar">
<HintPath>..\..\Debug\SqlSugar.dll</HintPath>
@ -93,6 +91,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Resources\转账.jpg" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
</packages>

View File

@ -68,9 +68,7 @@
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Debug\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SqlSugar, Version=4.9.9.3, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@ -134,6 +132,7 @@
<DependentUpon>MainForm.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
</packages>

View File

@ -61,10 +61,8 @@
<HintPath>..\..\Debug\HttpHelper.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Debug\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SqlSugar">
<HintPath>..\..\Debug\SqlSugar.dll</HintPath>
@ -122,6 +120,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Resources\抖音.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
</packages>

View File

@ -66,10 +66,8 @@
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.JScript" />
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\PCRobot\DLL\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SqlSugar">
<HintPath>..\..\Debug\SqlSugar.dll</HintPath>
@ -122,6 +120,7 @@
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
</packages>

View File

@ -66,9 +66,7 @@
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Debug\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SqlSugar, Version=4.9.9.3, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@ -116,6 +114,7 @@
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
</packages>

View File

@ -68,9 +68,7 @@
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Debug\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SqlSugar">
<HintPath>..\..\Debug\SqlSugar.dll</HintPath>
@ -115,6 +113,7 @@
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
</packages>

View File

@ -99,9 +99,7 @@
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Debug\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SqlSugar, Version=4.9.9.3, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@ -164,6 +162,7 @@
<Compile Include="SessionExt.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Properties\licenses.licx" />
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
</packages>

View File

@ -64,10 +64,8 @@
<HintPath>..\..\Debug\HttpHelper.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Debug\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SqlSugar">
<HintPath>..\..\Debug\SqlSugar.dll</HintPath>
@ -117,6 +115,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Resources\苏宁.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
</packages>

View File

@ -73,9 +73,7 @@
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Debug\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SqlSugar, Version=4.9.9.3, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@ -124,6 +122,7 @@
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<SubType>Designer</SubType>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
</packages>

View File

@ -64,10 +64,8 @@
<HintPath>..\..\Debug\HttpHelper.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Debug\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SqlSugar, Version=4.9.9.3, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@ -176,6 +174,7 @@
<EmbeddedResource Include="XtraForm1.resx">
<DependentUpon>XtraForm1.cs</DependentUpon>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
</packages>

View File

@ -66,9 +66,7 @@
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Debug\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SqlSugar">
<HintPath>..\..\Debug\SqlSugar.dll</HintPath>
@ -113,6 +111,7 @@
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
</packages>

View File

@ -74,10 +74,8 @@
<HintPath>..\..\Debug\HttpHelper.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Debug\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="SqlSugar, Version=4.9.9.3, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@ -185,6 +183,7 @@
<EmbeddedResource Include="XtraForm1.resx">
<DependentUpon>XtraForm1.cs</DependentUpon>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
</packages>

View File

@ -136,9 +136,8 @@
<Reference Include="Microsoft.Owin.StaticFiles">
<HintPath>..\..\DLL\Microsoft.Owin.StaticFiles.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Debug\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

View File

@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />

View File

@ -8,6 +8,7 @@
<package id="K4os.Compression.LZ4.Streams" version="1.1.11" targetFramework="net461" />
<package id="K4os.Hash.xxHash" version="1.0.6" targetFramework="net461" />
<package id="log4net" version="2.0.8" targetFramework="net461" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
<package id="sqlSugar" version="4.9.9.3" targetFramework="net461" />
<package id="SSH.NET" version="2016.1.0" targetFramework="net461" />
<package id="SuperSocket" version="1.6.6.1" targetFramework="net461" />

View File

@ -20,7 +20,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />

View File

@ -66,8 +66,7 @@
<HintPath>..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DLL\Newtonsoft.Json.dll</HintPath>
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="PCRobot.Pack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

View File

@ -3,6 +3,7 @@
<package id="EntityFramework" version="6.3.0" targetFramework="net461" />
<package id="log4net" version="2.0.3" targetFramework="net461" />
<package id="Microsoft.VisualStudio.Azure.CodeAnalysis" version="0.5.0-beta" targetFramework="net40" developmentDependency="true" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
<package id="NLog" version="4.5.4" targetFramework="net461" />
<package id="sqlSugar" version="4.9.9.3" targetFramework="net461" />
<package id="SuperSocket" version="1.6.6.1" targetFramework="net461" />