From f2c1e5bf3a67478076fb5bbcf546824b3127db15 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 12 十二月 2020 19:11:40 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL

---
 HDL_ON/DAL/Server/HttpServerRequest.cs |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index a69df89..15c157b 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -894,15 +894,15 @@
                 isProduce = false;
 #endif
 
-                if (string.IsNullOrEmpty(UserInfo.Current.PushDeviceToken)) {
+                if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken)) {
                     Utlis.WriteLine("PushDeviceToken 涓虹┖");
                     return false;
                 }
 
                 var mAddpushinfoObj = new AddpushinfoObj()
                 {
-                    pushToken = UserInfo.Current.PushDeviceToken,
-                    deviceName = UserInfo.Current.PhoneName,
+                    pushToken = OnAppConfig.Instance.PushDeviceToken,
+                    deviceName = OnAppConfig.Instance.PhoneName,
                     deviceType = deviceType,
                     produce = isProduce,
                 };
@@ -917,8 +917,8 @@
                         var pushId = revertObj.Data.ToString();
                         if (!string.IsNullOrEmpty(pushId))
                         {
-                            UserInfo.Current.PushId = pushId;
-                            UserInfo.Current.SaveUserInfo();
+                            OnAppConfig.Instance.PushId = pushId;
+                            OnAppConfig.Instance.SaveConfig();
                             Utlis.WriteLine("PushId: " + pushId);
                            
                             return true;
@@ -963,7 +963,7 @@
 
             var requestJson = HttpUtil.GetSignRequestJson(new GetMessageListObj()
             {
-                pushId = UserInfo.Current.PushId,
+                pushId = OnAppConfig.Instance.PushId,
                 pushType = pushType
             });
             return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist, requestJson);
@@ -975,11 +975,11 @@
         /// <returns></returns>
         public bool PushSerivceClearmessagelist()
         {
-            if (string.IsNullOrEmpty(UserInfo.Current.PushId)) return false;
+            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
 
             var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj()
             {
-                pushId = UserInfo.Current.PushId
+                pushId = OnAppConfig.Instance.PushId
             });
 
             var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Clearmessagelist, requestJson);
@@ -1000,11 +1000,11 @@
         /// <returns></returns>
         public bool PushSerivceSignOut()
         {
-            if (string.IsNullOrEmpty(UserInfo.Current.PushId)) return false;
+            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
             try
             {
                 var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj() {
-                    pushId = UserInfo.Current.PushId
+                    pushId = OnAppConfig.Instance.PushId
                 });
                
                 var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_DeleteToken, requestJson);
@@ -1031,13 +1031,13 @@
         /// <returns></returns>
         public bool PushSerivceMarkAllMessageRead()
         {
-            if (string.IsNullOrEmpty(UserInfo.Current.PushId)) return false;
+            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
 
             try
             {
                 var requestJson = HttpUtil.GetSignRequestJson(new PushIdObj()
                 {
-                    pushId = UserInfo.Current.PushId
+                    pushId = OnAppConfig.Instance.PushId
                 });
                 var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_ALLMarkread, requestJson);
                 if (revertObj.Code == StateCode.SUCCESS)
@@ -1063,7 +1063,7 @@
         /// <returns></returns>
         public bool PushSerivceMarkMessageRead(string msgId)
         {
-            if (string.IsNullOrEmpty(UserInfo.Current.PushId)) return false;
+            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
 
             try
             {
@@ -1096,7 +1096,7 @@
         /// <returns></returns>
         public bool PushSerivceDeleteMessage(string msgId)
         {
-            if (string.IsNullOrEmpty(UserInfo.Current.PushId)) return false;
+            if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
 
             try
             {

--
Gitblit v1.8.0