zhoufan лет назад: 7
Родитель
Сommit
97a0a00f8d
34 измененных файлов с 146 добавлено и 70449 удалено
  1. 1 0
      .gitignore
  2. 2 1
      1.代码/HySoftSMS/HySoftSMS.BLL/HySoftSMS.BLL.csproj
  3. 2 1
      1.代码/HySoftSMS/HySoftSMS.DAL/HySoftSMS.DAL.csproj
  4. BIN
      1.代码/HySoftSMS/HySoftSMS.DAL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  5. 2 1
      1.代码/HySoftSMS/HySoftSMS.DBUtility/HySoftSMS.DBUtility.csproj
  6. BIN
      1.代码/HySoftSMS/HySoftSMS.DBUtility/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  7. 2 1
      1.代码/HySoftSMS/HySoftSMS.Model/HySoftSMS.Model.csproj
  8. BIN
      1.代码/HySoftSMS/HySoftSMS.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  9. 8 5
      1.代码/HySoftSMS/HySoftSMS/App.config
  10. 24 0
      1.代码/HySoftSMS/HySoftSMS/FrmMain.Designer.cs
  11. 41 27
      1.代码/HySoftSMS/HySoftSMS/FrmMain.cs
  12. 8 5
      1.代码/HySoftSMS/HySoftSMS/HySoftSMS.csproj
  13. 26 34
      1.代码/HySoftSMS/HySoftSMS/Properties/Resources.Designer.cs
  14. 13 17
      1.代码/HySoftSMS/HySoftSMS/Properties/Settings.Designer.cs
  15. 0 1
      1.代码/HySoftSMS/HySoftSMS/Utils.cs
  16. 1 1
      1.代码/HySoftSMS/HySoftSMS/packages.config
  17. 14 2
      1.代码/HySoftSMS/HySoftSMS/taskitem.cs
  18. BIN
      1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/Newtonsoft.Json.10.0.1.nupkg
  19. BIN
      1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/net20/Newtonsoft.Json.dll
  20. 0 9807
      1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/net20/Newtonsoft.Json.xml
  21. BIN
      1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/net35/Newtonsoft.Json.dll
  22. 0 8936
      1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/net35/Newtonsoft.Json.xml
  23. BIN
      1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/net40/Newtonsoft.Json.dll
  24. 0 9136
      1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/net40/Newtonsoft.Json.xml
  25. BIN
      1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/net45/Newtonsoft.Json.dll
  26. 0 10752
      1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/net45/Newtonsoft.Json.xml
  27. BIN
      1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/netstandard1.0/Newtonsoft.Json.dll
  28. 0 10504
      1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/netstandard1.0/Newtonsoft.Json.xml
  29. BIN
      1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/netstandard1.3/Newtonsoft.Json.dll
  30. 0 10596
      1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/netstandard1.3/Newtonsoft.Json.xml
  31. BIN
      1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/portable-net45+win8+wpa81+wp8/Newtonsoft.Json.dll
  32. 0 10504
      1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/portable-net45+win8+wpa81+wp8/Newtonsoft.Json.xml
  33. 0 116
      1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/tools/install.ps1
  34. 2 2
      1.代码/XKPCallCenter/XKPCallCenter.Web/NewTaskManage/templatelist.aspx

+ 1 - 0
.gitignore

@@ -36,3 +36,4 @@
36 36
 1.代码/HySoftSMS/HySoftSMS.BLL/obj/
37 37
 1.代码/HySoftSMS/HySoftSMS.BLL/bin/
38 38
 1.代码/HySoftSMS/.vs/
39
+1.代码/HySoftSMS/packages/

+ 2 - 1
1.代码/HySoftSMS/HySoftSMS.BLL/HySoftSMS.BLL.csproj

@@ -9,8 +9,9 @@
9 9
     <AppDesignerFolder>Properties</AppDesignerFolder>
10 10
     <RootNamespace>HySoftSMS_BLL</RootNamespace>
11 11
     <AssemblyName>HySoftSMS.BLL</AssemblyName>
12
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13 13
     <FileAlignment>512</FileAlignment>
14
+    <TargetFrameworkProfile />
14 15
   </PropertyGroup>
15 16
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16 17
     <DebugSymbols>true</DebugSymbols>

+ 2 - 1
1.代码/HySoftSMS/HySoftSMS.DAL/HySoftSMS.DAL.csproj

@@ -9,8 +9,9 @@
9 9
     <AppDesignerFolder>Properties</AppDesignerFolder>
10 10
     <RootNamespace>HySoftSMS.DAL</RootNamespace>
11 11
     <AssemblyName>HySoftSMS.DAL</AssemblyName>
12
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13 13
     <FileAlignment>512</FileAlignment>
14
+    <TargetFrameworkProfile />
14 15
   </PropertyGroup>
15 16
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16 17
     <DebugSymbols>true</DebugSymbols>

BIN
1.代码/HySoftSMS/HySoftSMS.DAL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache


+ 2 - 1
1.代码/HySoftSMS/HySoftSMS.DBUtility/HySoftSMS.DBUtility.csproj

@@ -9,8 +9,9 @@
9 9
     <AppDesignerFolder>Properties</AppDesignerFolder>
10 10
     <RootNamespace>HySoftSMS.DBUtility</RootNamespace>
11 11
     <AssemblyName>HySoftSMS.DBUtility</AssemblyName>
12
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13 13
     <FileAlignment>512</FileAlignment>
14
+    <TargetFrameworkProfile />
14 15
   </PropertyGroup>
15 16
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16 17
     <DebugSymbols>true</DebugSymbols>

BIN
1.代码/HySoftSMS/HySoftSMS.DBUtility/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache


+ 2 - 1
1.代码/HySoftSMS/HySoftSMS.Model/HySoftSMS.Model.csproj

@@ -9,8 +9,9 @@
9 9
     <AppDesignerFolder>Properties</AppDesignerFolder>
10 10
     <RootNamespace>HySoftSMS.Model</RootNamespace>
11 11
     <AssemblyName>HySoftSMS.Model</AssemblyName>
12
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13 13
     <FileAlignment>512</FileAlignment>
14
+    <TargetFrameworkProfile />
14 15
   </PropertyGroup>
15 16
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16 17
     <DebugSymbols>true</DebugSymbols>

BIN
1.代码/HySoftSMS/HySoftSMS.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache


+ 8 - 5
1.代码/HySoftSMS/HySoftSMS/App.config

@@ -1,11 +1,11 @@
1
-<?xml version="1.0" encoding="utf-8" ?>
1
+<?xml version="1.0" encoding="utf-8"?>
2 2
 <configuration>
3 3
     <startup> 
4
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
4
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
5 5
     </startup>
6 6
  <!--反射 -->
7 7
   <appSettings>
8
-    <add key="DAL" value="HySoftSMS.DAL" />
8
+    <add key="DAL" value="HySoftSMS.DAL"/>
9 9
   
10 10
    <!--产品名称:云通信短信API产品,开发者无需替换-->
11 11
     <add key="product" value="Dysmsapi"/>
@@ -43,10 +43,13 @@
43 43
     <add key="password" value="gszls800100"/>
44 44
     <!--签名-->
45 45
     <add key="sign" value="gszls800100"/>
46
+
47
+    <!--余额循环时间间隔-->
48
+    <add key="yueinterval" value="10000"/>
46 49
   </appSettings>
47 50
   <!--数据库连接字符串-->
48 51
   <connectionStrings>   
49 52
     <add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=GSZLS;"/>   
50 53
   </connectionStrings>
51
-  <system.windows.forms jitDebugging="true" />
52
-</configuration>
54
+  <system.windows.forms jitDebugging="true"/>
55
+</configuration>

+ 24 - 0
1.代码/HySoftSMS/HySoftSMS/FrmMain.Designer.cs

@@ -32,6 +32,8 @@
32 32
             this.label1 = new System.Windows.Forms.Label();
33 33
             this.btnStart = new System.Windows.Forms.Button();
34 34
             this.btnEnd = new System.Windows.Forms.Button();
35
+            this.label2 = new System.Windows.Forms.Label();
36
+            this.lbyue = new System.Windows.Forms.Label();
35 37
             this.SuspendLayout();
36 38
             // 
37 39
             // rtb1
@@ -75,11 +77,31 @@
75 77
             this.btnEnd.UseVisualStyleBackColor = true;
76 78
             this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
77 79
             // 
80
+            // label2
81
+            // 
82
+            this.label2.AutoSize = true;
83
+            this.label2.Location = new System.Drawing.Point(34, 95);
84
+            this.label2.Name = "label2";
85
+            this.label2.Size = new System.Drawing.Size(41, 12);
86
+            this.label2.TabIndex = 4;
87
+            this.label2.Text = "余额:";
88
+            // 
89
+            // lbyue
90
+            // 
91
+            this.lbyue.AutoSize = true;
92
+            this.lbyue.ForeColor = System.Drawing.Color.Red;
93
+            this.lbyue.Location = new System.Drawing.Point(36, 125);
94
+            this.lbyue.Name = "lbyue";
95
+            this.lbyue.Size = new System.Drawing.Size(23, 12);
96
+            this.lbyue.TabIndex = 5;
97
+            // 
78 98
             // FrmMain
79 99
             // 
80 100
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
81 101
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
82 102
             this.ClientSize = new System.Drawing.Size(422, 214);
103
+            this.Controls.Add(this.lbyue);
104
+            this.Controls.Add(this.label2);
83 105
             this.Controls.Add(this.btnEnd);
84 106
             this.Controls.Add(this.btnStart);
85 107
             this.Controls.Add(this.label1);
@@ -99,6 +121,8 @@
99 121
         private System.Windows.Forms.Label label1;
100 122
         private System.Windows.Forms.Button btnStart;
101 123
         private System.Windows.Forms.Button btnEnd;
124
+        private System.Windows.Forms.Label label2;
125
+        private System.Windows.Forms.Label lbyue;
102 126
     }
103 127
 }
104 128
 

+ 41 - 27
1.代码/HySoftSMS/HySoftSMS/FrmMain.cs

@@ -34,6 +34,7 @@ namespace HySoftSMS
34 34
         bool startsend = true;
35 35
         string logtxt = "";
36 36
         private int interval = 1000;//线程休眠时间
37
+        private int yueinterval = 60000;//线程休眠时间
37 38
         private void FrmMain_Load(object sender, EventArgs e)
38 39
         {
39 40
 
@@ -41,15 +42,7 @@ namespace HySoftSMS
41 42
             this.btnEnd.Enabled = true;
42 43
 
43 44
             getbalance();
44
-
45
-            if (balance > 1)
46
-            {
47
-                Logtxt("余额:" + balance);
48
-                logtxt += "余额:" + balance + "\n";
49
-                AsyncThreadUI.SetText(rtb1, logtxt, this);
50
-
51
-            }
52
-            else
45
+            if (balance <= 1)
53 46
             {
54 47
                 Logtxt("余额不足");
55 48
                 logtxt += DateTime.Now.ToString() + "  余额不足\n";
@@ -60,11 +53,41 @@ namespace HySoftSMS
60 53
             //开启线程
61 54
             Thread thread1 = new Thread(TimeEvent);
62 55
             thread1.Start();
56
+
57
+            yueinterval = Int32.Parse(ConfigurationManager.AppSettings["yueinterval"]);
58
+
59
+            //开启线程
60
+            Thread thread2 = new Thread(updateyue);
61
+            thread2.Start();
62
+        }
63
+
64
+        private void updateyue()
65
+        {
66
+
67
+            try
68
+            {
69
+                while (true)
70
+                {
71
+                    if (startsend)
72
+                    {
73
+                        getbalance();
74
+                        taskitem ti = new taskitem();
75
+                        ti.setbanlance(balance.ToString());
76
+                    }
77
+                    Thread.Sleep(yueinterval);
78
+                }
79
+            }
80
+            catch (Exception e)
81
+            {
82
+                Logtxt("线程异常:" + e.ToString());
83
+                logtxt += "线程异常:" + e.ToString() + "\n";
84
+                AsyncThreadUI.SetText(rtb1, logtxt, this);
85
+            }
63 86
         }
64 87
 
65 88
         static decimal balance = 0;
66 89
 
67
-        private  void TimeEvent()//(object sender, ElapsedEventArgs e)
90
+        private void TimeEvent()//(object sender, ElapsedEventArgs e)
68 91
         {
69 92
             try
70 93
             {
@@ -76,19 +99,8 @@ namespace HySoftSMS
76 99
                         {
77 100
                             startsendsms();
78 101
                         }
79
-                        else
80
-                        {
81
-                            getbalance();
82
-
83
-                            if (balance > 1)
84
-                            {
85
-                                Logtxt("余额:" + balance);
86
-                                logtxt += "余额:" + balance + "\n";
87
-                                AsyncThreadUI.SetText(rtb1, logtxt, this);
88
-                            }
89
-                        }
90 102
                     }
91
-                    Thread.Sleep(interval );
103
+                    Thread.Sleep(interval);
92 104
                 }
93 105
             }
94 106
             catch (Exception e)
@@ -103,7 +115,7 @@ namespace HySoftSMS
103 115
         /// <summary>
104 116
         /// 获取余额
105 117
         /// </summary>
106
-        private  void getbalance()
118
+        private void getbalance()
107 119
         {
108 120
             var url = ConfigurationManager.AppSettings["geturl"];
109 121
             var account = ConfigurationManager.AppSettings["account"];
@@ -113,17 +125,19 @@ namespace HySoftSMS
113 125
             var signcode = Utils.MD5(account + "+" + password + "+" + sign + "+" + DateTime.Now.ToString("yyyyMMdd"));
114 126
             var result = Utils.HttpGet(url + "?usercode=" + account + "&password=" + password + "&signcode=" + signcode);//.ToJObject();
115 127
             JObject jo0 = (JObject)JsonConvert.DeserializeObject(result);
116
-           
128
+
117 129
             if (jo0["state"].ToString() == "success")
118 130
             {
119 131
                 balance = decimal.Parse(jo0["data"].ToString());
132
+
133
+                this.lbyue.Text = balance.ToString() + "¥";
120 134
             }
121 135
         }
122 136
 
123 137
         /// <summary>
124 138
         /// 开始发送短信
125 139
         /// </summary>
126
-        public  void startsendsms()
140
+        public void startsendsms()
127 141
         {
128 142
             task tk = new task();
129 143
             taskitem ti = new taskitem();
@@ -155,12 +169,12 @@ namespace HySoftSMS
155 169
                         {
156 170
                             result = sendresult["message"].ToString();
157 171
                         }
158
-                        
172
+
159 173
                         Logtxt(item.号码 + ":" + (string.IsNullOrEmpty(result) ? "发送成功" : "发送失败,原因:" + result));
160 174
                         logtxt += item.号码 + ":" + (string.IsNullOrEmpty(result) ? "发送成功" : "发送失败,原因:" + result) + "\n";
161 175
                         AsyncThreadUI.SetText(rtb1, logtxt, this);
162 176
 
163
-                        bool bl = ti.SetSMSTaskItemSendResult(task.ID, item.ID, string.IsNullOrEmpty(result), result, balance.ToString());
177
+                        bool bl = ti.SetSMSTaskItemSendResult(task.ID, item.ID, string.IsNullOrEmpty(result), result, item.短信内容, balance.ToString());
164 178
                         if (bl)
165 179
                         {
166 180
                             Logtxt(item.号码 + ":更新任务成功");

+ 8 - 5
1.代码/HySoftSMS/HySoftSMS/HySoftSMS.csproj

@@ -9,9 +9,10 @@
9 9
     <AppDesignerFolder>Properties</AppDesignerFolder>
10 10
     <RootNamespace>HySoftSMS</RootNamespace>
11 11
     <AssemblyName>HySoftSMS</AssemblyName>
12
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
12
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13 13
     <FileAlignment>512</FileAlignment>
14 14
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15
+    <TargetFrameworkProfile />
15 16
   </PropertyGroup>
16 17
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17 18
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -53,9 +54,8 @@
53 54
     <Prefer32Bit>true</Prefer32Bit>
54 55
   </PropertyGroup>
55 56
   <ItemGroup>
56
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
57
-      <HintPath>..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
58
-      <Private>True</Private>
57
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
58
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
59 59
     </Reference>
60 60
     <Reference Include="System" />
61 61
     <Reference Include="System.configuration" />
@@ -95,6 +95,7 @@
95 95
     <Compile Include="Properties\Resources.Designer.cs">
96 96
       <AutoGen>True</AutoGen>
97 97
       <DependentUpon>Resources.resx</DependentUpon>
98
+      <DesignTime>True</DesignTime>
98 99
     </Compile>
99 100
     <None Include="packages.config" />
100 101
     <None Include="Properties\Settings.settings">
@@ -108,7 +109,9 @@
108 109
     </Compile>
109 110
   </ItemGroup>
110 111
   <ItemGroup>
111
-    <None Include="App.config" />
112
+    <None Include="App.config">
113
+      <SubType>Designer</SubType>
114
+    </None>
112 115
   </ItemGroup>
113 116
   <ItemGroup>
114 117
     <ProjectReference Include="..\HySoftSMS.BLL\HySoftSMS.BLL.csproj">

+ 26 - 34
1.代码/HySoftSMS/HySoftSMS/Properties/Resources.Designer.cs

@@ -1,69 +1,61 @@
1 1
 //------------------------------------------------------------------------------
2 2
 // <auto-generated>
3 3
 //     此代码由工具生成。
4
-//     运行时版本: 4.0.30319.42000
4
+//     运行时版本:4.0.30319.42000
5 5
 //
6
-//     对此文件的更改可能导致不正确的行为,如果
7
-//     重新生成代码,则所做更改将丢失。
6
+//     对此文件的更改可能导致不正确的行为,并且如果
7
+//     重新生成代码,这些更改将会丢失。
8 8
 // </auto-generated>
9 9
 //------------------------------------------------------------------------------
10 10
 
11
-namespace HySoftSMS.Properties
12
-{
13
-
14
-
11
+namespace HySoftSMS.Properties {
12
+    using System;
13
+    
14
+    
15 15
     /// <summary>
16
-    ///   强类型资源类,用于查找本地化字符串等。
16
+    ///   一个强类型资源类,用于查找本地化字符串等。
17 17
     /// </summary>
18 18
     // 此类是由 StronglyTypedResourceBuilder
19 19
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
20
-    // 若要添加或除成员,请编辑 .ResX 文件,然后重新运行 ResGen
20
+    // 若要添加或除成员,请编辑 .ResX 文件,然后重新运行 ResGen
21 21
     // (以 /str 作为命令选项),或重新生成 VS 项目。
22
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
22
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
23 23
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
24 24
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
25
-    internal class Resources
26
-    {
27
-
25
+    internal class Resources {
26
+        
28 27
         private static global::System.Resources.ResourceManager resourceMan;
29
-
28
+        
30 29
         private static global::System.Globalization.CultureInfo resourceCulture;
31
-
30
+        
32 31
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
33
-        internal Resources()
34
-        {
32
+        internal Resources() {
35 33
         }
36
-
34
+        
37 35
         /// <summary>
38
-        ///   返回此类使用的缓存 ResourceManager 实例。
36
+        ///   返回此类使用的缓存 ResourceManager 实例。
39 37
         /// </summary>
40 38
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
41
-        internal static global::System.Resources.ResourceManager ResourceManager
42
-        {
43
-            get
44
-            {
45
-                if ((resourceMan == null))
46
-                {
39
+        internal static global::System.Resources.ResourceManager ResourceManager {
40
+            get {
41
+                if (object.ReferenceEquals(resourceMan, null)) {
47 42
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HySoftSMS.Properties.Resources", typeof(Resources).Assembly);
48 43
                     resourceMan = temp;
49 44
                 }
50 45
                 return resourceMan;
51 46
             }
52 47
         }
53
-
48
+        
54 49
         /// <summary>
55
-        ///   覆盖当前线程的 CurrentUICulture 属性
56
-        ///   使用此强类型的资源类的资源查找
50
+        ///   使用此强类型资源类,为所有资源查找
51
+        ///   重写当前线程的 CurrentUICulture 属性
57 52
         /// </summary>
58 53
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
59
-        internal static global::System.Globalization.CultureInfo Culture
60
-        {
61
-            get
62
-            {
54
+        internal static global::System.Globalization.CultureInfo Culture {
55
+            get {
63 56
                 return resourceCulture;
64 57
             }
65
-            set
66
-            {
58
+            set {
67 59
                 resourceCulture = value;
68 60
             }
69 61
         }

+ 13 - 17
1.代码/HySoftSMS/HySoftSMS/Properties/Settings.Designer.cs

@@ -1,28 +1,24 @@
1 1
 //------------------------------------------------------------------------------
2 2
 // <auto-generated>
3
-//     This code was generated by a tool.
4
-//     Runtime Version:4.0.30319.42000
3
+//     此代码由工具生成。
4
+//     运行时版本:4.0.30319.42000
5 5
 //
6
-//     Changes to this file may cause incorrect behavior and will be lost if
7
-//     the code is regenerated.
6
+//     对此文件的更改可能会导致不正确的行为,并且如果
7
+//     重新生成代码,这些更改将会丢失。
8 8
 // </auto-generated>
9 9
 //------------------------------------------------------------------------------
10 10
 
11
-namespace HySoftSMS.Properties
12
-{
13
-
14
-
11
+namespace HySoftSMS.Properties {
12
+    
13
+    
15 14
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
16
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
17
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
18
-    {
19
-
15
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
16
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
17
+        
20 18
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
21
-
22
-        public static Settings Default
23
-        {
24
-            get
25
-            {
19
+        
20
+        public static Settings Default {
21
+            get {
26 22
                 return defaultInstance;
27 23
             }
28 24
         }

+ 0 - 1
1.代码/HySoftSMS/HySoftSMS/Utils.cs

@@ -4,7 +4,6 @@ using System.Configuration;
4 4
 using System.IO;
5 5
 using System.Linq;
6 6
 using System.Net;
7
-using System.Net.Http;
8 7
 using System.Security.Cryptography;
9 8
 using System.Text;
10 9
 using System.Text.RegularExpressions;

+ 1 - 1
1.代码/HySoftSMS/HySoftSMS/packages.config

@@ -1,4 +1,4 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2 2
 <packages>
3
-  <package id="Newtonsoft.Json" version="10.0.1" targetFramework="net452" />
3
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net40" />
4 4
 </packages>

+ 14 - 2
1.代码/HySoftSMS/HySoftSMS/taskitem.cs

@@ -49,13 +49,25 @@ namespace HySoftSMS
49 49
         }
50 50
 
51 51
         /// <summary>
52
+        /// 更新本机余额
53
+        /// </summary>
54
+        /// <param name="taskitemid"></param>
55
+        /// <returns></returns>
56
+        public bool setbanlance(string balance)
57
+        {
58
+            string sql = "UPDATE T_Sys_SystemConfig SET [F_ParamValue]='" + balance + "'  WHERE F_ParamCode='SMSBalance'";
59
+            bool bl = DbHelperSQL.ExecuteSql(sql) > 0;
60
+            return bl;
61
+        }
62
+
63
+        /// <summary>
52 64
         /// 更新条目发送结果
53 65
         /// </summary>
54 66
         /// <param name="taskid"></param>
55 67
         /// <param name="itemid"></param>
56 68
         /// <param name="result"></param>
57 69
         /// <param name="errinfo"></param>
58
-        public bool SetSMSTaskItemSendResult(int taskid, int itemid, bool result, string errinfo, string balance)
70
+        public bool SetSMSTaskItemSendResult(int taskid, int itemid, bool result, string errinfo,string content, string balance)
59 71
         {
60 72
             bool bl = false;
61 73
             var item = new 阿里短信任务执行表().GetModelList(" ID=" + itemid + " and 任务ID=" + taskid).FirstOrDefault();
@@ -66,7 +78,7 @@ namespace HySoftSMS
66 78
                 + "' WHERE 任务ID=" + taskid + " AND [ID]=" + itemid;
67 79
             string sql3 = "UPDATE 阿里短信任务表 SET [执行完成数量]=[执行完成数量]+1,[未执行数量]=[未执行数量]-1,[短信已执行完成数量]=[短信已执行完成数量]+1 WHERE ID=" + taskid;
68 80
             string sql4 = "INSERT INTO [任务执行历史表] ([任务ID],[任务条目表名],[任务条目ID],[号码],[结果],[执行方式],[执行时间],[执行内容]) VALUES ('"
69
-                + taskid + "','" + tablename + "','" + item.任务条目ID + "','" + item.号码 + "','" + (result ? 3 : 2) + "',2,GETDATE(),'" + errinfo + "')";
81
+                + taskid + "','" + tablename + "','" + item.任务条目ID + "','" + item.号码 + "','" + (result ? 3 : 2) + "',2,GETDATE(),N'" + content + "')";
70 82
 
71 83
 
72 84
             List<string> sqls = new List<string> { sql1, sql2, sql3, sql4 };

BIN
1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/Newtonsoft.Json.10.0.1.nupkg


BIN
1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/net20/Newtonsoft.Json.dll


Разница между файлами не показана из-за своего большого размера
+ 0 - 9807
1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/net20/Newtonsoft.Json.xml


BIN
1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/net35/Newtonsoft.Json.dll


Разница между файлами не показана из-за своего большого размера
+ 0 - 8936
1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/net35/Newtonsoft.Json.xml


BIN
1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/net40/Newtonsoft.Json.dll


Разница между файлами не показана из-за своего большого размера
+ 0 - 9136
1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/net40/Newtonsoft.Json.xml


BIN
1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/net45/Newtonsoft.Json.dll


Разница между файлами не показана из-за своего большого размера
+ 0 - 10752
1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/net45/Newtonsoft.Json.xml


BIN
1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/netstandard1.0/Newtonsoft.Json.dll


Разница между файлами не показана из-за своего большого размера
+ 0 - 10504
1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/netstandard1.0/Newtonsoft.Json.xml


BIN
1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/netstandard1.3/Newtonsoft.Json.dll


Разница между файлами не показана из-за своего большого размера
+ 0 - 10596
1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/netstandard1.3/Newtonsoft.Json.xml


BIN
1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/portable-net45+win8+wpa81+wp8/Newtonsoft.Json.dll


Разница между файлами не показана из-за своего большого размера
+ 0 - 10504
1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/lib/portable-net45+win8+wpa81+wp8/Newtonsoft.Json.xml


+ 0 - 116
1.代码/HySoftSMS/packages/Newtonsoft.Json.10.0.1/tools/install.ps1

@@ -1,116 +0,0 @@
1
-param($installPath, $toolsPath, $package, $project)
2
-
3
-# open json.net splash page on package install
4
-# don't open if json.net is installed as a dependency
5
-
6
-try
7
-{
8
-  $url = "http://www.newtonsoft.com/json/install?version=" + $package.Version
9
-  $dte2 = Get-Interface $dte ([EnvDTE80.DTE2])
10
-
11
-  if ($dte2.ActiveWindow.Caption -eq "Package Manager Console")
12
-  {
13
-    # user is installing from VS NuGet console
14
-    # get reference to the window, the console host and the input history
15
-    # show webpage if "install-package newtonsoft.json" was last input
16
-
17
-    $consoleWindow = $(Get-VSComponentModel).GetService([NuGetConsole.IPowerConsoleWindow])
18
-
19
-    $props = $consoleWindow.GetType().GetProperties([System.Reflection.BindingFlags]::Instance -bor `
20
-      [System.Reflection.BindingFlags]::NonPublic)
21
-
22
-    $prop = $props | ? { $_.Name -eq "ActiveHostInfo" } | select -first 1
23
-    if ($prop -eq $null) { return }
24
-  
25
-    $hostInfo = $prop.GetValue($consoleWindow)
26
-    if ($hostInfo -eq $null) { return }
27
-
28
-    $history = $hostInfo.WpfConsole.InputHistory.History
29
-
30
-    $lastCommand = $history | select -last 1
31
-
32
-    if ($lastCommand)
33
-    {
34
-      $lastCommand = $lastCommand.Trim().ToLower()
35
-      if ($lastCommand.StartsWith("install-package") -and $lastCommand.Contains("newtonsoft.json"))
36
-      {
37
-        $dte2.ItemOperations.Navigate($url) | Out-Null
38
-      }
39
-    }
40
-  }
41
-  else
42
-  {
43
-    # user is installing from VS NuGet dialog
44
-    # get reference to the window, then smart output console provider
45
-    # show webpage if messages in buffered console contains "installing...newtonsoft.json" in last operation
46
-
47
-    $instanceField = [NuGet.Dialog.PackageManagerWindow].GetField("CurrentInstance", [System.Reflection.BindingFlags]::Static -bor `
48
-      [System.Reflection.BindingFlags]::NonPublic)
49
-
50
-    $consoleField = [NuGet.Dialog.PackageManagerWindow].GetField("_smartOutputConsoleProvider", [System.Reflection.BindingFlags]::Instance -bor `
51
-      [System.Reflection.BindingFlags]::NonPublic)
52
-
53
-    if ($instanceField -eq $null -or $consoleField -eq $null) { return }
54
-
55
-    $instance = $instanceField.GetValue($null)
56
-
57
-    if ($instance -eq $null) { return }
58
-
59
-    $consoleProvider = $consoleField.GetValue($instance)
60
-    if ($consoleProvider -eq $null) { return }
61
-
62
-    $console = $consoleProvider.CreateOutputConsole($false)
63
-
64
-    $messagesField = $console.GetType().GetField("_messages", [System.Reflection.BindingFlags]::Instance -bor `
65
-      [System.Reflection.BindingFlags]::NonPublic)
66
-    if ($messagesField -eq $null) { return }
67
-
68
-    $messages = $messagesField.GetValue($console)
69
-    if ($messages -eq $null) { return }
70
-
71
-    $operations = $messages -split "=============================="
72
-
73
-    $lastOperation = $operations | select -last 1
74
-
75
-    if ($lastOperation)
76
-    {
77
-      $lastOperation = $lastOperation.ToLower()
78
-
79
-      $lines = $lastOperation -split "`r`n"
80
-
81
-      $installMatch = $lines | ? { $_.StartsWith("------- installing...newtonsoft.json ") } | select -first 1
82
-
83
-      if ($installMatch)
84
-      {
85
-        $dte2.ItemOperations.Navigate($url) | Out-Null
86
-      }
87
-    }
88
-  }
89
-}
90
-catch
91
-{
92
-  try
93
-  {
94
-    $pmPane = $dte2.ToolWindows.OutputWindow.OutputWindowPanes.Item("Package Manager")
95
-
96
-    $selection = $pmPane.TextDocument.Selection
97
-    $selection.StartOfDocument($false)
98
-    $selection.EndOfDocument($true)
99
-
100
-    if ($selection.Text.StartsWith("Attempting to gather dependencies information for package 'Newtonsoft.Json." + $package.Version + "'"))
101
-    {
102
-      # don't show on upgrade
103
-      if (!$selection.Text.Contains("Removed package"))
104
-      {
105
-        $dte2.ItemOperations.Navigate($url) | Out-Null
106
-      }
107
-    }
108
-  }
109
-  catch
110
-  {
111
-    # stop potential errors from bubbling up
112
-    # worst case the splash page won't open  
113
-  }
114
-}
115
-
116
-# still yolo

+ 2 - 2
1.代码/XKPCallCenter/XKPCallCenter.Web/NewTaskManage/templatelist.aspx

@@ -143,10 +143,10 @@
143 143
 <body>
144 144
     <form id="form1" runat="server">
145 145
     <div class="tools_box">
146
-        <a class="tools_btn" href="#" onclick="Add();"><span><b class="add">添加</b></span>
146
+        <%--<a class="tools_btn" href="#" onclick="Add();"><span><b class="add">添加</b></span>
147 147
         </a><a class="tools_btn" href="#" onclick="Edit('modify');"><span><b class="modify">
148 148
             修改</b></span> </a><a class="tools_btn" href="#" onclick="Delete();"><span><b class="delete">
149
-                删除</b></span> </a>
149
+                删除</b></span> </a>--%>
150 150
         <div class="tools_bar">
151 151
             <div class="search_box">
152 152
                 关键字:<asp:TextBox ID="txtKeyWords" runat="server" CssClass="txtInput"></asp:TextBox>