From 0db025a25222e82a4ace582ac08a3120f1cdea23 Mon Sep 17 00:00:00 2001 From: JerryYin Date: Thu, 22 Nov 2018 15:19:03 +0800 Subject: [PATCH 01/28] improved config, one setting to change mode --- .idea/workspace.xml | 367 ++++++++---------- logs/NotebookServer.log | 0 .../base/__pycache__/sysout.cpython-36.pyc | Bin 903 -> 1430 bytes project/main/base/sysout.py | 19 +- .../config/__pycache__/config.cpython-36.pyc | Bin 1683 -> 2922 bytes project/main/config/config.py | 171 +++++--- .../__pycache__/fileManager.cpython-36.pyc | Bin 7656 -> 8273 bytes .../__pycache__/jupyter.cpython-36.pyc | Bin 1211 -> 1211 bytes .../__pycache__/projectManager.cpython-36.pyc | Bin 5948 -> 5949 bytes .../__pycache__/vmManager.cpython-36.pyc | Bin 2006 -> 2006 bytes .../__pycache__/httpServer.cpython-36.pyc | Bin 7652 -> 7743 bytes project/main/server/httpServer.py | 9 +- project/main/{main.py => startup.py} | 2 +- .../system/__pycache__/shell.cpython-36.pyc | Bin 1210 -> 1522 bytes project/test/__init__.py | 2 + 15 files changed, 285 insertions(+), 285 deletions(-) create mode 100644 logs/NotebookServer.log rename project/main/{main.py => startup.py} (95%) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 50f653d..ccb2543 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,13 @@ + + + - - + + + + - + - - - - - - - - - - + - - + + - + + + + - - - - - - - - - - - - - - - - - - + + - + - - - - - + + - + - - + + - - - - - - + + + + + + @@ -171,11 +151,11 @@ - + - + @@ -184,10 +164,10 @@ - - + + - + @@ -196,17 +176,20 @@ - - + + + + + - + - - + + @@ -222,9 +205,6 @@ - dele - createPreProject - createDir createProject getAllFiles ls -l|grep @@ -248,10 +228,13 @@ start vm failed! cause: rm -rf resp_err_version_invlid - deleteFiles getDirN incorrect version number! + ns_doname + deleteFiles getDirNumber + mPort + ns_port_http @@ -283,13 +266,15 @@ @@ -320,16 +305,6 @@ - - - - - - - - - - @@ -341,20 +316,6 @@ - - - - - - - - - - - - - - @@ -362,12 +323,6 @@ - - - - - - @@ -354,7 +321,7 @@ - + - + - + @@ -508,16 +475,16 @@ - + - - + + - + @@ -565,13 +532,6 @@ - - - - - - - @@ -804,9 +764,6 @@ - - - @@ -814,9 +771,6 @@ - - - @@ -831,15 +785,9 @@ - - - - - - @@ -847,93 +795,102 @@ - + - - - - - - + + - + + + + - - + + + + + - + + + + - - + + - + - - + + + + + + + + + + + - + - - + + + + + - - - - + - - + + - + - + - - - - - - - - + + + + + + + + + - - + + - + - - + + - - - - - - - + diff --git a/project/main/base/codeListener.py b/project/main/base/codeListener.py index e69de29..3ac14a6 100644 --- a/project/main/base/codeListener.py +++ b/project/main/base/codeListener.py @@ -0,0 +1,13 @@ +import inspect + +def getCodeLocation(): + ins = inspect.stack()[0] + file = ins[1] + lineno = ins[2] + function = ins[3] + code = ins[4] + location = ('NotebookServer' + str(file).split('/NotebookServer')[1], lineno, function + '()', str(code[0]).strip()) + print(location) + return location + +getCodeLocation() \ No newline at end of file diff --git a/project/main/base/sysout.py b/project/main/base/sysout.py index a053be9..b4db845 100644 --- a/project/main/base/sysout.py +++ b/project/main/base/sysout.py @@ -24,8 +24,7 @@ def log(tag, msg): print(log) logging.log(log) except Exception as e: - print('Exception:') - print(e) + print('Exception:'+str(e)) logging.error(str(e)) @@ -36,8 +35,7 @@ def err(tag, err): print(log) logging.debug(log) except Exception as e: - print('Exception:') - print(e) + print('Exception:'+str(e)) logging.error(str(e)) @@ -48,6 +46,5 @@ def info(tag, msg): print(log) logging.info(log) except Exception as e: - print('Exception:') - print(e) + print('Exception:'+str(e)) logging.error(str(e)) From fddf119562e23ec7404e9712281c401fd66f9422 Mon Sep 17 00:00:00 2001 From: JerryYin Date: Mon, 26 Nov 2018 16:28:20 +0800 Subject: [PATCH 04/28] done initClass's step 1, [copyClassProject] --- .idea/workspace.xml | 357 ++++++++++-------- bin/autodeeplearning.sh | 4 +- .../base/__pycache__/sysout.cpython-36.pyc | Bin 1430 -> 1437 bytes .../config/__pycache__/config.cpython-36.pyc | Bin 2922 -> 3176 bytes project/main/config/config.py | 25 +- .../__pycache__/fileManager.cpython-36.pyc | Bin 8273 -> 8442 bytes .../__pycache__/projectManager.cpython-36.pyc | Bin 5949 -> 7311 bytes project/main/manager/fileManager.py | 6 +- project/main/manager/projectManager.py | 119 +++++- .../__pycache__/httpServer.cpython-36.pyc | Bin 7743 -> 8345 bytes project/main/server/httpServer.py | 54 ++- .../system/__pycache__/shell.cpython-36.pyc | Bin 1522 -> 1522 bytes 12 files changed, 384 insertions(+), 181 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 6c712d2..1e84e27 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,13 @@ - - + + + + + + + - + - - + + - + - - + + - + - - + + - - + + - + + + + + + + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -158,12 +209,6 @@ - createProject - getAllFiles - ls -l|grep - subpro - subprocess - getFileNumber size syso ill @@ -185,9 +230,15 @@ incorrect version number! ns_doname deleteFiles - getDirNumber mPort ns_port_http + os.list + os.l + getAllFiles + copyClassProject + getOneNbFileName + getDirNumber2 + getDirNumber @@ -207,7 +258,6 @@ @@ -251,7 +303,6 @@ - @@ -259,6 +310,16 @@ + + + + + + + + + + @@ -282,18 +343,20 @@ - + - + + - + @@ -407,7 +452,7 @@ @@ -538,16 +583,16 @@ - + - + - + @@ -595,73 +640,6 @@ \ No newline at end of file diff --git a/project/main/base/__pycache__/sysout.cpython-36.pyc b/project/main/base/__pycache__/sysout.cpython-36.pyc index c66d3fa626a1b9da69f608f3edbb779fc2b8f947..75c6edfb3c6b3357aada6eb7fb59729f497835bf 100644 GIT binary patch delta 339 zcmYk1zfJ-{5XNVA?_jy*;P4LzXkl|kV!*<}NM&iGF`;s;)L9cx$dNl@B8|n_SeRgF zwX&w-C47dn)6Q40alyu!eDj+x-!$_ozvca|>pCCrKWC3Nz!&^0VfF)~WNZcjVGqYZh7rbqH-@sY&ZV+y|A@5ax{pS!C-R<$TaQEKuG|Cxw*x`#{16DvIB`9HCx9q;_7V5)(|%)Q&xZb#Vn!Bvfi!RT5i(t<_sn)C-6Ua{{1A%*+})CNmo delta 262 zcmYk0u};H45JY$HeD=i`2P3Qm3n5xULy;a)QiUSjAyJ^Y#vmEl5mG9OK#2r$O~ogq z;ak$ApyLNKqMVZzeyyYirTpt2z*2SkL>yPR$c{F zX;4X31htg5B^t-y$U9^h2>aMVF3i9) z8gIY6-{w2V(|R7R>iT*Xn!C`fru@uYtTt+o`JmgV@~w!NkA6}ylwZe##tGJ{Zr8e9 awB4CG>>kbeFxR`vvXYI3sfx69)_nuTKQ#{k diff --git a/project/main/base/sysout.py b/project/main/base/sysout.py index b4db845..06eede4 100644 --- a/project/main/base/sysout.py +++ b/project/main/base/sysout.py @@ -1,15 +1,16 @@ # coding:utf-8 import logging -import os, sys +import os, sys, time + # from config import config # path = os.getcwd().split("/project")[0]+'/logs' -path = sys.argv[0].split("/project")[0]+'/logs' +path = sys.argv[0].split("/project")[0] + '/logs' logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(filename)s[line:%(lineno)d] %(levelname)s %(message)s', datefmt='%Y/%m/%d %H:%M:%S', - filename= path + '/NotebookServer.log', + filename=path + '/NotebookServer-' + time.strftime("%Y.%m.%d-%H:%M:%S", time.localtime()) + '.log', # filename= config.logpath, filemode='w') logger = logging.getLogger("NBLogger") @@ -24,7 +25,7 @@ def log(tag, msg): print(log) logging.log(log) except Exception as e: - print('Exception:'+str(e)) + print('Exception:' + str(e)) logging.error(str(e)) @@ -35,7 +36,7 @@ def err(tag, err): print(log) logging.debug(log) except Exception as e: - print('Exception:'+str(e)) + print('Exception:' + str(e)) logging.error(str(e)) @@ -46,5 +47,5 @@ def info(tag, msg): print(log) logging.info(log) except Exception as e: - print('Exception:'+str(e)) + print('Exception:' + str(e)) logging.error(str(e)) diff --git a/project/main/config/ws_conf.json b/project/main/config/ws_conf.json new file mode 100644 index 0000000..c2b641d --- /dev/null +++ b/project/main/config/ws_conf.json @@ -0,0 +1,4 @@ +{ + "ws_host": "127.0.0.1", + "ws_port": "8101" +} diff --git a/project/main/manager/__pycache__/fileManager.cpython-36.pyc b/project/main/manager/__pycache__/fileManager.cpython-36.pyc index a2592651a6da05e23b29ad4f0a14f56c0823b306..b95b874afb5cba82e02e534952ae81cf11d72538 100644 GIT binary patch delta 37 tcmez6_|=iqn3tC;^wpney^WlUBqxhWWKLcoEIwIVYBD3s<|9&OYyb&!4A%ev delta 105 zcmezB_{)*gn3tF9$;#i+IvY6`NxGFVq%dSN74f8S1~a5EmoSzvG&5$i7s;e>1v69% zl`v&7r?A#Ahyz6#8B(}|8CV!fShBf_q8J%!fg)7`DU2x`C5)3lN}gq7E#hHdVA#B0 H%8U&F@_-sG diff --git a/project/main/manager/__pycache__/projectManager.cpython-36.pyc b/project/main/manager/__pycache__/projectManager.cpython-36.pyc index cb67e74f09e1a0681e777d8df64554162680c3e6..dfe33a008c31ea6ea952c96619e2a7004b6bdf07 100644 GIT binary patch delta 97 zcmeCT?6u@H=H=yTUiUjXXd|aIGdB+d5HNB8q0weTW`1TyrOl3Po0%CsH-F_k!Niz5 zc^}U=#yOj}^2)L@F5P@tD2bVod9#_A6f2|Y=0IsfMqXYHbq-Z7Jq}K;I1VEKvF#Tx delta 99 zcmeCR?6>4J=H=zOyXJRv^hQo;W?nu9AYkMGLN-R7&HBvz%#6yL?b$XnGkR_Q%z1)| zF>mr7o^OnEH*e;ZWo2Bp`Jzw~Gb77p6EP`PMzhWS(uRz@d>rZ=s$6;;oLq4nMgZTD B7mWY_ diff --git a/project/main/manager/fileManager.py b/project/main/manager/fileManager.py index fecf006..6e17d71 100644 --- a/project/main/manager/fileManager.py +++ b/project/main/manager/fileManager.py @@ -409,9 +409,9 @@ def makeDir(dir): def createFile(file): - if dir == None: + if file == None: return (0, 'File can not be null !') - if "/" not in str(dir): + if "/" not in str(file): return (0, 'File form not support, should be absolute path !') else: try: diff --git a/project/main/server/__pycache__/httpServer.cpython-36.pyc b/project/main/server/__pycache__/httpServer.cpython-36.pyc index 361d76819e866d6c5b90798e4625521831655ca0..3a10feb550064e1d4da4e6a66eecaf522e8588a4 100644 GIT binary patch delta 2617 zcmai0OKcNI7~WaGHg;?r+p&`v$8JJM3<1&rt!RR(k`Nl80qTT@g8&mR#7_Ls>;eKI zL4^RR?V)r|y-<2-)k6=ILocWtd+I|y^suK^Ahl9ewN)R7Qc(YIY!cfz#jE{1yZ_Ah zKjxd6eead;cDOftz3xwc`FHlC=Wn~;P=l6c&T~DJoy>B-q9`9LJSc9eM_Gq>s6Ge< z=@pj{LaT!yCjPLcy3wi_8oGGM5D{7XqqQ+=S@v>%GHW@@`Ke4nPt*VO`LbR!FeI)! zwy?G0uH%CjFo1Uh;uz{Wt8*h)D)JV*Vu0rel4|9J8*K;g5yCl;?1fd1UxQX3pdWx< zb?zQGx3P7i+jV`Q-rWigY~&#O*uqV8)X~s9M<-* z)$7sMVVD_iR^nXBllO~zE&0J71ZqdG7JjC9C}++eEF}HB!EYrok#-Mt@@?qM>WT@D zQE}5f!$!rQ?yGVN{$ZP*uA7U$guWwy9`U}Xzi-*mcJSKgO9e`c>qcGme)ghc9H56{|R!=SAZg1a<%Y-sjS+Si&op$AnnUlFQMBe50e%j; zu~m=JZKOqC_{gQKl2VfPsS2ND25HjPFvm|Of;W9a67a&H8P zRbh5ql%z&iEAunX(&AcV{O|;PR@Dy|X|1}08)*lQfx4}P>{c6XFS;qc?B}JtK4jP8LuVXvcv1_bRZ|N;&S|Tq%xTV$%0G1OXi^4bip2)DA$LmK~o2mMvE_c@i(N#4U%;d5K&0yiqDzj>S@jX7reN zH@0zWFZw{jmPXT1E)@;^sgoC0Po`X6%*|ym2e-vvu?^8Yy`H06{&4)c=tfS)l-S_-Zaa{DMXTIB4;FurE}s|_e48lX{^hLc-TEM z*l;4?;RH&&X-i{Amk^+#T@WOy^q#6Z6d=(i= zsV(cFiRhY1fu}(*3pffm29U{AztSko8i|C&&P4wPo7)ixXhAKag|#7V75xXP<> R_RqNA#!se*OD5AI|R``dGiNhErO3i5uz6c!mcRMR{N0A#q2&z@p-z`k*O9 zQ(QtAqXaTUTjROZc_{!5ZT<1V?!;9ryEM^SLkvCti$g-tFv}=dhz}lR4lErpo zt;;N@dAXuW^`Rz<)g%)fBjS!e z%SOas`b}AazuDm9dGqiCSbGrACEoV-^;8`lf(YkQF;8J}!>q~PFWx=uh=};UVZGvK zUx&MrL!tZkdF_M~{+|6+LK&*e*eFq_JXv%0Vz!XsaAar4RQ|8 zM10T~8IVy|weA7;VL+YWNt*jZ{N5O4lTvVZ=<==v&DGGm?Wq7spST-ptsJE1@hnx> zA0HUb5UeZWQ7FdFkoMP3*>u7#li|symyOXZr<6t<1cEw1#E4nu~SMsr~_*tUp zX5z;{#2r*s#%G1M2M00k-OqIWp`QEYiW|#D}fP7|KjB z$b8D}wz`Y^k!JsKx+G1NRw<017opbCx#zHDqam>+rEOfQX3B+|x#o0}-D;#0ZyP2BuiD4Jy#kJ6?q zp7dgwZuw_<4=9p=5x@XJ%8QF)gMlBzG|n|Y0>HWCI7b`}FWb^`<(D&Ao^t1xFHsSx z3O}?RyVeJD7r+5%2DAX=^|ysvJ_hT5dgAC-j#lF+Jx8tntqsDml!^t@c%1W*wqehiWYKwA1Wy)1YPQRfrC8JC$Nyp@sfte*EK|ZP95{2R` ziL5E+JI9(qULWW|@k!^%Zd)^B4SryJhL%AZ6xGe#Ok+MZ&Ui$0BzEdh$YD!~@x&9? zWIbh#{V;d|)ykrmDqSTzr&``EdT6W4^79}_0p|N=VMuG%{F+Y-(8ouXpyt(d8Vzfm{{R^q!q)%* diff --git a/project/main/server/__pycache__/websocketServer.cpython-36.pyc b/project/main/server/__pycache__/websocketServer.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..6a956d2e9e6b6cc63c69a0e730eed0fd5c2d5978 GIT binary patch literal 2370 zcmZ`)&2Jk;6rb5IukE$-)h4Z4V2fIip^c-oLZB8XN)hy8L6fRzL$%uOOcHPGU3X^O zVB<)Y+&gdtA@1dm-~xX_PjleXQxE(D6$jp%O+p&Mtme&|nKvK%-tYb9YNJv6^{>A- zfAa}>PL7oZ=r^ItKS40UXpcl?OCxIfR%Dshj%?F9kz-mna-p?)UcVAmD6X-4e&3IL z(4DBtYs_Wd)cS5Vs&hLFczsHf#yvRUOLB*NMR+A^@+zxLEqb8y8P%9l?5hUz&yr{s z+A6ejyq?WZ$)O#q@fkkL=eDdVT_R}z8DVwiJb`n$n=MT3=oAZB;|YmQvnHE?c9GF_ z(wcn%|42G5sy#W9#ZaM^7Wr0pThHwA2kS+;%hfs;kGL2wloRbe8KbtG$s*Sj#=Ch} zg?lnA=a-k4!!W9V)lMOmQ3i!j<2PP43t5r#%dpItg&&3~UgfY@pxlHi&x7Cu9S=^Y z%z~@i%*I~>r@QbAo^Ze*Hy*n)Oi zp027L!4uZax3#xnRPDzx-Z_r7Urye>rJX$KbM5qsV$gE5BYAJ@XqJf@94P7_o)Xc7 z=HuYWEYchPB}N zHbg=mi^TF^BmlMKb*K^*LIdi-H$HPBX3K|vkWw^*g1&K~8viVVg8rG3eX6X?Rt}>R znz>NDEo;#rNmV8!^U-_8S5{|y`NVa?t_-D06u2%-R9Lzyyd=XbAX-)7!6~|#4u#;k zipyz%_s~u^-zv1d@yTbR3Vq`~ZHr-UeAu!?fL2r)UzTD9?G`{>geq}sLVbFMju%e; zI&9NvxfnzY83eHw$Nhp0d#DF-{BW4`${FKKv+1#eFnq$ChLA!SN>qHy_fot(mI_oH z{2i(cz{TiH1vteN1h?5!avR+CIoY?swH7!Q5)@sj9OWJ9mCQ#SZT=md0LAQD0TItY zv(G{z?^@y+?Bd}1Z+=l#=1%D?a{udndtx(h*V=bf4YhNGd8YvGtg=KV4)cGu_Fd&n zz}noYt}0o8y(um42BVJn18&7(sp*J2%2__qCU#s$1ldpB97Btwbd+IC$~}1M!kx zYFWAh*^qK6wS#Q2{nL+Fo_;*8-r*02T&i$$eEL3~kQd6-q}MCUVSfMXjOFeC`Yt2NYsw@MR{YXX;-{4LfgFw@ z4?(B>A}I3M*d8dIYP< z`VCMJs3j+sd9PgMO>JNS03$#Ph*s5b3||yg&jN%XGD7*fAXp{_$e=Y5HYVUsXBfiX z=QdYYuU}oger=`y{PFjzD=Xpp-Ll|+v6v|H$=423) z?jlyrYC^ouLp3w4C2b_YcO diff --git a/project/test/__init__.py b/project/test/__init__.py index 5d47134..9347927 100644 --- a/project/test/__init__.py +++ b/project/test/__init__.py @@ -1,2 +1,7 @@ import os -print(os.getcwd()) \ No newline at end of file +import datetime +import time +# print(os.getcwd()) + +print(time.asctime( time.localtime(time.time()) )) +print(time.strftime("%Y.%m.%d-%H:%M:%S", time.localtime())) \ No newline at end of file diff --git a/project/test/wsClient.py b/project/test/wsClient.py new file mode 100644 index 0000000..e367fb2 --- /dev/null +++ b/project/test/wsClient.py @@ -0,0 +1,38 @@ +import asyncio +import websockets +import json + +params = { + 'action': 'copyData', + 'userId': 1, + 'classId': 1, + 'projectId': 10, +} + + +async def hello(uri): + async with websockets.connect(uri) as websocket: + # print(websocket.is_alive()) + # print(websocket.isAlive()) + # print(websocket.close()) + await websocket.send(json.dumps(params)) + # res = await websocket.recv() + # print(res) + try: + while True: + res = await websocket.recv() + res = json.loads(res) + print(res) + if res['done'] == True: + websocket.close() + print('Procress to 100% Success!') + break + except Exception as e: + websocket.close() + + +# main +asyncio.get_event_loop().run_until_complete(hello('ws://localhost:8101')) + +# while True: +# asyncio.get_event_loop().run_until_complete(hello('ws://localhost:8765')) From 0ffd0e06f1ac3f5f87cc16418182f241870a6fce Mon Sep 17 00:00:00 2001 From: JerryYin Date: Thu, 29 Nov 2018 18:32:31 +0800 Subject: [PATCH 06/28] basic done copy class's dataset in websocket --- .idea/workspace.xml | 452 +++++++----------- logs/NotebookServer-2018.11.29-13:39:56.log | 33 ++ logs/NotebookServer-2018.11.29-13:42:01.log | 17 + logs/NotebookServer-2018.11.29-13:42:07.log | 18 + logs/NotebookServer-2018.11.29-13:42:16.log | 18 + logs/NotebookServer-2018.11.29-16:50:15.log | 33 ++ logs/NotebookServer-2018.11.29-16:51:00.log | 46 ++ logs/NotebookServer-2018.11.29-16:53:59.log | 31 ++ logs/NotebookServer-2018.11.29-16:55:27.log | 32 ++ logs/NotebookServer-2018.11.29-16:56:26.log | 32 ++ logs/NotebookServer-2018.11.29-16:57:23.log | 32 ++ logs/NotebookServer-2018.11.29-16:59:42.log | 77 +++ logs/NotebookServer-2018.11.29-17:35:34.log | 34 ++ logs/NotebookServer-2018.11.29-17:44:18.log | 50 ++ logs/NotebookServer-2018.11.29-17:49:36.log | 34 ++ logs/NotebookServer-2018.11.29-17:51:12.log | 34 ++ logs/NotebookServer-2018.11.29-17:56:28.log | 34 ++ logs/NotebookServer-2018.11.29-17:57:23.log | 34 ++ logs/NotebookServer-2018.11.29-17:57:47.log | 34 ++ logs/NotebookServer-2018.11.29-17:58:03.log | 34 ++ logs/NotebookServer-2018.11.29-17:59:10.log | 34 ++ logs/NotebookServer-2018.11.29-17:59:42.log | 34 ++ logs/NotebookServer-2018.11.29-18:00:34.log | 34 ++ logs/NotebookServer-2018.11.29-18:01:13.log | 50 ++ logs/NotebookServer-2018.11.29-18:03:29.log | 57 +++ logs/NotebookServer-2018.11.29-18:12:34.log | 17 + logs/NotebookServer-2018.11.29-18:12:47.log | 34 ++ logs/NotebookServer-2018.11.29-18:13:38.log | 34 ++ logs/NotebookServer-2018.11.29-18:14:10.log | 50 ++ logs/NotebookServer-2018.11.29-18:18:46.log | 34 ++ logs/NotebookServer-2018.11.29-18:23:06.log | 34 ++ logs/NotebookServer-2018.11.29-18:24:20.log | 34 ++ logs/NotebookServer-2018.11.29-18:25:43.log | 40 ++ logs/NotebookServer-2018.11.29-18:27:01.log | 34 ++ logs/NotebookServer-2018.11.29-18:29:24.log | 35 ++ logs/NotebookServer-2018.11.29-18:29:51.log | 40 ++ .../__pycache__/projectManager.cpython-36.pyc | Bin 7309 -> 10321 bytes project/main/manager/projectManager.py | 227 ++++++++- .../__pycache__/httpServer.cpython-36.pyc | Bin 8534 -> 8534 bytes .../websocketServer.cpython-36.pyc | Bin 2370 -> 3241 bytes project/main/server/websocketServer.py | 122 ++++- project/test/__init__.py | 10 +- project/test/process.py | 21 + project/test/syncTask.py | 14 + project/test/wsClient.py | 28 +- 45 files changed, 1800 insertions(+), 326 deletions(-) create mode 100644 logs/NotebookServer-2018.11.29-13:39:56.log create mode 100644 logs/NotebookServer-2018.11.29-13:42:01.log create mode 100644 logs/NotebookServer-2018.11.29-13:42:07.log create mode 100644 logs/NotebookServer-2018.11.29-13:42:16.log create mode 100644 logs/NotebookServer-2018.11.29-16:50:15.log create mode 100644 logs/NotebookServer-2018.11.29-16:51:00.log create mode 100644 logs/NotebookServer-2018.11.29-16:53:59.log create mode 100644 logs/NotebookServer-2018.11.29-16:55:27.log create mode 100644 logs/NotebookServer-2018.11.29-16:56:26.log create mode 100644 logs/NotebookServer-2018.11.29-16:57:23.log create mode 100644 logs/NotebookServer-2018.11.29-16:59:42.log create mode 100644 logs/NotebookServer-2018.11.29-17:35:34.log create mode 100644 logs/NotebookServer-2018.11.29-17:44:18.log create mode 100644 logs/NotebookServer-2018.11.29-17:49:36.log create mode 100644 logs/NotebookServer-2018.11.29-17:51:12.log create mode 100644 logs/NotebookServer-2018.11.29-17:56:28.log create mode 100644 logs/NotebookServer-2018.11.29-17:57:23.log create mode 100644 logs/NotebookServer-2018.11.29-17:57:47.log create mode 100644 logs/NotebookServer-2018.11.29-17:58:03.log create mode 100644 logs/NotebookServer-2018.11.29-17:59:10.log create mode 100644 logs/NotebookServer-2018.11.29-17:59:42.log create mode 100644 logs/NotebookServer-2018.11.29-18:00:34.log create mode 100644 logs/NotebookServer-2018.11.29-18:01:13.log create mode 100644 logs/NotebookServer-2018.11.29-18:03:29.log create mode 100644 logs/NotebookServer-2018.11.29-18:12:34.log create mode 100644 logs/NotebookServer-2018.11.29-18:12:47.log create mode 100644 logs/NotebookServer-2018.11.29-18:13:38.log create mode 100644 logs/NotebookServer-2018.11.29-18:14:10.log create mode 100644 logs/NotebookServer-2018.11.29-18:18:46.log create mode 100644 logs/NotebookServer-2018.11.29-18:23:06.log create mode 100644 logs/NotebookServer-2018.11.29-18:24:20.log create mode 100644 logs/NotebookServer-2018.11.29-18:25:43.log create mode 100644 logs/NotebookServer-2018.11.29-18:27:01.log create mode 100644 logs/NotebookServer-2018.11.29-18:29:24.log create mode 100644 logs/NotebookServer-2018.11.29-18:29:51.log create mode 100644 project/test/process.py create mode 100644 project/test/syncTask.py diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 625cefb..b195a8c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,13 @@ - - - + + - - - - + + + - @@ -328,7 +302,6 @@ - @@ -346,12 +319,6 @@ - - - - - - @@ -401,6 +368,7 @@ + + + + @@ -393,6 +395,13 @@ + + + + + + + @@ -403,11 +412,18 @@ - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7307e9e..3df15c2 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,10 @@ - + + + + @@ -322,7 +338,6 @@ - @@ -340,62 +355,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +