diff --git a/FLSystem/App.config b/FLSystem/App.config index ef694b0..33c6568 100644 --- a/FLSystem/App.config +++ b/FLSystem/App.config @@ -58,7 +58,7 @@ - + diff --git a/FLSystem/FLSystem.csproj b/FLSystem/FLSystem.csproj index e7813dd..fcf902f 100644 --- a/FLSystem/FLSystem.csproj +++ b/FLSystem/FLSystem.csproj @@ -162,8 +162,7 @@ ..\Debug\Grant.Framework.dll - False - ..\DLL\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll False diff --git a/FLSystem/Forms/main.cs b/FLSystem/Forms/main.cs index 6dea30e..4aed18c 100644 --- a/FLSystem/Forms/main.cs +++ b/FLSystem/Forms/main.cs @@ -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; - } - } + //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(); - } + // 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; + // //登录唯品会 + // 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 (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); + // if (result != null) + // { + // //推广位为空,创建推广位 + // if (pidResult.total == 0) + // WeipinhuiApi.CreateWphTgw(api); - pidResult = WeipinhuiApi.GetWphTgw(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 - }; + // 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(); - } + // // 设置推广位 + // 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.自动启用唯品会插件,并设置好推广位 + // //1.搞个唯品会注册页 + // //2.打开联盟登录页,自动登录后关闭窗口即可 + // //3.自动启用唯品会插件,并设置好推广位 - //var form = new WPHNavForm(); - //if (form.ShowDialog() == DialogResult.OK) - //{ - // //下次检测到唯品会未登录是否提示 - // Util.AppConfig_ModifyItem("WphNav", form.isIgnore ? "1" : "0"); - //} - }); + // //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"); - } + // 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>("插件-积分管理-配置"); diff --git a/FLSystem/Forms/main.resx b/FLSystem/Forms/main.resx index 2f0ce04..7573dd7 100644 --- a/FLSystem/Forms/main.resx +++ b/FLSystem/Forms/main.resx @@ -3246,6 +3246,6 @@ - 129 + 55 \ No newline at end of file diff --git a/FLSystem/packages.config b/FLSystem/packages.config index 7575f8e..30c963d 100644 --- a/FLSystem/packages.config +++ b/FLSystem/packages.config @@ -2,4 +2,5 @@ + \ No newline at end of file diff --git a/PCRobot/DLL/Newtonsoft.Json.dll b/PCRobot/DLL/Newtonsoft.Json.dll1 similarity index 100% rename from PCRobot/DLL/Newtonsoft.Json.dll rename to PCRobot/DLL/Newtonsoft.Json.dll1 diff --git a/PCRobot/PCRobot.csproj b/PCRobot/PCRobot.csproj index e59473a..e1a025a 100644 --- a/PCRobot/PCRobot.csproj +++ b/PCRobot/PCRobot.csproj @@ -56,10 +56,8 @@ ..\Debug\HttpHelper.dll - - False - DLL\Newtonsoft.Json.dll - True + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll ..\PCRobot.Pack\bin\Debug\PCRobot.Pack.dll diff --git a/PCRobot/packages.config b/PCRobot/packages.config index 1c9526d..fdb390a 100644 --- a/PCRobot/packages.config +++ b/PCRobot/packages.config @@ -1,6 +1,7 @@  + diff --git a/应用/BackupAndImport/BackupAndImport.csproj b/应用/BackupAndImport/BackupAndImport.csproj index 36d8ab2..065ea44 100644 --- a/应用/BackupAndImport/BackupAndImport.csproj +++ b/应用/BackupAndImport/BackupAndImport.csproj @@ -72,10 +72,8 @@ ..\..\Debug\HttpHelper.dll False - - False - ..\..\DLL\Newtonsoft.Json.dll - False + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll ..\..\DLL\NPOI.HSSF.dll @@ -188,6 +186,7 @@ MainForm.cs Designer + ResXFileCodeGenerator diff --git a/应用/CSIMTurnMoney/CSIMTurnMoney.csproj b/应用/CSIMTurnMoney/CSIMTurnMoney.csproj index ac1e819..e9b056f 100644 --- a/应用/CSIMTurnMoney/CSIMTurnMoney.csproj +++ b/应用/CSIMTurnMoney/CSIMTurnMoney.csproj @@ -44,9 +44,7 @@ False - False - ..\..\Debug\Newtonsoft.Json.dll - False + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll ..\..\Debug\SqlSugar.dll @@ -93,6 +91,7 @@ + diff --git a/应用/CSIMTurnMoney/packages.config b/应用/CSIMTurnMoney/packages.config new file mode 100644 index 0000000..ce3dc38 --- /dev/null +++ b/应用/CSIMTurnMoney/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/应用/CouponsSend/CouponsSend.csproj b/应用/CouponsSend/CouponsSend.csproj index 5c32f42..27f83ad 100644 --- a/应用/CouponsSend/CouponsSend.csproj +++ b/应用/CouponsSend/CouponsSend.csproj @@ -68,9 +68,7 @@ False - False - ..\..\Debug\Newtonsoft.Json.dll - False + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll False @@ -134,6 +132,7 @@ MainForm.cs Designer + ResXFileCodeGenerator diff --git a/应用/CouponsSend/packages.config b/应用/CouponsSend/packages.config new file mode 100644 index 0000000..ce3dc38 --- /dev/null +++ b/应用/CouponsSend/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/应用/DYRebate/DYRebate.csproj b/应用/DYRebate/DYRebate.csproj index f88600e..086fda7 100644 --- a/应用/DYRebate/DYRebate.csproj +++ b/应用/DYRebate/DYRebate.csproj @@ -61,10 +61,8 @@ ..\..\Debug\HttpHelper.dll False - - False - ..\..\Debug\Newtonsoft.Json.dll - False + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll ..\..\Debug\SqlSugar.dll @@ -122,6 +120,7 @@ + diff --git a/应用/DYRebate/packages.config b/应用/DYRebate/packages.config new file mode 100644 index 0000000..ce3dc38 --- /dev/null +++ b/应用/DYRebate/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/应用/EncourageUser/EncourageUser.csproj b/应用/EncourageUser/EncourageUser.csproj index eb2cea8..e91cd51 100644 --- a/应用/EncourageUser/EncourageUser.csproj +++ b/应用/EncourageUser/EncourageUser.csproj @@ -66,10 +66,8 @@ False - - False - ..\..\PCRobot\DLL\Newtonsoft.Json.dll - False + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll ..\..\Debug\SqlSugar.dll @@ -122,6 +120,7 @@ MainForm.cs + ResXFileCodeGenerator diff --git a/应用/EncourageUser/packages.config b/应用/EncourageUser/packages.config new file mode 100644 index 0000000..ce3dc38 --- /dev/null +++ b/应用/EncourageUser/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/应用/JDRebate/JDRebate.csproj b/应用/JDRebate/JDRebate.csproj index 2dffab9..010d89c 100644 --- a/应用/JDRebate/JDRebate.csproj +++ b/应用/JDRebate/JDRebate.csproj @@ -66,9 +66,7 @@ False - False - ..\..\Debug\Newtonsoft.Json.dll - False + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll False @@ -116,6 +114,7 @@ MainForm.cs + ResXFileCodeGenerator diff --git a/应用/JDRebate/packages.config b/应用/JDRebate/packages.config new file mode 100644 index 0000000..ce3dc38 --- /dev/null +++ b/应用/JDRebate/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/应用/KSRebate/KSRebate.csproj b/应用/KSRebate/KSRebate.csproj index ee83fc6..fa87ce6 100644 --- a/应用/KSRebate/KSRebate.csproj +++ b/应用/KSRebate/KSRebate.csproj @@ -68,9 +68,7 @@ False - False - ..\..\Debug\Newtonsoft.Json.dll - False + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll ..\..\Debug\SqlSugar.dll @@ -115,6 +113,7 @@ MainForm.cs + ResXFileCodeGenerator diff --git a/应用/KSRebate/packages.config b/应用/KSRebate/packages.config new file mode 100644 index 0000000..ce3dc38 --- /dev/null +++ b/应用/KSRebate/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/应用/PDDRebate/PDDRebate.csproj b/应用/PDDRebate/PDDRebate.csproj index a3d3990..67c1b08 100644 --- a/应用/PDDRebate/PDDRebate.csproj +++ b/应用/PDDRebate/PDDRebate.csproj @@ -99,9 +99,7 @@ False - False - ..\..\Debug\Newtonsoft.Json.dll - False + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll False @@ -164,6 +162,7 @@ + MainForm.cs diff --git a/应用/PDDRebate/packages.config b/应用/PDDRebate/packages.config new file mode 100644 index 0000000..ce3dc38 --- /dev/null +++ b/应用/PDDRebate/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/应用/SNRebate/SNRebate.csproj b/应用/SNRebate/SNRebate.csproj index af1c381..1ece129 100644 --- a/应用/SNRebate/SNRebate.csproj +++ b/应用/SNRebate/SNRebate.csproj @@ -64,10 +64,8 @@ ..\..\Debug\HttpHelper.dll False - - False - ..\..\Debug\Newtonsoft.Json.dll - False + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll ..\..\Debug\SqlSugar.dll @@ -117,6 +115,7 @@ + diff --git a/应用/SNRebate/packages.config b/应用/SNRebate/packages.config new file mode 100644 index 0000000..ce3dc38 --- /dev/null +++ b/应用/SNRebate/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/应用/TBRebate/TBRebate.csproj b/应用/TBRebate/TBRebate.csproj index 898cfb8..8da865d 100644 --- a/应用/TBRebate/TBRebate.csproj +++ b/应用/TBRebate/TBRebate.csproj @@ -73,9 +73,7 @@ False - False - ..\..\Debug\Newtonsoft.Json.dll - False + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll False @@ -124,6 +122,7 @@ MainForm.cs + Designer diff --git a/应用/TBRebate/packages.config b/应用/TBRebate/packages.config new file mode 100644 index 0000000..ce3dc38 --- /dev/null +++ b/应用/TBRebate/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/应用/UserFission/UserFission.csproj b/应用/UserFission/UserFission.csproj index d754b67..e2268fb 100644 --- a/应用/UserFission/UserFission.csproj +++ b/应用/UserFission/UserFission.csproj @@ -64,10 +64,8 @@ ..\..\Debug\HttpHelper.dll False - - False - ..\..\Debug\Newtonsoft.Json.dll - False + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll False @@ -176,6 +174,7 @@ XtraForm1.cs + ResXFileCodeGenerator diff --git a/应用/UserFission/packages.config b/应用/UserFission/packages.config new file mode 100644 index 0000000..ce3dc38 --- /dev/null +++ b/应用/UserFission/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/应用/WPHRebate/WPHRebate.csproj b/应用/WPHRebate/WPHRebate.csproj index e6f12a2..a3de56b 100644 --- a/应用/WPHRebate/WPHRebate.csproj +++ b/应用/WPHRebate/WPHRebate.csproj @@ -66,9 +66,7 @@ False - False - ..\..\Debug\Newtonsoft.Json.dll - False + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll ..\..\Debug\SqlSugar.dll @@ -113,6 +111,7 @@ MainForm.cs + ResXFileCodeGenerator diff --git a/应用/WPHRebate/packages.config b/应用/WPHRebate/packages.config new file mode 100644 index 0000000..ce3dc38 --- /dev/null +++ b/应用/WPHRebate/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/应用/Weixin.CircleTools/Weixin.CircleTools.csproj b/应用/Weixin.CircleTools/Weixin.CircleTools.csproj index 902bead..1e97168 100644 --- a/应用/Weixin.CircleTools/Weixin.CircleTools.csproj +++ b/应用/Weixin.CircleTools/Weixin.CircleTools.csproj @@ -74,10 +74,8 @@ ..\..\Debug\HttpHelper.dll False - - False - ..\..\Debug\Newtonsoft.Json.dll - False + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll False @@ -185,6 +183,7 @@ XtraForm1.cs + ResXFileCodeGenerator diff --git a/应用/Weixin.CircleTools/packages.config b/应用/Weixin.CircleTools/packages.config new file mode 100644 index 0000000..ce3dc38 --- /dev/null +++ b/应用/Weixin.CircleTools/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/类库/Api.Framework/Api.Framework.csproj b/类库/Api.Framework/Api.Framework.csproj index 71135c0..c39189f 100644 --- a/类库/Api.Framework/Api.Framework.csproj +++ b/类库/Api.Framework/Api.Framework.csproj @@ -136,9 +136,8 @@ ..\..\DLL\Microsoft.Owin.StaticFiles.dll - - False - ..\..\Debug\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll False diff --git a/类库/Api.Framework/app.config b/类库/Api.Framework/app.config index cdc92b8..7b6b4ef 100644 --- a/类库/Api.Framework/app.config +++ b/类库/Api.Framework/app.config @@ -4,7 +4,7 @@ - + diff --git a/类库/Api.Framework/packages.config b/类库/Api.Framework/packages.config index 324568d..5836086 100644 --- a/类库/Api.Framework/packages.config +++ b/类库/Api.Framework/packages.config @@ -8,6 +8,7 @@ + diff --git a/类库/Chat.Framework/App.config b/类库/Chat.Framework/App.config index ca97710..0b688ed 100644 --- a/类库/Chat.Framework/App.config +++ b/类库/Chat.Framework/App.config @@ -20,7 +20,7 @@ - + diff --git a/类库/Chat.Framework/Chat.Framework.csproj b/类库/Chat.Framework/Chat.Framework.csproj index 5a9df0f..dc7bd00 100644 --- a/类库/Chat.Framework/Chat.Framework.csproj +++ b/类库/Chat.Framework/Chat.Framework.csproj @@ -66,8 +66,7 @@ ..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - False - ..\..\DLL\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll False diff --git a/类库/Chat.Framework/packages.config b/类库/Chat.Framework/packages.config index 4e47018..3b7986b 100644 --- a/类库/Chat.Framework/packages.config +++ b/类库/Chat.Framework/packages.config @@ -3,6 +3,7 @@ +