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

Edu.Repository/Course/RB_Class_PlanRepository.cs

@@ -236,10 +236,11 @@ WHERE ClassId={1} AND ClassDate>'{2}'
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@" 
-SELECT a.*,c.Teacher_Id,c.ClassName,c.ClassType,T.TeacherName 
+SELECT a.*,c.Teacher_Id,c.ClassName,c.ClassType,T.TeacherName ,cou.CourseName
 FROM rb_class_plan as a 
     LEFT JOIN rb_class c on a.ClassId = c.ClassId
     LEFT JOIN rb_teacher AS T ON a.TeacherId=T.TId
+LEFT JOIN rb_course as cou on cou.CourseId=c.CouseId
 where  a.`Status`=0 and c.ClassStatus=2  and c.`Status`=0");
             if (query != null)
             {

Edu.WebApi/Startup.cs

@@ -57,7 +57,9 @@ namespace Edu.WebApi
                 "http://jiahe.oytour.com",
                 "http://www.kookaku.com",
                 "http://www.kookaku.cn",
-                "http://kookaku.com"
+                "http://kookaku.com",
+                "https://mallapi.oytour.com",
+                 "https://mall.oytour.com"
             };
             services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(corsArray.ToArray())));
         }
@@ -96,7 +98,7 @@ namespace Edu.WebApi
                 Timers.TimerJobj.RunStop();  //网站停止完成执行
             });
 
-            string filePath= Path.Combine(Directory.GetCurrentDirectory(), "upfile");
+            string filePath = Path.Combine(Directory.GetCurrentDirectory(), "upfile");
             if (System.IO.Directory.Exists(filePath) == false)//如果不存在就创建file文件夹
             {
                 System.IO.Directory.CreateDirectory(filePath);

Edu.WebApi/appsettings.json

@@ -19,6 +19,7 @@
     "SettlementRate": "0.60",
     "SellCommissionFFBL": "0.15",
     "JwtSecretKey": "@VIITTOREBORN*2018",
+    "MallJwtSecretKey": "@VIITTOREBORN*2018",
     "JwtExpirTime": 86400,
     "IsSendMsg": 2,
     "AllowedHosts": "*",
@@ -35,6 +36,8 @@
     "sTenpayNotifyUrl": "http://eduapi.oytour.com/api/WeChatPay/WxPayCallback", //下单回调地址
     "sTenpayNotifyRefundUrl": "http://eduapi.oytour.com/api/WeChatPay/Refunds", //退款回调地址
     "FinanceDateBase": "reborn_finance",
+    "JHTenantId": "15",
+    "JHMallBaseId": "5",
     "RabbitMqConfig": {
         "HostName": "47.96.25.130",
         "VirtualHost": "/",
@@ -72,8 +75,5 @@
     //超过下班时间60分钟不能打卡
     "MoreThanMinutes": 60,
     //连续缺课课时
-  "AbsentHours": "12",
-  "JHTenantId": "15",
-  "JHMallBaseId": "5",
-  "MallJwtSecretKey": "@VIITTOREBORN*2018123"
+    "AbsentHours": 12
 }
\ No newline at end of file