Skip to content

E
Education
Commit 38d0692a authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents d02ebc33 9c53efd9
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 80 deletions
Edu.Repository/Course/RB_Class_PlanRepository.cs
View file @ 38d0692a
...@@ -236,10 +236,11 @@ WHERE ClassId={1} AND ClassDate>'{2}' ...@@ -236,10 +236,11 @@ WHERE ClassId={1} AND ClassDate>'{2}'
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" 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 FROM rb_class_plan as a
LEFT JOIN rb_class c on a.ClassId = c.ClassId LEFT JOIN rb_class c on a.ClassId = c.ClassId
LEFT JOIN rb_teacher AS T ON a.TeacherId=T.TId 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"); where a.`Status`=0 and c.ClassStatus=2 and c.`Status`=0");
if (query != null) if (query != null)
{ {
......
Edu.WebApi/Startup.cs
View file @ 38d0692a
...@@ -57,7 +57,9 @@ namespace Edu.WebApi ...@@ -57,7 +57,9 @@ namespace Edu.WebApi
"http://jiahe.oytour.com", "http://jiahe.oytour.com",
"http://www.kookaku.com", "http://www.kookaku.com",
"http://www.kookaku.cn", "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()))); services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(corsArray.ToArray())));
} }
...@@ -96,7 +98,7 @@ namespace Edu.WebApi ...@@ -96,7 +98,7 @@ namespace Edu.WebApi
Timers.TimerJobj.RunStop(); //网站停止完成执行 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文件夹 if (System.IO.Directory.Exists(filePath) == false)//如果不存在就创建file文件夹
{ {
System.IO.Directory.CreateDirectory(filePath); System.IO.Directory.CreateDirectory(filePath);
......
Edu.WebApi/appsettings.json
View file @ 38d0692a
{ {
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ", "DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DefaultConnectionPName": "MySql.Data.MySqlClient", "DefaultConnectionPName": "MySql.Data.MySqlClient",
"FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ", "FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"FinanceConnectionPName": "MySql.Data.MySqlClient", "FinanceConnectionPName": "MySql.Data.MySqlClient",
"DataStatisticsConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ", "DataStatisticsConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_datastatistics;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DataStatisticsConnectionPName": "MySql.Data.MySqlClient", "DataStatisticsConnectionPName": "MySql.Data.MySqlClient",
"LogConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_sys;CharSet=utf8mb4; Convert Zero Datetime=true; ", "LogConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_sys;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"LogConnectionPName": "MySql.Data.MySqlClient" "LogConnectionPName": "MySql.Data.MySqlClient"
}, },
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Information", "Default": "Information",
"Microsoft": "Warning", "Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information" "Microsoft.Hosting.Lifetime": "Information"
} }
}, },
"SettlementRate": "0.60", "SettlementRate": "0.60",
"SellCommissionFFBL": "0.15", "SellCommissionFFBL": "0.15",
"JwtSecretKey": "@VIITTOREBORN*2018", "JwtSecretKey": "@VIITTOREBORN*2018",
"JwtExpirTime": 86400, "MallJwtSecretKey": "@VIITTOREBORN*2018",
"IsSendMsg": 2, "JwtExpirTime": 86400,
"AllowedHosts": "*", "IsSendMsg": 2,
"OpenValidation": "False", "AllowedHosts": "*",
"UploadSiteUrl": "http://192.168.1.36:8120", "OpenValidation": "False",
"ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com", "UploadSiteUrl": "http://192.168.1.36:8120",
"ErpViewFileSiteUrl": "http://imgfile.oytour.com", "ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
"Mongo": "mongodb://47.96.25.130:27017", "ErpViewFileSiteUrl": "http://imgfile.oytour.com",
"MongoDBName": "Edu", "Mongo": "mongodb://47.96.25.130:27017",
"WkHtmlToPdfPath": "D:/wkhtmltopdf/bin/", "MongoDBName": "Edu",
"FinanceKey": "FinanceMallInsertToERPViitto2020", "WkHtmlToPdfPath": "D:/wkhtmltopdf/bin/",
"PaymentFinanceApi": "http://192.168.1.13:8083/api/Mall/InsertFinanceBatchForMallIn", "FinanceKey": "FinanceMallInsertToERPViitto2020",
"IncomeFinanceApi": "http://192.168.20.9:8083/api/Mall/InsertFinanceBatchForMallOut", "PaymentFinanceApi": "http://192.168.1.13:8083/api/Mall/InsertFinanceBatchForMallIn",
"sTenpayNotifyUrl": "http://eduapi.oytour.com/api/WeChatPay/WxPayCallback", //下单回调地址 "IncomeFinanceApi": "http://192.168.20.9:8083/api/Mall/InsertFinanceBatchForMallOut",
"sTenpayNotifyRefundUrl": "http://eduapi.oytour.com/api/WeChatPay/Refunds", //退款回调地址 "sTenpayNotifyUrl": "http://eduapi.oytour.com/api/WeChatPay/WxPayCallback", //下单回调地址
"FinanceDateBase": "reborn_finance", "sTenpayNotifyRefundUrl": "http://eduapi.oytour.com/api/WeChatPay/Refunds", //退款回调地址
"RabbitMqConfig": { "FinanceDateBase": "reborn_finance",
"HostName": "47.96.25.130", "JHTenantId": "15",
"VirtualHost": "/", "JHMallBaseId": "5",
"Port": 5672, "RabbitMqConfig": {
"UserName": "guest", "HostName": "47.96.25.130",
"Password": "viitto2019", "VirtualHost": "/",
"QueenName": "vt_sys_message_test" "Port": 5672,
}, "UserName": "guest",
"RedisSetting": { "Password": "viitto2019",
"RedisServer": "47.96.23.199", "QueenName": "vt_sys_message_test"
"RedisPort": "6379", },
"RedisPwd": "Viitto2018" "RedisSetting": {
}, "RedisServer": "47.96.23.199",
"VirtualDirectory": "WebFile", "RedisPort": "6379",
//未填写 未打分 下降比例 "RedisPwd": "Viitto2018"
"OKRMatterValue": "30,100,100", },
//是否是线上环境 "VirtualDirectory": "WebFile",
"IsOnline": false, //未填写 未打分 下降比例
//退课流程编号 "OKRMatterValue": "30,100,100",
"BackClassFlowId": 1, //是否是线上环境
//分区校长岗位编号 "IsOnline": false,
"SchoolPostId": 3, //退课流程编号
//教务长 "BackClassFlowId": 1,
"JiaoWuZhang": 8, //分区校长岗位编号
//留学就业部门主管审核编号[王涛] "SchoolPostId": 3,
"StudyAbroadDirectorId": 64, //教务长
//留学就业部门负责人审核编号[姚顺先] "JiaoWuZhang": 8,
"StudyAbroadManagerId": 52, //留学就业部门主管审核编号[王涛]
//合同默认抬头 "StudyAbroadDirectorId": 64,
"ContractDefaultTitle": "JH-DZ-CD-", //留学就业部门负责人审核编号[姚顺先]
//消息推送AppId "StudyAbroadManagerId": 52,
"PushAppId": "JiaHeJiaoYu", //合同默认抬头
//是否推送消息 "ContractDefaultTitle": "JH-DZ-CD-",
"IsPushMessage": "1", //消息推送AppId
//超过下班时间60分钟不能打卡 "PushAppId": "JiaHeJiaoYu",
"MoreThanMinutes": 60, //是否推送消息
//连续缺课课时 "IsPushMessage": "1",
"AbsentHours": "12", //超过下班时间60分钟不能打卡
"JHTenantId": "15", "MoreThanMinutes": 60,
"JHMallBaseId": "5", //连续缺课课时
"MallJwtSecretKey": "@VIITTOREBORN*2018123" "AbsentHours": 12
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment