zhoufan лет назад: 7
Родитель
Сommit
e13a643ac0

+ 6 - 35
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SMSController.cs

@@ -81,8 +81,6 @@ namespace CallCenterApi.Interface.Controllers
81 81
             };
82 82
 
83 83
             return Content(obj.ToJson());
84
-
85
-            return NoToken("未知错误,请重新登录");
86 84
         }
87 85
 
88 86
         /// <summary>
@@ -110,7 +108,6 @@ namespace CallCenterApi.Interface.Controllers
110 108
                 return Success("添加失败");
111 109
             }
112 110
 
113
-            return NoToken("未知错误,请重新登录");
114 111
         }
115 112
 
116 113
         /// <summary>
@@ -142,8 +139,6 @@ namespace CallCenterApi.Interface.Controllers
142 139
             {
143 140
                 return Error("请选择要删除的接收短信");
144 141
             }
145
-
146
-            return NoToken("未知错误,请重新登录");
147 142
         }
148 143
 
149 144
         #endregion
@@ -206,9 +201,7 @@ namespace CallCenterApi.Interface.Controllers
206 201
                 total = recordCount
207 202
             };
208 203
 
209
-            return Content(obj.ToJson()); ;
210
-
211
-            return NoToken("未知错误,请重新登录");
204
+            return Content(obj.ToJson());
212 205
         }
213 206
 
214 207
         /// <summary>
@@ -297,8 +290,6 @@ namespace CallCenterApi.Interface.Controllers
297 290
                     return Success("添加失败");
298 291
                 }
299 292
             }
300
-
301
-            return NoToken("未知错误,请重新登录");
302 293
         }
303 294
 
304 295
         /// <summary>
@@ -330,8 +321,6 @@ namespace CallCenterApi.Interface.Controllers
330 321
             {
331 322
                 return Error("请选择要删除的短信任务");
332 323
             }
333
-
334
-            return NoToken("未知错误,请重新登录");
335 324
         }
336 325
 
337 326
         /// <summary>
@@ -406,9 +395,7 @@ namespace CallCenterApi.Interface.Controllers
406 395
                 total = recordCount
407 396
             };
408 397
 
409
-            return Content(obj.ToJson()); ;
410
-
411
-            return NoToken("未知错误,请重新登录");
398
+            return Content(obj.ToJson());
412 399
         }
413 400
 
414 401
         /// <summary>
@@ -452,8 +439,6 @@ namespace CallCenterApi.Interface.Controllers
452 439
                     return Success("添加失败");
453 440
                 }
454 441
             }
455
-
456
-            return NoToken("未知错误,请重新登录");
457 442
         }
458 443
 
459 444
         /// <summary>
@@ -484,8 +469,6 @@ namespace CallCenterApi.Interface.Controllers
484 469
             {
485 470
                 return Error("请选择要删除的短信");
486 471
             }
487
-
488
-            return NoToken("未知错误,请重新登录");
489 472
         }
490 473
 
491 474
         /// <summary>
@@ -570,8 +553,6 @@ namespace CallCenterApi.Interface.Controllers
570 553
             dt = DB.DbHelperSQL.Query(" select " + str + " * from T_SMS_SendSMSTask where isnull(State,0)='" + state + "' and getdate() between isnull(StartTime,'1900-01-01 00:00:00') and isnull(EndTime,'9999-12-31 23:59:59')  order by F_CreateDate ").Tables[0];
571 554
 
572 555
             return Success("成功", dt);
573
-
574
-            return NoToken("未知错误,请重新登录");
575 556
         }
576 557
 
577 558
         /// <summary>
@@ -593,8 +574,6 @@ namespace CallCenterApi.Interface.Controllers
593 574
             dt = DB.DbHelperSQL.Query(" select " + str + " * from T_SMS_SentSMS where TaskID='" + taskid + "' and isnull(State,0)='0' order by F_CreateDate ").Tables[0];
594 575
 
595 576
             return Success("成功", dt);
596
-
597
-            return NoToken("未知错误,请重新登录");
598 577
         }
599 578
 
600 579
         /// <summary>
@@ -673,8 +652,6 @@ namespace CallCenterApi.Interface.Controllers
673 652
             }
674 653
 
675 654
             return Success("成功", new { suc = tels, err = errtels, isdel = isdel });
676
-
677
-            return NoToken("未知错误,请重新登录");
678 655
         }
679 656
 
680 657
         /// <summary>
@@ -719,8 +696,6 @@ namespace CallCenterApi.Interface.Controllers
719 696
                 }
720 697
             }
721 698
             return Success("成功", new { suc = str, err = strerr });
722
-
723
-            return NoToken("未知错误,请重新登录");
724 699
         }
725 700
 
726 701
         /// <summary>
@@ -762,8 +737,6 @@ namespace CallCenterApi.Interface.Controllers
762 737
                 }
763 738
             }
764 739
             return Success("成功", new { suc = str, err = strerr });
765
-
766
-            return NoToken("未知错误,请重新登录");
767 740
         }
768 741
 
769 742
         /// <summary>
@@ -858,8 +831,6 @@ namespace CallCenterApi.Interface.Controllers
858 831
             {
859 832
                 return Error(err);
860 833
             }
861
-
862
-            return NoToken("未知错误,请重新登录");
863 834
         }
864 835
 
865 836
         /// <summary>
@@ -893,24 +864,24 @@ namespace CallCenterApi.Interface.Controllers
893 864
                 {
894 865
                     if (!rsp.Result.Success)
895 866
                     {
896
-                        return rsp.Result.Msg;
867
+                        res = rsp.Result.Msg;
897 868
                     }
898 869
                 }
899 870
                 else
900 871
                 {
901 872
                     if (!string.IsNullOrEmpty(rsp.SubErrMsg))
902 873
                     {
903
-                        return rsp.SubErrMsg;
874
+                        res = rsp.SubErrMsg;
904 875
                     }
905 876
                     else
906 877
                     {
907
-                        return rsp.ErrMsg;
878
+                        res = rsp.ErrMsg;
908 879
                     }
909 880
                 }
910 881
             }
911 882
             catch
912 883
             {
913
-                return "接口异常!";
884
+                res = "接口异常!";
914 885
             }
915 886
 
916 887
             return res;

Разница между файлами не показана из-за своего большого размера
+ 431 - 441
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SMSZXZBController.cs