62 Commits

Author SHA1 Message Date
0fc49f6333 update ignore & update sort 2020-02-28 17:21:06 +08:00
6995306195 finish rank 2020-02-28 12:49:19 +08:00
80ad7feaef update annotate 2020-02-26 21:40:38 +08:00
f4637f0cd8 update conf to py 2020-02-26 21:31:49 +08:00
50a74de9e6 add logs 2020-02-26 21:26:02 +08:00
9f09fa4a52 add logs 2020-02-26 21:25:02 +08:00
lijingwei233
7f132dcbd9 grade ignore empty term 2020-02-26 21:22:50 +08:00
lijingwei233
a1780a1756 add total_bixiu_credit * grade 2020-02-25 16:16:07 +08:00
RainSun
1fea048620 Merge branch 'addlaf' into 'master' (merge request !14)
addlaf
2020-02-23 11:20:20 +00:00
lijingwei233
23b7c5138f fix merge conflicts 2020-02-23 18:58:24 +08:00
lijingwei233
063bea9978 again 2020-02-20 22:48:43 +08:00
lijingwei233
f4e74f1f8b Merge branch 'master' of git.code.tencent.com:cust-developers/cust 2020-02-20 22:47:21 +08:00
lijingwei233
5f7d17fc5d add combine phone 2020-02-20 22:42:16 +08:00
lijingwei233
e341222f8e add current_week,lesson_color 2020-02-19 17:27:32 +08:00
dcc37800bf add res_content 2020-02-17 12:41:47 +08:00
320117c904 add loginInterceptor 2020-02-16 18:48:00 +08:00
a1f73370d2 fix can not login problem 2020-02-16 17:54:42 +08:00
RainSun
b7b73ecb3d Merge branch 'revert-821f4ef2' into 'master' (merge request !12)
Revert add judge of grade number
This reverts commit 821f4ef2
2020-02-16 09:52:43 +00:00
lijingwei
36d88d52c8 Revert add judge of grade number
This reverts commit 821f4ef2
2020-02-16 09:52:25 +00:00
lijingwei
821f4ef2d4 add judge of grade number 2020-02-16 17:21:52 +08:00
lijingwei
f77abd4c21 g 2020-02-16 17:18:42 +08:00
RainSun
fce67e67ae Merge branch 'addlaf' into 'master' (merge request !11)
addlaf
V1版本完成
2020-02-15 04:13:20 +00:00
7f4aa9e7d3 modify get method 2020-02-14 15:55:08 +08:00
ce9ba5a48c first update laf 2020-02-11 21:21:28 +08:00
3dd2936761 merge lijingwei to master 2020-02-10 17:24:52 +08:00
lijingwei
2b0a8a17c5 add init of var 'last_lesson_kill' 2020-02-10 14:18:55 +08:00
lijingwei
722029bdae modify the algorithm of getGrade 2020-02-10 14:04:29 +08:00
lijingwei
09c2791134 fix lesson number more than actual 2020-02-10 09:01:18 +08:00
lijingwei
2951a88fdf last_lesson_kill/dead 2 last_term_kill/dead to add last lesson state 2020-02-09 23:24:39 +08:00
8309a17639 del sendmail 2020-02-09 20:18:54 +08:00
RainSun
84df4dbf02 Merge branch 'lijingwei' into 'master' (merge request !9)
lijingwei
2020-02-09 12:08:52 +00:00
lijingwei
136f90e69e modify error 2020-02-09 19:36:43 +08:00
lijingwei
b58591dfab del test code 2020-02-09 19:21:28 +08:00
lijingwei
e63d046626 modify k/d error 2020-02-09 19:18:51 +08:00
lijingwei
64e03210cc modify some error 2020-02-09 18:52:51 +08:00
lijingwei
8b780d27f1 modify the struct of grade_data 2020-02-09 13:42:11 +08:00
2e09048d66 fix spell error and update md 2020-01-23 18:16:16 +08:00
RainSun
c2dffeaa15 Merge branch 'lijingwei' into 'master' (merge request !7)
lijingwei
2020-01-22 14:32:41 +00:00
lijingwei
4afbb77769 modify the struct of schedule 2020-01-22 22:22:50 +08:00
lijingwei
1eade7e117 modify the struct of schedule 2020-01-22 20:43:09 +08:00
lijingwei
c0fde1c824 modify the struct of schedule 2020-01-22 16:23:12 +08:00
lijingwei
4a8c1b9dda modify the struct of schedule 2020-01-22 15:32:03 +08:00
lijingwei
c1b10eeac0 modify the struct of schedule 2020-01-22 15:26:20 +08:00
lijingwei
bac05cb9df modify the struct of schedule 2020-01-22 12:20:12 +08:00
a16952b1ce add mail system 2020-01-21 21:13:07 +08:00
94cf469fae finish md5 2020-01-21 15:30:16 +08:00
8d426df0bc cust2coc 2020-01-20 09:00:32 +08:00
lijingwei
458d91e992 modify md5 check and getCurrentTime 2020-01-19 20:35:20 +08:00
RainSun
83ba475597 Merge branch 'lijingwei' into 'master'
modify the struct of schedule's cache

modify the struct of schedule's cache


See merge request !2
2020-01-19 11:23:19 +00:00
lijingwei
c15a717c3f modify the struct of schedule's cache 2020-01-19 18:24:22 +08:00