From 9209b0070101a075567e6a871dc5c1571b2b3a1d Mon Sep 17 00:00:00 2001 From: root Date: Mon, 8 Jul 2019 15:59:59 +0800 Subject: [PATCH] fix --- __pycache__/config.cpython-36.pyc | Bin 0 -> 312 bytes config.py | 4 +-- handler/__pycache__/__init__.cpython-36.pyc | Bin 0 -> 122 bytes handler/__pycache__/company.cpython-36.pyc | Bin 0 -> 3720 bytes handler/company.py | 29 +++++++++++++------- log/__pycache__/__init__.cpython-36.pyc | Bin 0 -> 118 bytes log/__pycache__/mylog.cpython-36.pyc | Bin 0 -> 721 bytes myredis/__pycache__/__init__.cpython-36.pyc | Bin 0 -> 122 bytes myredis/__pycache__/myredis.cpython-36.pyc | Bin 0 -> 487 bytes myredis/myredis.py | 4 +-- mysql/__pycache__/__init__.cpython-36.pyc | Bin 0 -> 120 bytes mysql/__pycache__/mmysql.cpython-36.pyc | Bin 0 -> 4102 bytes mysql/mmysql.py | 5 ++-- redis/__pycache__/__init__.cpython-36.pyc | Bin 0 -> 120 bytes redis/__pycache__/myredis.cpython-36.pyc | Bin 0 -> 495 bytes server.py | 2 +- 16 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 __pycache__/config.cpython-36.pyc create mode 100644 handler/__pycache__/__init__.cpython-36.pyc create mode 100644 handler/__pycache__/company.cpython-36.pyc create mode 100644 log/__pycache__/__init__.cpython-36.pyc create mode 100644 log/__pycache__/mylog.cpython-36.pyc create mode 100644 myredis/__pycache__/__init__.cpython-36.pyc create mode 100644 myredis/__pycache__/myredis.cpython-36.pyc create mode 100644 mysql/__pycache__/__init__.cpython-36.pyc create mode 100644 mysql/__pycache__/mmysql.cpython-36.pyc create mode 100644 redis/__pycache__/__init__.cpython-36.pyc create mode 100644 redis/__pycache__/myredis.cpython-36.pyc diff --git a/__pycache__/config.cpython-36.pyc b/__pycache__/config.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..fdde27bf1943a883f6aec526660ce228c6552ec7 GIT binary patch literal 312 zcmY+7%}T>S6oqe+Nn2CvN{R~w=`Nf6v>*y1K7ku|0}^8ISO+qhab}9fhwusd0>090 zU5L1LTrf8k zow;i&rKOOT%l0Sq3_9say?h?zSlc>Zahw0<@^4tCIyX8M64wno>$^?gy&aI?3pU19 AM*si- literal 0 HcmV?d00001 diff --git a/config.py b/config.py index 542149b..a2d7c68 100644 --- a/config.py +++ b/config.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- redis_company_config = {'host': '192.168.100.20', 'port': 6379, 'db': 1} -expirt_time = 7200 +expire_time = 7200 mysql_promotion_config = {'user': 'miles', 'pswd': 'aspect', 'host': '192.168.100.30', 'db': 'test'} #mysql_promotion_config = {'user': 'mytga', 'pswd': 'gzVwh4HGR68G', 'host': '10.10.3.5', 'db': 'games_report'} -#redis_company_config = {'host': '10.10.3.10', 'port': 6379, 'db': 2} \ No newline at end of file +#redis_company_config = {'host': '10.10.3.10', 'port': 6379, 'db': 2} diff --git a/handler/__pycache__/__init__.cpython-36.pyc b/handler/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..5721090d9e0d62ed0e76966b8722b45500c4f55b GIT binary patch literal 122 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 literal 0 HcmV?d00001 diff --git a/handler/company.py b/handler/company.py index 0b0aa86..c412f82 100644 --- a/handler/company.py +++ b/handler/company.py @@ -4,14 +4,20 @@ from flask import Flask, jsonify from flask_restful import reqparse, abort, Api, Resource import logging -from myredis.myredis import company_redis, expirt_time +from myredis.myredis import company_redis, expire_time from mysql.mmysql import MysqlBase from config import mysql_promotion_config +import pdb + log = logging.getLogger(__name__) mydb = MysqlBase(**mysql_promotion_config) parser = reqparse.RequestParser() -parser.add_argument('comp_id') +parser.add_argument('id') +parser.add_argument('name') +parser.add_argument('contact') +parser.add_argument('appid') +parser.add_argument('appkey') # # 操作（put / get / delete）单一资源Todo @@ -20,14 +26,16 @@ class Company(Resource): def get(self, comp_id): try: data = company_redis.hmget(comp_id, ['id', 'name', 'contact', 'appid', 'appkey']) + log.info(f"get data from redis was {data}") if not data: sql = f"select id,name,contact,appid,appkey from company where id={comp_id};" data = mydb.query(sql) + log.info(f"get data from db was {data}") company = {} company['id'], company['name'], company['contact'], company['appid'], company['appkey'] = data company_redis.hmset(company['id'], company) - company_redis.expire(company['id'], expirt_time) + company_redis.expire(company['id'], expire_time) except Exception: log.error(f"get company id {comp_id} failed! ", exc_info=True) return jsonify({'code': 0}) @@ -35,7 +43,7 @@ class Company(Resource): def delete(self, comp_id): try: - company_redis.expirt(comp_id, 0) + company_redis.expire(comp_id, 0) del_sql = f'delete from company where id={comp_id};' mydb.query(del_sql) except Exception: @@ -48,15 +56,15 @@ class Company(Resource): try: company = {} company['id'] = comp_id - company['name'] = args['name'] - company['contact'] = args['contact'] - company['appid'] = args['appid'] - company['appkey'] = args['appkey'] + company['name'] = args.name + company['contact'] = args.contact + company['appid'] = args.appid + company['appkey'] = args.appkey # insert to mysql mydb.insert("company", company) # insert to redsi company_redis.hmset(company['id'], company) - company_redis.expirt(company['id'], expirt_time) + company_redis.expire(company['id'], expire_time) except Exception: log.error("set values to company mysql/redis failed!", exc_info=True) return jsonify({'code': 0}) @@ -77,7 +85,7 @@ class Company(Resource): mydb.query("company", update_sql) # update redsi company_redis.hmset(company['id'], company) - company_redis.expirt(company['id'], expirt_time) + company_redis.expire(company['id'], expire_time) except Exception: log.error("update values to company redis,mysql failed!", exc_info=True) return jsonify({'code': 0}) @@ -92,6 +100,7 @@ class CompanyList(Resource): def post(self): args = parser.parse_args() + log.info(f"args was {args}") try: company_redis.rpush("ALL_Company", args['company']) except Exception: diff --git a/log/__pycache__/__init__.cpython-36.pyc b/log/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..6ee66696164ec7901e15d44f45678b50b869fdf9 GIT binary patch literal 118 zcmXr!<>k8nP$^cNfq~&M5W@i@kmUfx#VkM~g&~+hlhJP_LlHUL%&Khp z5Pr#9*zgNoah*PxC6VsQIljmDI=*>1ohHwI?|lwEgnpr&2Q+#Mq4xk7Vpt%F3yd8n zf)s>BEMVbxTzHHeqb&XdK9phmfS%}1^oEy>+;qw;t{&x#8k&o));Xnz@Lrt~=Y}VO zaIM}!=x+c9tue!wcuNM%$QPn!16dPT^)8`#o8BnjDOe2{tZzMF;edeogTIc3(K}|r zw+(>BaO~g*-iAX6`M~XlN|Rx%!w`HxxUgt-@oN8o>QmE5p6S_(+5SOG@2KEkx!BQ? zYfWn~UOfLlAKXr;jp9^hiH+bM>ZYyjq~_)maIS2ufx0f%|G1bR+2H+hd9<{Xd8Z^b z1|0Y1jo=?>%LIrN?Eg~JXWwst|Pv*O{M zEVW@>Z!FPgKaqM2qq&-053+7dzEPd*Ow+Y)thqb~JlveyDdSbs^76WP;D-7H0O173 z_&!O!#7nS?6i_{dOh%NO|0?rsQkGS3dd169x&K3j4xDLhzXPtOjbF=-^@6{_ptKK= H;@JBOBwN8? literal 0 HcmV?d00001 diff --git a/myredis/__pycache__/__init__.cpython-36.pyc b/myredis/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..4d7684c0317bc44758930a898fe3543833911644 GIT binary patch literal 122 zcmXr!<>k8eL@8FBfq~&M5W@i@kmUfx#VkM~g&~+hlhJP_LlH27kI&4@EQycTE2zB1VUwGmQks)$2Qr`-h#3HmY#ZMI literal 0 HcmV?d00001 diff --git a/myredis/__pycache__/myredis.cpython-36.pyc b/myredis/__pycache__/myredis.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..8273aa3357f7ddd9e6e97488a7bd47775ccd88b2 GIT binary patch literal 487 zcmYjMyH3L}6t$g4)AW^rr7Htc7CNvZgv5#v0wznyO6%J+RUAi-E76&`U%(geOJ14y z0R|?ngNm@_bFSoj&OP^HGD+Fj>GK;UG1k}kx($LPlGa2~PN}b1%{c2h-~n<_ zhbrQcig`>4u3U~DRI1g+-sQ}l7?4#bR$8@1vqx^$Rq00X(pCn9trWO$qdV(DuW(E*pYqT| zXlVR4W`Mvm2`eo@80cEvbkOCL&(NxYm92CmTCMAR>QW)rJG(<)VHoP%pw?wsH6@Sw z6fXW9ZvyWe`i@}<_7(^b literal 0 HcmV?d00001 diff --git a/myredis/myredis.py b/myredis/myredis.py index b5d2ee8..e08e90b 100644 --- a/myredis/myredis.py +++ b/myredis/myredis.py @@ -2,7 +2,7 @@ from __future__ import absolute_import import logging import redis -from config import redis_company_config, expirt_time +from config import redis_company_config, expire_time log = logging.getLogger(__name__) @@ -10,4 +10,4 @@ pool = redis.ConnectionPool(host=redis_company_config['host'], port=redis_compan db=redis_company_config['db'], decode_responses=True) company_redis = redis.Redis(connection_pool=pool) -expirt_time = expirt_time +expire_time = expire_time diff --git a/mysql/__pycache__/__init__.cpython-36.pyc b/mysql/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..47afb8b577b2f23c7875c5a43b12c8c7c1b92be3 GIT binary patch literal 120 zcmXr!<>k8nP$^cNfq~&M5W@i@kmUfx#VkM~g&~+hlhJP_LlH9g(T|VM%*!l^kJl@xyv1RYo1apelWGUjUJS$x08tC*~7{IKv#)MeBazZ`ijBP#uY`IV^BUX03O@muCEfnOF&Vp*(+Gh$V|CD#6I zPdGEszk>d^i5Gm=sGa>c?q<}OS`7EnUNXp{Anx>gGHWzxVD>Y?e1wud0ErBr3B%`t z3I5XX&HMtsC2ZlKZHt0%Q9Gh2Jk$k<0dZe4-xU?Hh@PTY!qF?L_-L3OBtHq$sL8M| z{WuEg{TC?d-$BN#4b2Na;bS9Ux@Arnc&>R%^QPu;yq;z07KG3(Tel#JZaKsIS)uKY zjW+gZW6!pUVr4~8oAzouV&Pi{`+MNMHtYbt1isWRi_!$vhpn&Vw$7k&QN|csGiW4R z5|vr&cWh>HTy?Rbtgm`$riw|g877*w25BUf)lXjt#l@a)cSsrNfbxB7dwc7qDm1?e zWg2D58f2~8HAh-dh;%@d(+^XulrHrYiFhER%I?mSYUATaJG)g{GFrQsR`tHsX0O|g znpriHvL{Dtr*u{?rnO~d?nl|tIkG@opFBhr9u0SY^-%0VzI;<<#$5R?sYe{#G4&mZS;rA4T88EXF*WKlJs2=!>q6p{uTOj&Q{qfFYzVjuq8HHc{Ib? z#%$pnbOb&sKSfE;g20F{D!DH>o^!&0Az7nl$}^au>}Jw~0hhton50Eo_ME&!GYUZ< zq9h1zqLGs24Cb-X@^Lxzc$1uqeq>lOr558aU<6^G3-hHh)V+>FEBR`-uY-ByVm_E}A z0}S}amhV1?Nukv2HC4Xy?j&)VHG7@@y}Pt2o!}Uw3rD)l*KOR<{*~SXGh1*%EK;!+ zs|rSob(X}+AlQVp83GNP@VSV5WL>(LUV6nYK|nLjq$lapMU)Dvz=XHCE;)6!Cmv4R7Zhv=RxmGd=uR;m%|7n2Yo_g=(8k`Xji;hw!tC(h(s=uuYOZS|BZ zdr7hvHlNEin)WsbLJc8W*;%-kM9Ly}R8G)}qeP(Arzk5xyn4-2%E<-1gVibdvcb-> zv%F%ujI$E=*a~;x1r^kzrPr<3)J}pm6m-ZD$T89p2m${0MhnjXK<|EY1bBq{u{AcQ zfVU5w;dy|PA+Q7NhuQ(!7D4$0yx|NQ-f#ps$VpP{|89UqwYOFz7?w5rWE98YCr3 ziYFRU8oO_zKVNbh`bY14_RISpKiScktJ3QLSUvsu&f^_0Ip_#z`3BR+Vexp2Kvt9& zNdUU?5tJldUS1(WU^)h#LLLr(M7?weRm966Vv6GO8g*_`rz4}ZG3ey}KfSDun@)cG zV@yg3k$?~YWN83ZPK8gtU>-+pteMBrXJ`oI4P#EGKfB+sBk##~rm&<#pmTWahY0PJT!WLpmB8tTfZ6d73lk(;v*$NnSZu=ikuCpgP1! zN`(2LIp%V2_-?L5QuBoRkW%G7_S87|ZvL!TZAbeZ5-_NAmNXTiQq7Y}55D`t=swg2 z;%$$j^2yzfJyPGd8y>+E1~OqFr-8_{-|fjL$9x%>r_^L>i}Dc&@+L(L`cXigo06U*(KDFG{|Cm$i;MsO literal 0 HcmV?d00001 diff --git a/mysql/mmysql.py b/mysql/mmysql.py index 205d402..56d4e2c 100644 --- a/mysql/mmysql.py +++ b/mysql/mmysql.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding:utf-8 -*- - +from __future__ import absolute_import """ date: 2016/07/11 role: mysql的增删改查类 @@ -12,7 +12,6 @@ usage: m = mysqlBase(host='xxx',db='xxx',user='xxx',pwd='xxx') 实例化 m.query("select * from core") """ import warnings -from __future__ import absolute_import try: import MySQLdb @@ -70,7 +69,7 @@ class MysqlBase: self.curs.execute(_sql) ###提交 self.conn.commit() - # log.info('%s insert ' % _sql) + log.info('%s insert ' % _sql) except: self.conn.rollback() diff --git a/redis/__pycache__/__init__.cpython-36.pyc b/redis/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..700cbbc6942b34b5eccef396a43a27d8d5848960 GIT binary patch literal 120 zcmXr!<>k8nP$^cNfq~&M5W@i@kmUfx#VkM~g&~+hlhJP_LlH>R8biK78D%EOZuQTQj4alk!E3Mk1*{}CV%_%2Jghoy`qQj x<6IWD$ji#+t') if __name__ == '__main__': - app.run(debug=True, port=8888) + app.run(host='0.0.0.0',debug=True, port=8888)