From d6a66ccea6de3e9f495cc6d8cc5097bcafcf78c6 Mon Sep 17 00:00:00 2001
From: root <pengtao@kingsome.cn>
Date: Mon, 12 Aug 2019 17:28:37 +0800
Subject: [PATCH] fix bug

---
 config/__pycache__/config.cpython-36.pyc     | Bin 1003 -> 1038 bytes
 config/config.py                             |   2 +-
 mytask/__pycache__/tasks_base.cpython-36.pyc | Bin 1617 -> 2099 bytes
 mytask/__pycache__/tga.cpython-36.pyc        | Bin 9438 -> 11920 bytes
 mytask/tga.py                                |   1 +
 ops/scripts.py                               |  11 ++++-------
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/config/__pycache__/config.cpython-36.pyc b/config/__pycache__/config.cpython-36.pyc
index 1230e99f3b7c483bb0bf08f94e67889581b22142..81e047fed5547f49ae82d40147860a38a174defe 100644
GIT binary patch
delta 155
zcmaFO-p9dd%*)HApcWXLKan$t(=3W5MLC#3(|lt}HKWEY-prEJ+~W9xqWqN7<kVX{
z5N>jQUU6yeEzaVM#G=&r+{A*-zZk6;?YI~i7>c+-gba{a$y|gGkVO}e0}5y|7wLjj
V>wyUU$uZ29Y$hP4$>iD00RT08CGG$K

delta 120
zcmeC<c+Jjf%*)HQOFl5xZz5+9r)d;RigGZ6rrE}nYDVdoFPRw_ZgH1o7MEle#}_1~
zr`}>uOo`9TOUvKP&Sb@?A;ZAHP{a))WP!v=<|2fE98f@$sYn+jsW-Wv*^<o|#5A6~
Hk2wGUomU+E

diff --git a/config/config.py b/config/config.py
index 28490e6..69cce0a 100644
--- a/config/config.py
+++ b/config/config.py
@@ -14,4 +14,4 @@ if not is_debug:
         (1016, 6001, 'shop_1016'), (1016, 6001, 'shop_new_1016'), (1016, 6001, 'tap_1016'),
         (1016, 6001, 'tap_new_1016'), (2001, 6001, 'tap_2001'), (2001, 6001, 'tap_new_2001'))
 else:
-    event_list = ((1001, 6001, 'items_produce'), (1001, 6001, 'items_consum'),(1001, 6001, 'share_map'))
+    event_list = ((1004, 6001, 'items_produce'), (1004, 6001, 'items_consum'),(1004, 6001, 'share_map'))
diff --git a/mytask/__pycache__/tasks_base.cpython-36.pyc b/mytask/__pycache__/tasks_base.cpython-36.pyc
index dba3629d55c7d3ca2579bc260db556390be1189a..4ecc5835ac6a2d57a0dedc3c7250b5c77060143b 100644
GIT binary patch
delta 312
zcmcb}vspmdn3tDJK{+sX84Cl$V+JGu<TE$`adFo~<sw<p6tNbDDE<`j6bT?LkRq8P
z1*8R2n1UHJr8mx!VV(Su$y!7>wJbHSBtEkwHMcmvpeR43G&yy$4YQ28cu{FyJQhhK
zkOd%{7#O)2i)1FhW3m$#LROcYpI2O(3o=7Z4BZTfoH>dSazG>8I5HB8QsZ+I3xN7G
zWMCX?6om>vo~F>`9jvk3GC*dL9EebuEXby&0OIp7axif*3$SpoaInH5gv|l~B7sSz

delta 91
zcmdliaFIvZn3tDpmwaGsH8TUlV+JI^0%SV?adFW^<sw$5U<OUmjhkdxnKbz)x3b4h
a{>ZK*B?gq{VdP-qVisWGVBuheLlyw&#to7H

diff --git a/mytask/__pycache__/tga.cpython-36.pyc b/mytask/__pycache__/tga.cpython-36.pyc
index 3d3ca620dfc922b3b21787b8969e9240c4053a0f..62a66c769454ea32d93ccddb9b8934ec8379a5e3 100644
GIT binary patch
delta 3476
zcmbtWZD<_F8J^jXyVZT^P9K&}cW15jVdq>+)yZyRC34~q*^Y=JDV9Rw!|rvf*{G-J
zK0LdUEwMth^52x23BeFMNlT%B0%?0t3jI;~tN&U`p@E|mLPGPqw1Gkk?fcH2btn0p
zn0A+ac6R2SeV?6q_L=$1%nxo1or*?7iDR$a_~ILcd`eml70Tz}a&F%pdTD|Yrmsax
z(R`E=TVsJ;3U_@qW_Rw=eEbSwL1x?`%-B`(38pTRY{%WV7kjd_9$&HDg0<`xH;V3N
zp~#%OpN~;b9HMrb9lk^IF_vWgaPMR(mWF$rWuW(w+78Xo=R%O5hY=zOQ3T|b56ib!
zi-kAsO&-H)9U+d8K<E-5E0Z)S66yqvi)r;gv|CJTS=uYg+Q>i>LnQP=sU9oH*Kyk_
zl&z9IBz~^_Biu|I5<k<&awbOVY`s)<S|~||J<yboRoC5uy<wN#0<&C;M@2l4Io*rB
zG_1%6-4(0gT2()BGkfPPUUcmOw!TqZvz^hJ75F>dIR-tmA^&SyxIit(e02jk%S=yU
zT^8X4!byOv#%1OX=Q|d+3(n28dbn7IDX<wn@DU6=FbZLxyzDVaYJW6lmB1LreO-)%
z2lHRShmT|E<Eii*wof1&OfG&H?xB}zzX*S*eAQR`S?~)Fq{{042dnsXU&HnxfV$?|
zrAG$*;fK1`iv0>iIfnp9<d_nnwNGN7D*^Zw2!C4qE-~=`^5M_mtM>TtGx&I5+&dfN
zj&urT`_?MN_>`hg*Vek8Rp_YrNzX@@|K|w^$f4oSVeTn$zc>4c{(S}(D{K^*UAa^H
ztan}wG~y?dPdEzg=6+vl%zqZ)d4v}b4h%)tej+#;KZdZ{$H`kN&4~HTiH8$1jJ@S=
zvG)i1+UUlHb^>Woxq$6YFe?e4%0|&~i%y{mbMss1>D2z2F%>#pOPW^|S{G}BCjyu8
zjTglI!NWee2uE^t4Xnv&`F;2EtgFSc%aLqduW~H!an5%5^A&)`yaAKqZdPrFOX5MS
z3xdWAx$)d1y2?PSKcv#uqI;uREWc6tt5_JC?OUc0g9rL0`sqcuoO|M@fy}ob1h=V2
zR@GI_qq}rl@f7~{ZRRP{<i_=Fb#tspwlz<^u6Y{MrwCv`Vo;(1NLF=E!<FGRa`UuC
z+`yY5{(VaDbc3wJQ^l|P2X?l8xp-;z(#55a*>X7RrKiB1N`>XJn>8)Rln>?g(#d^c
zvbM<fSAuUlm9p8c5+;sYrM*{NzB>Q1FpfsWLZ2c2lsYbU`b;_}{t!)xU&j;l43xUX
z3+Ybf+Hvt-df=O1lJ4=@@T=+?P<QIV#tZ5JpJP4Z-+fx*Mkeh`#%Q;q9Q3-EV5S;2
zCk0$rE9<Vbxwf{_?aw|k0R8d`TVJ-jVfGzdJxKfrjZlq-E>Hz-X&Qrb>&O+`z0516
zr4?(eP4D*F`2e(&6(=K|NAEvIEPFB$-|b9_QpDJKry&Z1g*^3L!om+!7Gcr16iTj<
zn^UjD^%`LWHUhD^t$S_cVm_f>d>I`S%&^&3GL71XX2ieDRAi&EqHm3aO!2LFznG1N
z^nv3hJblug))!=nCJv)~^hy7zr%#+aZ0OhJ(+BCye0vg&Z2NVzj{@k3zYKH5=Md%*
z766*E>1eT+2sZEcn5L!hgWBP^?mb>R4IlQkvs@{|Xpc3ebBsn}sGX*C#NU!VJFU@s
zQb7|#YSLzY1O=Dul5NV+UdSq41(N}*Q9YHvcl&#u3RbhVt%1>ik#KW!+S9J9p3W37
z7oDjRwJGANO!xG6$ph$1iATY(bT+3Y$u5Ng$_<@JZ#a?JaH4w+(WxxxX&^cSMAyMW
z4bhn(I<q0V@SHUx{@gzhIKODZe=KOKcW`=UacO4m;*vQyWGydO)?u4hWP@1~Le>k?
zr^Ii}lwyX&zs)52i;|lZANCCQ<;KTzD20~e{M@uD&WAE*AE_N22E&ruI(zW!@rm)=
z<mmXB(eY<mUU22={HqJ*g=-<qH_UOblGh~#{vwpOwA{ogGaqi*ayJDN<OYPu{iE+L
zs0+CYHMNrU7s`C3<qeL%Vt%=39`0l0j<aM{XHYR|NI+;H+NZ(p3N@p_snA1UH(h8t
z;`ibH00hrv6XN}$k)0G0l8d`s4^QFaX@p6HXA#aJoJT-W@mYkc2#W|y2+eJUEa7U%
zI{-T2l9UW;bQ>WfBG07JZ<xlAF<^{_jg*m+q1i4mIXoITf?Z9qHhk31hbvWQ%vt8e
zs_V#stard3e73T(Vsri~2Fgu1CTho^ZcLTHh1cxo6{OJx5C;<mDscADh-%P~`d=Xm
B%{Tx6

delta 1677
zcmbtU%}*0S6yMq1ZogZom9&IPp@J+}<g*AE1&JRBN)Wv?A)8HhC{-wBb}4}nNyJ2t
zk~x`pFot+FW)J=a-t=Z-(t{o}F?!XrI&T+BEf9!y(_d!Zym`Ohy!U1vPk$Uubo>3D
zLVR+%w~gaIb7en)jfdD@pW94~HDgh8Y#_v8#~mN`Z=iJG3a3e$^8u$hH~4f=6Q(%X
zwfSs{I#D~)XbNGGSt90Z6hnh<7KeBMyZ}A`h@bXmu%W2=ta2Bx5I>k506~B%fNB~P
z`cZ_A3SB5b*M#3FMAt+ah3N~isXhWO7DU;o7*MQm1glC;oyQIIyZF<)OY5fJ9POR;
z;OWqo=JR@)Bun8jwv-O!mkb3LaL!OP)li9#UX@}!Vb~>tA?-9Ws$!^ln|PN!xJ<GJ
zR$z4|JBRf)^NI8W4L7l!vd2D6nHFXxz*lsEW{c?**jfN&09FuA7D<@CbJaDR1WUzn
zy|zkyRwcO4^ti9{QWD(S>9n_T{SaPq23!xIgryFEPJsQmgJs-G4lj=|M?J)VLn%Im
zL}dQ*KIM-l0uEZCM0OA><AT08M_OUMkwH;3@cf><@1(&{GkAh|=`{>EUo-DRW;FPf
zclWR<>19Cg1?v7+5=lX{k|fdx(~83EBnK2ha%P#2t;(M=w?YFvI!!-?Uta#_5=mBe
z$N+E;()Y*ZJvYHFkE$t!tcDlvn{_o4g0$_w7_C37D-Z6D9cubE8c9@~JM=dz9R0cJ
zt6ddP9eo&U-AR1{WLsCEbn9$B=pU=?E4yKvbQso;kpF61M<J^lSzXDqD!gGkb+h9{
zoJS+(Wc((N(sZk_b^Q`Vgs`iUb$jEh&UjaxUEzjXG9p%ed<66sMfO7JWw-cm=|v%%
zGYIG}I`Ra@rKXnMcCjS3n0B#>7%O?KTcl*r2}UPta;3AQ^N_Ccm$IA9%`AMOj}qg;
z4LLwtl1;a3SsY8J&D#ajZh*4@{QwsLh5#-CTm#sxpEZI<l(-ncORU$>SIMZ;n#)!6
zLozAFV7;Dt+8ZW|ZuV@AFJv;9kTEb@?-uOcFKE$qZhk>qn#1RLhzu`#74jjM^@VvC
H@(6zbEABhF

diff --git a/mytask/tga.py b/mytask/tga.py
index 8f887d3..ee68335 100644
--- a/mytask/tga.py
+++ b/mytask/tga.py
@@ -349,6 +349,7 @@ class GetFromTga:
                 if line:
                     try:
                         temp['num'], temp['u_num'], temp['activity_id_str'] = line
+                        print(f"123 {temp}")
                         temp['activity_id'] = activity_ids.get(temp['activity_id_str'])
                         self.write_tga_files(temp)
                     except Exception:
diff --git a/ops/scripts.py b/ops/scripts.py
index 3829c9f..05255bf 100644
--- a/ops/scripts.py
+++ b/ops/scripts.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import pymongo
-
+import pdb
 
 def get_activity_ids():
     # get data from mongodb
@@ -9,12 +9,9 @@ def get_activity_ids():
     myclient = pymongo.MongoClient("mongodb://10.10.5.6:27017/")
     mydb = myclient["garfield-production"]
     mycol = mydb["system_dics"]
-    myquery = {type: 'share_cfg', 'deleted': False}
+    myquery = {'type': 'share_cfg', 'deleted': False}
     out_area = {'key': 1, 'value': 1, '_id': 0}
-    all = []
+    all = {}
     for x in mycol.find(myquery, out_area):
-        temp = {}
-        a, b = x
-        temp[a] = b
-    all.append(temp)
+        all[x['key']]=x['value']
     return all