Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

Mall.Common/Plugin/JsonHelper.cs

@@ -232,5 +232,28 @@ namespace Mall.Common.Plugin
                 );
             return JsonConvert.DeserializeObject(json);
         }
+
+        /// <summary>
+        /// 判断字符串是不是JSON格式
+        /// </summary>
+        /// <param name="json"></param>
+        /// <returns></returns>
+        public static bool IsJson(string json)
+        {
+            bool flag = false;
+            if (!string.IsNullOrEmpty(json))
+            {
+                try
+                {
+                    _ = (JObject)JsonConvert.DeserializeObject(json);
+                    flag = true;
+                }
+                catch
+                {
+                    flag = false;
+                }
+            }
+            return flag;
+        }
     }
 }

Mall.WebApi/Controllers/Education/EducationController.cs

@@ -2892,7 +2892,7 @@ namespace Mall.WebApi.Controllers.Education
         public ApiResult UpdateActivityIncome()
         {
             //int OrderId, decimal Money, int ActivityId
-            JObject jObj = JObject.Parse(RequestParm.msg.ToString());
+            JObject jObj = JObject.Parse(RequestParm.msg.ToString().Replace(@"\r\n",""));
             int OrderId = jObj.GetInt("OrderId", 0);
             decimal Money = jObj.GetDecimal("Money");
             decimal PlatformTax = jObj.GetDecimal("PlatformTax");

Mall.WebApi/Startup.cs

@@ -57,6 +57,7 @@ namespace Mall.WebApi
             {
                 "http://localhost:8081",
                 "http://127.0.0.1:8081",
+                "http://127.0.0.1:8085",
                 "http://localhost:8181",
                 "http://localhost:8080",
                 "http://127.0.0.1:8080",