Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Common/Config.cs

@@ -436,5 +436,17 @@ namespace Edu.Common
                 return ReadConfigKey("ContractDefaultTitle");
             }
         }
+
+        /// <summary>
+        /// 是否推送消息
+        /// </summary>
+        public static int IsPushMessage
+        {
+            get
+            {
+                int.TryParse(ReadConfigKey("IsPushMessage"), out int IsPushMessage);
+                return IsPushMessage;
+            }
+        }
     }
 }
\ No newline at end of file

Edu.WebApi/Controllers/User/LoginController.cs

@@ -198,7 +198,7 @@ namespace Edu.WebApi.Controllers.User
                         uploadConfig?.UploadDomain
                     };
                 }
-                if (Common.Config.IsOnline)
+                if (Common.Config.IsPushMessage==1)
                 {
                     for (var i = 0; i < 10; i++)
                     {

Edu.WebApi/Startup.cs

@@ -41,6 +41,7 @@ namespace Edu.WebApi
                 "http://localhost:8081",
                 "http://localhost:8080",
                 "http://localhost:8181",
+                "http://localhost:8182",
                 "http://localhost:8082",
                 "http://127.0.0.1:50512",
                 "http://127.0.0.1:20224",

Edu.WebApi/appsettings.json

@@ -44,7 +44,7 @@
   //未填写   未打分   下降比例
   "OKRMatterValue": "30,100,100",
   //是否是线上环境
-  "IsOnline": true,
+  "IsOnline": false,
   //退课流程编号
   "BackClassFlowId": 1,
   //分区校长岗位编号
@@ -58,5 +58,8 @@
   //合同默认抬头
   "ContractDefaultTitle": "JH-DZ-CD-",
   //消息推送AppId
-  "PushAppId": "JiaHeJiaoYu"
+  "PushAppId": "JiaHeJiaoYu",
+  //是否推送消息
+  "IsPushMessage": "0"
+
 }
\ No newline at end of file