From e341222f8ee7e6cd1c61b47ddd457698fddcc6f9 Mon Sep 17 00:00:00 2001 From: lijingwei233 <531347509@qq.com> Date: Wed, 19 Feb 2020 17:27:32 +0800 Subject: [PATCH] add current_week,lesson_color --- coc.py | 6 ++-- lib/__pycache__/db.cpython-37.pyc | Bin 0 -> 2843 bytes lib/__pycache__/photoUpload.cpython-37.pyc | Bin 0 -> 1262 bytes lib/crawler.py | 40 ++++++++++++--------- 4 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 lib/__pycache__/db.cpython-37.pyc create mode 100644 lib/__pycache__/photoUpload.cpython-37.pyc diff --git a/coc.py b/coc.py index 2a79d13..22ed3f4 100644 --- a/coc.py +++ b/coc.py @@ -1,5 +1,5 @@ # 引入文件夹中的文件 -from flask_cors import CORS +from flask_cors import CORS #跨域访问 import sys sys.path.append('./lib') from allFunction import manageLogin, managePhoto, manageAdd, manageDel, manageGet, manageDetail, manageComment @@ -7,7 +7,9 @@ from allFunction import manageLogin, managePhoto, manageAdd, manageDel, manageGe from flask import Flask, request, session app = Flask(__name__) -CORS(app, resources=r'/*') # 注册CORS, "/*" 允许访问所有api + +#取消跨域访问限制,方便本地测试 +#CORS(app, resources=r'/*') # 注册CORS, "/*" 允许访问所有api # 登录接口，前端提供cid和pwd，包装在data里边然后md5校验也就是data:{cid,pwd,sign} @app.route('/api/login',methods=['POST']) diff --git a/lib/__pycache__/db.cpython-37.pyc b/lib/__pycache__/db.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..1f8450860d5076e7d535eb05572b8f99cba049ee GIT binary patch literal 2843 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 literal 0 HcmV?d00001 diff --git a/lib/crawler.py b/lib/crawler.py index fc7000a..539cb3d 100644 --- a/lib/crawler.py +++ b/lib/crawler.py @@ -168,6 +168,12 @@ def getGrade(Ip, S): def getSchedule(Ip, S): headers = {'Content-Type': 'application/json'} + r = S.post( + url='http://'+Ip[0]+'-'+Ip[1]+'-'+Ip[2]+'-'+Ip[3]+'-8080-p.webvpn.cust.edu.cn:8118/api/ClientStudent/Home/StudentHomeApi/GetHomeCurWeekTime?sf_request_type=ajax', + data=json.dumps({"param":"JTdCJTdE","__permission":{"MenuID":"F71C97D5-D3E2-4FDA-9209-D7FA8626390E","Operation":0},"__log":{"MenuID":"F71C97D5-D3E2-4FDA-9209-D7FA8626390E","Logtype":6,"Context":"查询"}}), + headers=headers + ) + CurWeek = json.loads(r.content.decode('utf-8'))['data']['CurWeek'] r = S.post( url='http://'+Ip[0]+'-'+Ip[1]+'-'+Ip[2]+'-'+Ip[3]+'-8080-p.webvpn.cust.edu.cn:8118/api/ClientStudent/Home/StudentHomeApi/QueryStudentScheduleData?sf_request_type=ajax', data=json.dumps({"param":"JTdCJTdE","__permission":{"MenuID":"F71C97D5-D3E2-4FDA-9209-D7FA8626390E","Operation":0},"__log":{"MenuID":"F71C97D5-D3E2-4FDA-9209-D7FA8626390E","Logtype":6,"Context":"查询"}}), @@ -179,12 +185,15 @@ def getSchedule(Ip, S): time = ['AM__TimePieces','PM__TimePieces','EV__TimePieces'] data = data['data']['AdjustDays'] days_per_week = [0] * 23 - lesson = [[0] * 7 for _ in range(6)] + lesson = [[0] * 6 for _ in range(7)] + lesson_set = {} + color_set = [0] * 9 + color_used = 9 for i in range(7): for j in range(3): for k in range(2): if( data[i][time[j]][k]['Dtos'] ): - lesson[j*2+k][i] = [] + lesson[i][j*2+k] = [] for l in data[i][time[j]][k]['Dtos']: temp_lesson = {} Time = [0] * 23 @@ -194,6 +203,16 @@ def getSchedule(Ip, S): temp_lesson[m['Key']] += ','+m['Name'] else: temp_lesson[m['Key']] = m['Name'] + if lesson_set.get(l['Content'][0]['Name']): + temp_lesson['color'] = lesson_set[l['Content'][0]['Name']] + else: + color = random.randint(0, 8) + while color_set[color] and color_used: + color = random.randint(0, 8) + temp_lesson['color'] = color + lesson_set[l['Content'][0]['Name']] = color + color_used -= 1 + color_set[color] = 1 temp_Time = temp_lesson['Time'] if '单周' in temp_Time: mod = 'single' @@ -223,17 +242,6 @@ def getSchedule(Ip, S): Time[int(n[0])] = 1 index += 1 temp_lesson['Time_split'] = Time - lesson[j*2+k][i].append(temp_lesson) - data_cache = {'lesson':lesson,'days_per_week':days_per_week} - return {'errcode': 200, 'errmsg': 'ok', 'data': data_cache} - -def getCurrentTime(Ip, S): - headers = {'Content-Type': 'application/json'} - r = S.post( - url='http://192-168-223-71-8080-p.webvpn.cust.edu.cn:8118/api/ClientStudent/Home/StudentHomeApi/GetHomeCurWeekTime?sf_request_type=ajax', - data=json.dumps({"param":"JTdCJTdE","__permission":{"MenuID":"F71C97D5-D3E2-4FDA-9209-D7FA8626390E","Operation":0},"__log":{"MenuID":"F71C97D5-D3E2-4FDA-9209-D7FA8626390E","Logtype":6,"Context":"查询"}}), - headers=headers - ) - data = json.loads(r.content.decode('utf-8')) - data_cache = data['data'].pop('DateList') - return {'errcode': 200, 'errmsg': 'ok', 'data': data_cache} + lesson[i][j*2+k].append(temp_lesson) + data_cache = {'lesson':lesson,'days_per_week':days_per_week,'cur_week':CurWeek} + return {'errcode': 200, 'errmsg': 'ok', 'data': data_cache} \ No newline at end of file