From 05df024ddc6c94796d5a20902e4b41c8c6468732 Mon Sep 17 00:00:00 2001
From: XinYi Song <2037158277@qq.com>
Date: Fri, 3 Dec 2021 17:33:02 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=96=AD?=
 =?UTF-8?q?=E7=82=B9=E7=BB=AD=E4=BC=A0=E6=9C=8D=E5=8A=A1=E7=AB=AF=EF=BC=8C?=
 =?UTF-8?q?=E7=94=A8socket=E5=BB=BA=E7=AB=8B=E8=BF=9E=E6=8E=A5=E9=80=9A?=
 =?UTF-8?q?=E9=81=93=202=E3=80=81=E4=BF=AE=E6=94=B9=E4=BA=86=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E7=94=9F=E6=88=90=E5=AD=98=E5=82=A8=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=E6=A8=A1=E5=9D=97=203=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=89=AB=E6=8F=8F=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 __pycache__/app.cpython-39.pyc                | Bin 477 -> 494 bytes
 .../config/__pycache__/factory.cpython-39.pyc | Bin 791 -> 1262 bytes
 common/config/factory.py                      |  26 +++---
 upload/__init__.py                            |   5 ++
 upload/__pycache__/__init__.cpython-39.pyc    | Bin 0 -> 205 bytes
 .../__pycache__/upload_client.cpython-39.pyc  | Bin 0 -> 2021 bytes
 upload/upload_client.py                       |  80 ++++++++++++++++++
 .../file_store_path.cpython-39.pyc            | Bin 1620 -> 1650 bytes
 .../http_file_upload.cpython-39.pyc           | Bin 1953 -> 1955 bytes
 .../__pycache__/scan_file_util.cpython-39.pyc | Bin 15999 -> 23608 bytes
 util/file_store_path.py                       |  12 +--
 util/http_file_upload.py                      |   8 +-
 util/scan_file_util.py                        |  74 ++++++++++------
 13 files changed, 157 insertions(+), 48 deletions(-)
 create mode 100644 upload/__init__.py
 create mode 100644 upload/__pycache__/__init__.cpython-39.pyc
 create mode 100644 upload/__pycache__/upload_client.cpython-39.pyc
 create mode 100644 upload/upload_client.py

diff --git a/__pycache__/app.cpython-39.pyc b/__pycache__/app.cpython-39.pyc
index 06757f94139292dce0022f1f99f76520b6429a8d..dc204d474d3d469e6762e85b9760819e39741842 100644
GIT binary patch
delta 67
zcmcc1{EnG7k(ZZ?0SNA#S(zv@kyn;6W}>#Aa6~Fw7FP;q3Rf>9BSQ*zFoPz~#Eyf!
WncB(>44RC$SPJrsN+x?UP5}T?HxbhS

delta 49
zcmaFIe3zLwk(ZZ?0SF@0mLzgd<dtQNn5gZ?ACk(pfNLQGBSQ*jFoP!7#GZqbqZp?E
E03rbleE<Le

diff --git a/common/config/__pycache__/factory.cpython-39.pyc b/common/config/__pycache__/factory.cpython-39.pyc
index 29ab233195d36aef96dfec44630fc5d9f0fd1b07..980327abfdff91956eca677710b7e8097ba3d3aa 100644
GIT binary patch
delta 469
zcmbQv_KuS;k(ZZ?0SNq$uT1>KH<51}mmrYm48+CrCZ5xcNa0T5NnuUlO<|wIlERn5
z4`d5~*@7uTK(;WLEs`P%WQ&2>;wchv^^z%4aJF=c42+%5nIb#!zbvENWLd_U98oM;
z`ANoA%9HyUCB@y{jD20a;!`q<GIbak7{GESRSF<E5f1|ku*4FWglUx;NJ1(&HLoNy
zFEz&yEIow@s?Q8f+6XND0H)glVl2Oh7g!(IDoco%KvbkLNO2S^&}oJSRf-^MID-8G
z0zjgZw=u@c+~Ua0%PfgcEGW3eT3nJ?RHDgviy6pU$xtLX*^tSHF>i7mlR_{%6C)V@
rVZqPh#jEZl(_fbVEG}G(9E?T6lUFlYiV6cGs0b8ONQBVjpG<N9;x%`f

delta 162
zcmaFIIh~C!k(ZZ?0SNxp&q<uaGLdf^7l`W&#Km3{&*>_qGo^6PVP43{$WX$vfVGAJ
z%3@o{z{pU;5X_*-Gr5p)=45x~c$p}U%)HE!_{4&OTdc(;iA5!vjJKG9yp;?^0+SCh
r`!H%u=4Vmh{mJx~<v)uE7b6E_k<jEO7E4hfplwA0sD$9;3oLQ~clIdp

diff --git a/common/config/factory.py b/common/config/factory.py
index e0df62e..ceb7f06 100644
--- a/common/config/factory.py
+++ b/common/config/factory.py
@@ -33,49 +33,49 @@ def create_app():
                             "id": "job3",  # 任务ID
                             "func": "util:scan_file_util.scan_GF3MDJ_dir",  # 任务位置
                             "trigger": "interval",  # 触发器
-                            "seconds": 3 * 60  # 时间间隔
+                            "seconds": 5 * 60  # 时间间隔
                         },
                         {
                             "id": "job4",  # 任务ID
                             "func": "util:scan_file_util.scan_H08_dir",  # 任务位置
                             "trigger": "interval",  # 触发器
-                            "seconds": 3 * 60  # 时间间隔
+                            "seconds": 7 * 60  # 时间间隔
                         },
                         {
                             "id": "job5",  # 任务ID
                             "func": "util:scan_file_util.scan_Sentinel1_dir",  # 任务位置
                             "trigger": "interval",  # 触发器
-                            "seconds": 3 * 60  # 时间间隔
+                            "seconds": 11 * 60  # 时间间隔
                         },
                         {
                             "id": "job6",  # 任务ID
                             "func": "util:scan_file_util.scan_Sentinel2_dir",  # 任务位置
                             "trigger": "interval",  # 触发器
-                            "seconds": 3 * 60  # 时间间隔
-                        },
-                        {
-                            "id": "job7",  # 任务ID
-                            "func": "util:scan_file_util.scan_Sentinel3OL_dir",  # 任务位置
-                            "trigger": "interval",  # 触发器
-                            "seconds": 3 * 60  # 时间间隔
+                            "seconds": 8 * 60  # 时间间隔
                         },
+                        # {
+                        #     "id": "job7",  # 任务ID
+                        #     "func": "util:scan_file_util.scan_Sentinel3OL_dir",  # 任务位置
+                        #     "trigger": "interval",  # 触发器
+                        #     "seconds": 5 * 60  # 时间间隔
+                        # },
                         {
                             "id": "job8",  # 任务ID
                             "func": "util:scan_file_util.scan_HJ1_dir",  # 任务位置
                             "trigger": "interval",  # 触发器
-                            "seconds": 3 * 60  # 时间间隔
+                            "seconds": 5 * 60  # 时间间隔
                         },
                         {
                             "id": "job9",  # 任务ID
                             "func": "util:scan_file_util.scan_ZY3_dir",  # 任务位置
                             "trigger": "interval",  # 触发器
-                            "seconds": 3 * 60  # 时间间隔
+                            "seconds": 5 * 60  # 时间间隔
                         },
                         {
                             "id": "job10",  # 任务ID
                             "func": "util:scan_file_util.scan_SNPP_dir",  # 任务位置
                             "trigger": "interval",  # 触发器
-                            "seconds": 3 * 60  # 时间间隔
+                            "seconds": 5 * 60  # 时间间隔
                         }
                   ]
         }
diff --git a/upload/__init__.py b/upload/__init__.py
new file mode 100644
index 0000000..00d56c8
--- /dev/null
+++ b/upload/__init__.py
@@ -0,0 +1,5 @@
+"""
+Author  : XinYi Song
+Time    : 2021/12/3 11:17
+Desc:
+"""
diff --git a/upload/__pycache__/__init__.cpython-39.pyc b/upload/__pycache__/__init__.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..4831f2e6057229b9e3a57cd5250f71b8cbecf57f
GIT binary patch
literal 205
zcmYe~<>g`kf~MY;iB3TJF^Gc<7=auIATH(r5-AK(3@MDk44O<;W?YV?B^mie3JO*V
z5t(_BnF_)AdFfmsnYpP7Kwza{WME{dZ)l`%tYBzpWoXXjl3JW>#pS2Tc#AzgJ|#an
zK7J)b5fji*F!9U4#VRH(Gbc5sJijPArl1mNc3x#^VqR`yOiFHXOld(*equ^Ye0*kJ
bW=VX!UP0w84x8Nkl+v73JCGAU12F>t5OXt+

literal 0
HcmV?d00001

diff --git a/upload/__pycache__/upload_client.cpython-39.pyc b/upload/__pycache__/upload_client.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..43cb636bdc44bd35fe65b3552b1e351fbc6a23ec
GIT binary patch
literal 2021
zcmaJ?&5ImG6tAlOn4X@G{mgD49tLEU5#7zKNlca?k;Fhi_Fz0{v(WT*)n<C9KgQ~6
zlUZsGG65wJ$jOu7%rXCf2<GIU(N|+2C+|7=UiZetJy^5#s_IqstNOk7es6<L$0g8K
z{&*TZZWHn+F5YeiEN(#0B?wMD!YOAl^=LIRk5!}L8P#ZdCX7aGCAMc%JZr{{#POV@
z=`|DAb14z#ackZdodxx}-13%qmpi=qkb2A9<*kRrTj6cqfpL|yyQIH#a>f0uP{U02
zdV9UEqx74ocQ;G#xnD(z=t0}-?Oxm+><o5y2ED=My}>p2mdL|B_a(fS?DuJDB>ZyU
zDA$joSopchr0~aq8u}9v$nxA-ZIY#GSgxH_^I&rF-cFI`N*19iq~JaeRInpOk|{7N
z(mYD<Rl1iHE`G^Dgbd$s+AJ8+nKz;5mp~|@$&7-eGkSqcnW7q;xemIi!I?HT$kbHq
z*qEEzTu^W(0e2YtvH{<o*qtrj+uG_|rF9f%fhvtC1(8qk(#{pn3RPP7Wuye0Fw!D{
zEfA&*l<*vsJ}ONmlJQd_SHR?}%eVFp5ca|SOpXr56YzODDS|W!4tSCu6l1uDpALQ)
zM<P|*<4I{82J#$YazGHeOxx6<at-DoI^uOh=qB_E{x(b$nUN_4(2ylFHf5U5nPzii
zK@cp=%msmw&aDLkXZt0ShkaY3PfIf!i?p<hF$6&XED`Y13gavnWpgMV@aUe%6$IT(
zgG7`x@$A4yY!%X4tfCzUa--U~0IR%W0=212yNKZ((1rNs*KHXlHuMUE1aykb$pXTp
z%{lM^->sN3U}bW)03LAjF`J>*n%f$19XF<yvW}g36IWAPxtIdehNj#aF?pa`nyI!n
zX2#S3oejFN>ikF70Nq2?eWT-!wzZ`V4IVtQAZeO#|B_nP&HDc8RcGEbb$N5z(k^$w
z+N=6JZ~f2twqm+nAz8t3+ES|!w>HGBqdW68-Kt{N($<JPq4GB9*3kpgF51@JdRLv(
z-5LFaz}FiZ&dwNx)8BUC^d`nyG2X#D0FA91+Tq<zqU}w>m-zC})^tfPK_0B^_t{Bn
zaBX*caOLXu?)J6lgLesuFt<*uLLGf{6)5kBG|V^<vNS7}TQ#c<WbxWK%az{B-~Pi`
z63^Vdc=6*(UXtseC@`&G{Pe@~-+z7n+oR{t<}ZGH^4FtZ{(koTE4ov%Yy{kD)`cQE
z5v7CEeaN>uMe7}`G(fY-SoF^WGqZ3cRM`l#G!-FGbS!JyDv3!Peg{_b(##bQx{)hC
zN4sWa!#NC~$e?vhONn$U&0z*>%utEd1wIie58}AA4kt?FvWYtg0!#`qlAAa+Vv$z#
zl;>gDUzS^_wYV6oq30l<u(FojFpFb&W0a*gGcHONj=XLK7H!urt07j8LRNZiwU5uu
zy(YTZkJ6*eYfF(AvGT=(C|8~{405cO%3C|tgEv%^7EqS6+^f9kXNSk7i3PS~MR=C9
zt92==czariAO%Q%0|Wu$x^%;AS7pelBo?GLTcxYeP3jmh1C3+3)Me1&*QQ+t8hW0}
z>tLhLB+|U9wEeZR;rl!beP6zhN-PpkiiG?SCk;R|jHAOU=H7atqIkPbiGTmmRIz#!
zCAm|5$0J$QCdaRF_?~n7&KIBix9)r?2Y3%w&^p%mq_=#4#ah<Y>w1#$A{L)w`sN!T
TObcP)ug%t3+cXW=cAS3zO~DY`

literal 0
HcmV?d00001

diff --git a/upload/upload_client.py b/upload/upload_client.py
new file mode 100644
index 0000000..f339c23
--- /dev/null
+++ b/upload/upload_client.py
@@ -0,0 +1,80 @@
+"""
+Author  : XinYi Song
+Time    : 2021/12/1 15:19
+Desc:
+"""
+import socket
+import sys
+import re
+import os
+from hashlib import md5
+
+from util.file_store_path import file_store_path_year, file_store_path_month, file_store_path_day
+
+FILE_DIR = os.path.dirname(__file__)
+
+# BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+# home = os.path.join(BASE_DIR, "/unstructured_data/remote_sensing_data")
+home = "/unstructured_data/remote_sensing_data"
+
+# 定义一个函数，计算进度条
+def bar(num=1, sum=100):
+    rate = float(num) / float(sum)
+    rate_num = int(rate * 100)
+    temp = '\r%d %%' % (rate_num)
+    sys.stdout.write(temp)
+
+def md5_file(name):
+  m = md5()
+  a_file = open(name, 'rb') #需要使用二进制格式读取文件内容
+  m.update(a_file.read())
+  a_file.close()
+  return m.hexdigest()
+
+
+def upload_file_client(file_path, depth, dateTime, collectionCode):
+    ck = socket.socket()
+    ck.connect(('192.168.2.9', 9002))
+    print(str(ck.recv(1024), encoding='utf-8'))
+    # inp = input('请输入（内容格式：post|文件路径 目标路径）: \n >>> ').strip()  # 输入内容格式：命令|文件路径 目标路径
+    # func, file_path = inp.split("|", 1)  # 将输入的内容拆分为两部分，方法名和路径
+    # local_path, target_path = re.split("\s*", file_path, 1) #再将路径部分，通过正则表达式。以空格拆分为：文件路径和上传的目标路径
+    file_byte_size = os.stat(file_path).st_size  # 获取文件的大小
+    file_name = os.path.basename(file_path)  # 设置文件名
+    md5 = md5_file(file_path)
+    if depth == 'year':
+        file_paths = file_store_path_year(dateTime, home, collectionCode)
+    if depth == 'month':
+        file_paths = file_store_path_month(dateTime, home, collectionCode)
+    if depth == 'day':
+        file_paths = file_store_path_day(dateTime, home, collectionCode)
+
+    post_info = "post|%s|%s|%s|%s|%s" % (file_name, file_byte_size, collectionCode, dateTime, depth)  # 将发送的内容进行拼接
+    ck.sendall(bytes(post_info, encoding='utf-8'))  # 向服务器端发送内容
+
+    result_exist = str(ck.recv(1024), encoding='utf-8')
+    has_sent = 0
+    if result_exist == "2003":
+        # inp = input("文件已存在，是否续传？Y/N:").strip()
+        # if inp.upper() == 'Y':
+        ck.sendall(bytes("2004", encoding='utf-8'))
+        result_continue_pos = str(ck.recv(1024), encoding='utf-8')  # 已经传输了多少的文件内容
+        print(result_continue_pos)
+        has_sent = int(result_continue_pos)
+
+        # else:
+        #     ck.sendall(bytes("2005", encoding='utf-8'))  #发送2005代表不续传
+
+    file_obj = open(file_path, 'rb')  # 对文件进行读操作
+    file_obj.seek(has_sent)  # 调整指针
+
+    while has_sent < file_byte_size:
+        data = file_obj.read(1024)
+        ck.sendall(data)
+        has_sent += len(data)
+        bar(has_sent, file_byte_size)  # 进度条
+
+    file_obj.close()
+    print("文件上传成功！")
+    uc = {'file_size': file_byte_size, 'fileName': file_name, 'md5': md5, 'file_path': file_paths+'/'+file_name, 'type': 'ok'}
+    return uc
diff --git a/util/__pycache__/file_store_path.cpython-39.pyc b/util/__pycache__/file_store_path.cpython-39.pyc
index c53f3ad0e22e98b91fb0d10817a1f9af56583890..a07dca298bb20ca600e13626a318de2194ae6f1b 100644
GIT binary patch
delta 331
zcmcb@^NEKqk(ZZ?0SIodU71+Gxsk7sk%Q0GN<SsBByn;h;}LsikR%ka0BLq0b_U{N
z6(CW<uz<0KA%$@vQ!R4|Qx@|AmKw$yrV`c~<`gDLhGxcv%#)j#)-bY6)@POxx+RdD
zpO=%9np~2ZpBJB;pOQM+o7uuo3}{X=x-A?qTl9#q1#BNP*glrY=b2YWh+{L76K13Z
kNk)PVX8{||I{5<2aYl*BGgy7NL9Q+W*;6Dj`8{hY0H#?&fdBvi

delta 304
zcmeywbA^X5k(ZZ?0SLq@mL&e;*vMDN$i$&Hxt;NdEfYu>3YdX38xT7Kaj_DRC}CK@
zSi_LQxR9xqse~zuc>zleV+m^wQwozLLo-lxau?GYS>`C-l*E$6_~MeH_>#=r)F|%K
zf}H%sl=y<gl8niz%oaYPK%<h;En<gRq(jgmu$9bUE14(1W?s!E1~zcwc?k<M5;TL2
gVF4S%GWi|LaYpgU+gN?LL9QzTnOGz~nU^gU0Q@^Z?EnA(

diff --git a/util/__pycache__/http_file_upload.cpython-39.pyc b/util/__pycache__/http_file_upload.cpython-39.pyc
index 6b6fa5abaa9cb33500c4052d83b8c4dae0db08ce..5e91e86e6149d785411ea09995d8b08920d108f8 100644
GIT binary patch
delta 522
zcmZvZJxe4(5QeMfv!{1vS8q?l;{sFB?BF6nG%yxCCy{Y`!H;!TcPqK08o>c0g9RhO
zU<M-tgJZ$}aPh$fnp|um{sU`t(Zp)HtD1hQ>h12Tb=69;B+(#te{-Gv{hiFCYOZ`=
zFd1dzANUWCz4~xsE%8d`vdrNr0uYqQP~o0qJ%T;A^y;1U$!93g1_o_N0fTW0$0}B3
z$YF&DjK<w}2HT|Ap@`kW&GbutgLH+%ZK)gA5yG0Fo}g!xe2AXCqeA*Z-cs{J^7j16
zZ6EuUV<V9@X~$88ga0BiGJ!~J<oZ44kiC5v;UE>^Q$~c__}3ga%4v>YE}`iY#|3@^
zt2rLw@GG@Xa0Bu$9#DIPKbH{dVU$farOr{h39GrY2pqm8hV;2^Q#c4m4>V(<qJAA!
z&Q_8rtzNy)0ehs4HjPW)Hn}<e<3+g8N_DT_$$DFd8SUKprh7;`sgkejuJ0an)2U8B
e@AbMJ+U@6CoxVAL^e?7kj8UVKb>hbtfx>5J1%r41

delta 520
zcmZusO-my|5UuL@>gmbEkL-F_(34k*HzCJW`~?Bgiw<@qnq(4_5{Xpf;#@oiJc)uc
z_y?4n_CM@-58f8`5BLwZM@9EwHIG*f?^V6JpDAYIB#sr>`n7eJ6p!%=E-h~~>IaA2
zR{gX;?9>NiYWLIeNs{)Gy6%mp-|;t|JEi5Vs+Oh2y2a=R0ubcLP~ed;4#AO=yXDWg
z<S}GuJdMUDpFxXEn1F*kV81{FM(uROaE~Ml3Nw+Y7k5Oez|o$aS}D6yx1n7tyrlRO
z;pP8A?OELeRX@=^T>Wus=WZd4w1L9cRV)h}KG|?m`!<|P)kn`hI~|zduxTUD>cE~9
zoh`G<=Qw(a71BIM8Loi|Ihx?;8`Umw3(_SQs5ZfI1EG9cn##7FbKKm9%~Y%c`|n1d
zzLaY+fpGknzUnY5?+x;W!W!+WS9aNBhm=-2y7f%V@${z~;$n42b^H5CcXyCb`^nR-
d0kwCePN>y9>|H&3*K-Ohs8CwG@$|-*_z$O8f{*|J

diff --git a/util/__pycache__/scan_file_util.cpython-39.pyc b/util/__pycache__/scan_file_util.cpython-39.pyc
index 25bb17fa8960bafeb65f246384f23e0644ee8608..0e3ac93a4b8b740fe29e82c615ee8a1055f47da1 100644
GIT binary patch
literal 23608
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
F{{dWfd+`7O

literal 15999
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

diff --git a/util/file_store_path.py b/util/file_store_path.py
index 439bc99..8afd439 100644
--- a/util/file_store_path.py
+++ b/util/file_store_path.py
@@ -18,7 +18,7 @@ def file_store_path(time_stamp):
     return os.path.join('E:/data/upload', str(t[0]), str(t[1]), str(t[2]))
 
 
-def file_store_path_year(data_str_time, upload_path):
+def file_store_path_year(data_str_time, upload_path, conllection_code):
     """
     目录到年
     :param upload_path:
@@ -26,10 +26,10 @@ def file_store_path_year(data_str_time, upload_path):
     :return:
     """
     t = time.strptime(data_str_time, '%Y-%m-%d %H:%M:%S')
-    return os.path.join(upload_path, str(t[0]))
+    return os.path.join(upload_path, conllection_code, str(t[0]))
 
 
-def file_store_path_month(data_str_time, upload_path):
+def file_store_path_month(data_str_time, upload_path, conllection_code):
     """
     目录到月
     :param upload_path:
@@ -37,10 +37,10 @@ def file_store_path_month(data_str_time, upload_path):
     :return:
     """
     t = time.strptime(data_str_time, '%Y-%m-%d %H:%M:%S')
-    return os.path.join(upload_path, str(t[0]), str(t[1]))
+    return os.path.join(upload_path, conllection_code, str(t[0]), str(t[1]))
 
 
-def file_store_path_day(data_str_time, upload_path):
+def file_store_path_day(data_str_time, upload_path, conllection_code):
     """
     目录到日
     :param upload_path:
@@ -48,7 +48,7 @@ def file_store_path_day(data_str_time, upload_path):
     :return:
     """
     t = time.strptime(data_str_time, '%Y-%m-%d %H:%M:%S')
-    return os.path.join(upload_path, str(t[0]), str(t[1]), str(t[2]))
+    return os.path.join(upload_path, conllection_code, str(t[0]), str(t[1]), str(t[2]))
 
 
 if __name__ == '__main__':
diff --git a/util/http_file_upload.py b/util/http_file_upload.py
index 23bb749..d2f1a7e 100644
--- a/util/http_file_upload.py
+++ b/util/http_file_upload.py
@@ -34,7 +34,7 @@ def md5_file(name):
   return m.hexdigest()
 
 
-def upload_client(local_path, depth, dateTime):
+def upload_client(local_path, depth, dateTime, conllection_code):
     global file_path
     while True:
         file_byte_size = os.stat(local_path).st_size  # 获取文件的大小
@@ -45,15 +45,15 @@ def upload_client(local_path, depth, dateTime):
         file_obj = open(local_path, 'rb')  # 对文件进行读操作
         file_obj.seek(has_sent)  # 调整指针
         if depth == 'year':
-            file_path = file_store_path_year(dateTime, home)
+            file_path = file_store_path_year(dateTime, home, conllection_code)
             if not os.path.exists(file_path):
                 os.makedirs(file_path)
         if depth == 'month':
-            file_path = file_store_path_month(dateTime, home)
+            file_path = file_store_path_month(dateTime, home, conllection_code)
             if not os.path.exists(file_path):
                 os.makedirs(file_path)
         if depth == 'day':
-            file_path = file_store_path_day(dateTime, home)
+            file_path = file_store_path_day(dateTime, home, conllection_code)
             if not os.path.exists(file_path):
                 os.makedirs(file_path)
         path = os.path.join(file_path, file_name)
diff --git a/util/scan_file_util.py b/util/scan_file_util.py
index 3080cea..4a4140b 100644
--- a/util/scan_file_util.py
+++ b/util/scan_file_util.py
@@ -13,6 +13,7 @@ from common.tools.dms import dms_login, dms_task_record, dms_sensing_data
 from scan_data.GetMetaInfo import GetGFPMSData, GetGF3MDJData, GetH08Data, GetSentinel1Data, GetSentinel2Data, \
     GetSentinel3OLData, GetHJ1Data, GetZY3Data, GetSNPPData
 from scan_data.example import GetJPSSData
+from upload.upload_client import upload_file_client
 from util.http_file_upload import upload_client
 from util.http_util import httpUtil
 from util.remote_sensing_util import gf4_pmi_001
@@ -122,7 +123,9 @@ def scan_VJ102_dir():
     解析JPSS-VJ102元数据
     :return:
     """
-    file_dir = 'E:/数管'
+    # file_dir = 'E:/数管'
+    file_dir = '\\\\192.168.2.85\\数据\\不同传感器数据\\JPSS'
+    dir_list = os.listdir(file_dir)
     print('开始扫描VJ102IMG数据集')
     collectionCode = 'VJ102IMG'
     # 用户登录
@@ -172,7 +175,8 @@ def scan_VJ102_dir():
                 CollectionCode = JPSSData_dict['CollectionCode']
                 DirectoryDepth = JPSSData_dict['DirectoryDepth']
                 StartTime = JPSSData_dict['StartTime']
-                uc = upload_client(path, DirectoryDepth, StartTime[0:19])
+                # uc = upload_client(path, DirectoryDepth, StartTime[0:19])
+                uc = upload_file_client(path, DirectoryDepth, StartTime[0:19], collectionCode)
 
                 StartTime = time.mktime(time.strptime(JPSSData_dict['StartTime'][0:19], '%Y-%m-%d %H:%M:%S'))
                 EndTime = time.mktime(time.strptime(JPSSData_dict['EndTime'][0:19], '%Y-%m-%d %H:%M:%S'))
@@ -220,7 +224,8 @@ def scan_VJ103_dir():
     :param file_dir:
     :return:
     """
-    file_dir = 'E:/数管'
+    # file_dir = 'E:/数管'
+    file_dir = '\\\\192.168.2.85\\数据\\不同传感器数据\\JPSS'
     print('开始扫描VJ103IMG数据集')
     collectionCode = 'VJ103IMG'
     # 用户登录
@@ -269,7 +274,8 @@ def scan_VJ103_dir():
                 CollectionCode = JPSSData_dict['CollectionCode']
                 DirectoryDepth = JPSSData_dict['DirectoryDepth']
                 StartTime = JPSSData_dict['StartTime']
-                uc = upload_client(path, DirectoryDepth, StartTime[0:19])
+                # uc = upload_client(path, DirectoryDepth, StartTime[0:19])
+                uc = upload_file_client(path, DirectoryDepth, StartTime[0:19], collectionCode)
 
                 StartTime = time.mktime(time.strptime(JPSSData_dict['StartTime'][0:19], '%Y-%m-%d %H:%M:%S'))
                 EndTime = time.mktime(time.strptime(JPSSData_dict['EndTime'][0:19], '%Y-%m-%d %H:%M:%S'))
@@ -316,7 +322,8 @@ def scan_GF1_PMS2_dir():
     获取高分 PMS卫星元数据
     :return:
     """
-    file_dir = 'E:/数管'
+    # file_dir = 'E:/数管'
+    file_dir = '\\\\192.168.2.85\\数据\\不同传感器数据\\GF-1'
     print('开始扫描GF1_PMS2_001数据集')
     collectionCode = 'GF1_PMS2_001'
     # 用户登录
@@ -366,7 +373,8 @@ def scan_GF1_PMS2_dir():
                 CollectionCode = GFPMS_dict['CollectionCode']
                 DirectoryDepth = GFPMS_dict['DirectoryDepth']
                 StartTime = GFPMS_dict['StartTime']
-                uc = upload_client(path, DirectoryDepth, StartTime[0:19])
+                # uc = upload_client(path, DirectoryDepth, StartTime[0:19])
+                uc = upload_file_client(path, DirectoryDepth, StartTime[0:19], collectionCode)
 
                 StartTime = time.mktime(time.strptime(GFPMS_dict['StartTime'][0:19], '%Y-%m-%d %H:%M:%S'))
                 EndTime = time.mktime(time.strptime(GFPMS_dict['EndTime'][0:19], '%Y-%m-%d %H:%M:%S'))
@@ -413,7 +421,8 @@ def scan_GF3MDJ_dir():
     获取高分3号MDJ（GF-3 MDJ）卫星元数据
     :return:
     """
-    file_dir = 'E:/数管'
+    # file_dir = 'E:/数管'
+    file_dir = '\\\\192.168.2.85\\数据\\不同传感器数据\\GF-3'
     print('开始扫描GF3_MDJ_SS数据集')
     collectionCode = 'GF3_MDJ_SS'
     # 用户登录
@@ -462,7 +471,8 @@ def scan_GF3MDJ_dir():
                 CollectionCode = GF3_MDJ_SS_dict['CollectionCode']
                 DirectoryDepth = GF3_MDJ_SS_dict['DirectoryDepth']
                 StartTime = GF3_MDJ_SS_dict['StartTime']
-                uc = upload_client(path, DirectoryDepth, StartTime[0:19])
+                # uc = upload_client(path, DirectoryDepth, StartTime[0:19])
+                uc = upload_file_client(path, DirectoryDepth, StartTime[0:19], collectionCode)
 
                 StartTime = time.mktime(time.strptime(GF3_MDJ_SS_dict['StartTime'][0:19], '%Y-%m-%d %H:%M:%S'))
                 EndTime = time.mktime(time.strptime(GF3_MDJ_SS_dict['EndTime'][0:19], '%Y-%m-%d %H:%M:%S'))
@@ -506,10 +516,11 @@ def scan_GF3MDJ_dir():
 
 def scan_H08_dir():
     """
-    获取高分3号MDJ（GF-3 MDJ）卫星元数据
+    获取葵花8卫星元数据
     :return:
     """
-    file_dir = 'E:/数管'
+    # file_dir = 'E:/数管'
+    file_dir = '\\\\192.168.2.85\\数据\\不同传感器数据\\葵花8'
     print('开始扫描H08数据集')
     collectionCode = 'NC_H08'
     # 用户登录
@@ -558,7 +569,8 @@ def scan_H08_dir():
                 CollectionCode = GetH08_dict['CollectionCode']
                 DirectoryDepth = GetH08_dict['DirectoryDepth']
                 StartTime = GetH08_dict['ProduceTime'][0:10] + ' ' + GetH08_dict['ProduceTime'][11:19]
-                uc = upload_client(path, DirectoryDepth, StartTime)
+                # uc = upload_client(path, DirectoryDepth, StartTime)
+                uc = upload_file_client(path, DirectoryDepth, StartTime, collectionCode)
 
                 StartTime = time.mktime(time.strptime(GetH08_dict['ProduceTime'][0:10] + ' ' + GetH08_dict['ProduceTime'][11:19], '%Y-%m-%d %H:%M:%S'))
                 EndTime = time.mktime(time.strptime(GetH08_dict['ProduceTime'][0:10] + ' '+ GetH08_dict['ProduceTime'][11:19], '%Y-%m-%d %H:%M:%S'))
@@ -605,7 +617,8 @@ def scan_Sentinel1_dir():
     获取哨兵1号卫星元数据
     :return:
     """
-    file_dir = 'E:/数管'
+    # file_dir = 'E:/数管'
+    file_dir = '\\\\192.168.2.85\\数据\\不同传感器数据\\SENTINEL-1'
     print('开始扫描Sentinel1数据集')
     collectionCode = 'S1A_IW_GRDH'
     # 用户登录
@@ -654,7 +667,8 @@ def scan_Sentinel1_dir():
                 CollectionCode = Sentinel1_dict['CollectionCode']
                 DirectoryDepth = Sentinel1_dict['DirectoryDepth']
                 StartTime = Sentinel1_dict['ProduceTime'][0:10] + ' ' + Sentinel1_dict['ProduceTime'][11:19]
-                uc = upload_client(path, DirectoryDepth, StartTime)
+                # uc = upload_client(path, DirectoryDepth, StartTime)
+                uc = upload_file_client(path, DirectoryDepth, StartTime, collectionCode)
 
                 StartTime = time.mktime(time.strptime(Sentinel1_dict['StartTime'][0:10] + ' ' + Sentinel1_dict['StartTime'][11:19], '%Y-%m-%d %H:%M:%S'))
                 EndTime = time.mktime(time.strptime(Sentinel1_dict['StopTime'][0:10] + ' ' + Sentinel1_dict['StopTime'][11:19], '%Y-%m-%d %H:%M:%S'))
@@ -701,7 +715,8 @@ def scan_Sentinel2_dir():
     获取哨兵2号卫星元数据
     :return:
     """
-    file_dir = 'E:/数管'
+    # file_dir = 'E:/数管'
+    file_dir = '\\\\192.168.2.85\\数据\\不同传感器数据\\SENTINEL-2'
     print('开始扫描Sentinel2数据集')
     collectionCode = 'S2B'
     # 用户登录
@@ -750,7 +765,8 @@ def scan_Sentinel2_dir():
                 CollectionCode = Sentinel2_dict['CollectionCode']
                 DirectoryDepth = Sentinel2_dict['DirectoryDepth']
                 StartTime = Sentinel2_dict['ProduceTime'][0:10] + ' ' + Sentinel2_dict['ProduceTime'][11:19]
-                uc = upload_client(path, DirectoryDepth, StartTime)
+                # uc = upload_client(path, DirectoryDepth, StartTime)
+                uc = upload_file_client(path, DirectoryDepth, StartTime, collectionCode)
 
                 StartTime = time.mktime(time.strptime(Sentinel2_dict['StartTime'][0:10] + ' ' + Sentinel2_dict['StartTime'][11:19], '%Y-%m-%d %H:%M:%S'))
                 EndTime = time.mktime(time.strptime(Sentinel2_dict['StopTime'][0:10] + ' ' + Sentinel2_dict['StopTime'][11:19], '%Y-%m-%d %H:%M:%S'))
@@ -797,7 +813,8 @@ def scan_Sentinel3OL_dir():
     获取哨兵3号卫星元数据
     :return:
     """
-    file_dir = 'E:/数管'
+    # file_dir = 'E:/数管'
+    file_dir = '\\\\192.168.2.85\\数据\\不同传感器数据\\SENTINEL-3'
     print('开始扫描Sentinel3数据集')
     collectionCode = 'Sentinel3_OLCI'
     # 用户登录
@@ -847,7 +864,8 @@ def scan_Sentinel3OL_dir():
                 CollectionCode = Sentinel3OL_dict['CollectionCode']
                 DirectoryDepth = Sentinel3OL_dict['DirectoryDepth']
                 StartTime = Sentinel3OL_dict['StartTime'][0:10] + ' ' + Sentinel3OL_dict['StartTime'][11:19]
-                uc = upload_client(path, DirectoryDepth, StartTime)
+                # uc = upload_client(path, DirectoryDepth, StartTime)
+                uc = upload_file_client(path, DirectoryDepth, StartTime, collectionCode)
 
                 StartTime = time.mktime(time.strptime(Sentinel3OL_dict['StartTime'][0:10] + ' ' + Sentinel3OL_dict['StartTime'][11:19], '%Y-%m-%d %H:%M:%S'))
                 EndTime = time.mktime(time.strptime(Sentinel3OL_dict['StopTime'][0:10] + ' ' + Sentinel3OL_dict['StopTime'][11:19], '%Y-%m-%d %H:%M:%S'))
@@ -894,7 +912,8 @@ def scan_HJ1_dir():
     获取环境1号卫星元数据
     :return:
     """
-    file_dir = 'E:/数管'
+    # file_dir = 'E:/数管'
+    file_dir = '\\\\192.168.2.85\\数据\\不同传感器数据\\HJ-1'
     print('开始扫描环境1号数据集')
     collectionCode = 'HJ-1'
     # 用户登录
@@ -943,7 +962,8 @@ def scan_HJ1_dir():
                 CollectionCode = GetHJ1Data_dict['CollectionCode']
                 DirectoryDepth = GetHJ1Data_dict['DirectoryDepth']
                 StartTime = GetHJ1Data_dict['ProductTime'][0:10] + ' ' + GetHJ1Data_dict['ProductTime'][11:19]
-                uc = upload_client(path, DirectoryDepth, StartTime)
+                # uc = upload_client(path, DirectoryDepth, StartTime)
+                uc = upload_file_client(path, DirectoryDepth, StartTime, collectionCode)
 
                 StartTime = time.mktime(time.strptime(GetHJ1Data_dict['StartTime'][0:10] + ' ' + GetHJ1Data_dict['StartTime'][11:19], '%Y-%m-%d %H:%M:%S'))
                 EndTime = time.mktime(time.strptime(GetHJ1Data_dict['EndTime'][0:10] + ' ' + GetHJ1Data_dict['EndTime'][11:19], '%Y-%m-%d %H:%M:%S'))
@@ -990,7 +1010,8 @@ def scan_ZY3_dir():
     获取资源3号卫星元数据
     :return:
     """
-    file_dir = 'E:/数管'
+    # file_dir = 'E:/数管'
+    file_dir = '\\\\192.168.2.85\\数据\\不同传感器数据\\ZY-3'
     print('开始扫描资源3号数据集')
     collectionCode = 'ZY-3'
     # 用户登录
@@ -1038,7 +1059,7 @@ def scan_ZY3_dir():
                 CollectionCode = GetZY3Data_dict['CollectionCode']
                 DirectoryDepth = GetZY3Data_dict['DirectoryDepth']
                 StartTime = GetZY3Data_dict['ProduceTime'][0:10] + ' ' + GetZY3Data_dict['ProduceTime'][11:19]
-                uc = upload_client(path, DirectoryDepth, StartTime)
+                uc = upload_file_client(path, DirectoryDepth, StartTime, collectionCode)
 
                 StartTime = time.mktime(time.strptime(GetZY3Data_dict['StartTime'][0:10] + ' ' + GetZY3Data_dict['StartTime'][11:19], '%Y-%m-%d %H:%M:%S'))
                 EndTime = time.mktime(time.strptime(GetZY3Data_dict['EndTime'][0:10] + ' ' + GetZY3Data_dict['EndTime'][11:19], '%Y-%m-%d %H:%M:%S'))
@@ -1085,7 +1106,8 @@ def scan_SNPP_dir():
     获取资源3号卫星元数据
     :return:
     """
-    file_dir = 'E:/数管'
+    # file_dir = 'E:/数管'
+    file_dir = '\\\\192.168.2.85\\数据\\不同传感器数据\\VIIRS'
     print('开始扫描VNP02IMG数据集')
     collectionCode = 'VNP02IMG'
     # 用户登录
@@ -1117,6 +1139,7 @@ def scan_SNPP_dir():
             if os.path.isfile(path):  # 判断是否是文件还是目录需要用绝对路径
                 # 解析遥感数据文件（demo）
                 GetSNPPData_dict = GetSNPPData(path, xmlPath, ThumbnailPath)
+                print(GetSNPPData_dict)
                 # 配置文件服务器参数
                 url = Config.DFS_UPLOAD_URL
                 files = {'file': open(GetSNPPData_dict['xmlPath'], 'rb')}
@@ -1133,7 +1156,8 @@ def scan_SNPP_dir():
                 CollectionCode = GetSNPPData_dict['CollectionCode']
                 DirectoryDepth = GetSNPPData_dict['DirectoryDepth']
                 StartTime = GetSNPPData_dict['ProductionTime'][0:10] + ' ' + GetSNPPData_dict['ProductionTime'][11:19]
-                uc = upload_client(path, DirectoryDepth, StartTime)
+                # uc = upload_client(path, DirectoryDepth, StartTime, collectionCode)
+                uc = upload_file_client(path, DirectoryDepth, StartTime, collectionCode)
 
                 StartTime = time.mktime(time.strptime(GetSNPPData_dict['StartTime'][0:10] + ' ' + GetSNPPData_dict['StartTime'][11:19], '%Y-%m-%d %H:%M:%S'))
                 EndTime = time.mktime(time.strptime(GetSNPPData_dict['EndTime'][0:10] + ' ' + GetSNPPData_dict['EndTime'][11:19], '%Y-%m-%d %H:%M:%S'))
@@ -1180,7 +1204,7 @@ if __name__ == '__main__':
     # list_dir(file_dir)
     # file_dir = 'E:/数管'
     #
-    # scan_VJ102_dir()
+    scan_VJ102_dir()
     #
     # scan_VJ103_dir()
 
@@ -1192,4 +1216,4 @@ if __name__ == '__main__':
     # scan_Sentinel3OL_dir()
     # scan_HJ1_dir()
     # scan_ZY3_dir()
-    scan_SNPP_dir()
\ No newline at end of file
+    # scan_SNPP_dir()
\ No newline at end of file