浏览代码

修改代码

syh 4 年之前
父节点
当前提交
f420142482
共有 9 个文件被更改,包括 77 次插入70 次删除
  1. 1 1
      .idea/misc.xml
  2. 39 0
      HttpUtils.py
  3. 4 14
      ai_callback_add_creative_handler.py
  4. 5 15
      ai_callback_add_group_handler.py
  5. 7 13
      ai_strategy_request_handler.py
  6. 0 1
      db_config.py
  7. 7 9
      main.py
  8. 2 12
      manual_request_json.py
  9. 12 5
      server.py

+ 1 - 1
.idea/misc.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (ai_ads)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (base)" project-jdk-type="Python SDK" />
 </project>
 </project>

+ 39 - 0
HttpUtils.py

@@ -0,0 +1,39 @@
+import requests
+import logging
+
+
+class httpUtils:
+    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+    logger = logging.getLogger(__name__)
+
+    def get(self, url, params={}, headers={}):
+        res = requests.get(url, data=params, headers=headers)
+        self.logger.info("请求路径:" + res.request.url)
+        headerStr = ""
+        for headerKey in res.request.headers:
+            headerStr = headerStr + "\n" + headerKey + ":" + res.request.headers[headerKey]
+        self.logger.info("请求头信息:" + headerStr)
+        self.logger.info("请求参数:\n" + res.request.body)
+
+        resHeaderStr = ""
+        for resHeaderKey in res.headers:
+            resHeaderStr = resHeaderStr + "\n" + resHeaderKey + ":" + res.headers[resHeaderKey]
+        self.logger.info("响应头信息:" + resHeaderStr)
+        self.logger.info("返回结果:\n" + res.content.decode("utf-8"))
+        return res.content.decode("utf-8")
+
+    def post(self, url, params={}, headers={}):
+        res = requests.post(url, data=params, headers=headers)
+        self.logger.info("请求路径:" + res.request.url)
+        headerStr = ""
+        for headerKey in res.request.headers:
+            headerStr = headerStr + "\n" + headerKey + ":" + res.request.headers[headerKey]
+        self.logger.info("请求头信息:" + headerStr)
+        self.logger.info("请求参数:\n" + res.request.body)
+
+        resHeaderStr = ""
+        for resHeaderKey in res.headers:
+            resHeaderStr = resHeaderStr + "\n" + resHeaderKey + ":" + res.headers[resHeaderKey]
+        self.logger.info("响应头信息:" + resHeaderStr)
+        self.logger.info("返回结果:\n" + res.content.decode("utf-8"))
+        return res

+ 4 - 14
ai_callback_add_creative_handler.py

@@ -1,20 +1,10 @@
-from typing import Optional, Awaitable
-import pandas as pd
-import numpy as np
-import datetime
-import pymysql
-from sqlalchemy import create_engine
-import simplejson
-import requests
-import tornado.web
-import pandas as pd
 import json
 import json
-import numpy as np
-import datetime
-from sqlalchemy import create_engine
-from db_config import *
 import traceback
 import traceback
 
 
+import tornado.web
+
+from db_config import *
+
 
 
 class AiCallBackAddCreative(tornado.web.RequestHandler):
 class AiCallBackAddCreative(tornado.web.RequestHandler):
     def initialize(self, logger):
     def initialize(self, logger):

+ 5 - 15
ai_callback_add_group_handler.py

@@ -1,20 +1,10 @@
-from typing import Optional, Awaitable
-import pandas as pd
-import numpy as np
-import datetime
-import pymysql
-from sqlalchemy import create_engine
-import simplejson
-import requests
-import tornado.web
-import pandas as pd
 import json
 import json
-import numpy as np
-import datetime
-from sqlalchemy import create_engine
-from db_config import *
 import traceback
 import traceback
 
 
+import tornado.web
+
+from db_config import *
+
 
 
 class AiCallBackAddGroup(tornado.web.RequestHandler):
 class AiCallBackAddGroup(tornado.web.RequestHandler):
     def initialize(self, logger):
     def initialize(self, logger):
@@ -39,7 +29,7 @@ class AiCallBackAddGroup(tornado.web.RequestHandler):
             res['message'] = 'FAIL'
             res['message'] = 'FAIL'
             self.logger.error(traceback.format_exc())
             self.logger.error(traceback.format_exc())
 
 
-        # 返回接�结果
+        # ·µ»Ø½Ó¿Ú½á¹û
         self.write(json.dumps(res))
         self.write(json.dumps(res))
         self.flush()
         self.flush()
 
 

+ 7 - 13
ai_strategy_request_handler.py

@@ -1,21 +1,15 @@
-from typing import Optional, Awaitable
-import pandas as pd
-import numpy as np
 import datetime
 import datetime
-import pymysql
-from sqlalchemy import create_engine
-import simplejson
-import requests
-import tornado.web
-import pandas as pd
 import json
 import json
-import numpy as np
-import datetime
-from sqlalchemy import create_engine
-from db_config import *
 import traceback
 import traceback
 import uuid
 import uuid
 
 
+import pandas as pd
+import requests
+import simplejson
+import tornado.web
+
+from db_config import *
+
 
 
 class AiStrategyRequestParse(tornado.web.RequestHandler):
 class AiStrategyRequestParse(tornado.web.RequestHandler):
     def initialize(self, logger):
     def initialize(self, logger):

+ 0 - 1
db_config.py

@@ -1,4 +1,3 @@
-import pymysql
 from sqlalchemy import create_engine
 from sqlalchemy import create_engine
 
 
 # 线上数据库连接字符串
 # 线上数据库连接字符串

+ 7 - 9
main.py

@@ -1,18 +1,16 @@
-import tornado.ioloop
-import tornado.web
 import argparse
 import argparse
-import json
-import pickle
-import tornado.options
-import tornado.log
+import logging
 import time
 import time
-import traceback
 from logging.handlers import TimedRotatingFileHandler
 from logging.handlers import TimedRotatingFileHandler
-import logging
 
 
-import ai_strategy_request_handler
+import tornado.ioloop
+import tornado.log
+import tornado.options
+import tornado.web
+
 import ai_callback_add_creative_handler
 import ai_callback_add_creative_handler
 import ai_callback_add_group_handler
 import ai_callback_add_group_handler
+import ai_strategy_request_handler
 
 
 
 
 def create_application():
 def create_application():

+ 2 - 12
manual_request_json.py

@@ -1,18 +1,8 @@
-from typing import Optional, Awaitable
-import pandas as pd
-import numpy as np
 import datetime
 import datetime
+import json
 
 
-import simplejson
 import requests
 import requests
-import tornado.web
-import pandas as pd
-import json
-import numpy as np
-from sqlalchemy import create_engine
-from db_config import *
-import traceback
-from urllib import parse
+import simplejson
 
 
 
 
 def main():
 def main():

+ 12 - 5
server.py

@@ -1,8 +1,13 @@
 from flask import Flask,request
 from flask import Flask,request
-import mysql_search_utils
+from mysql_search_utils import mysqlSearchUtils
+from HttpUtils import httpUtils
+import json
 
 
 app = Flask(__name__)
 app = Flask(__name__)
 
 
+mysql = mysqlSearchUtils()
+httpUtils = httpUtils()
+
 @app.route('/hello')
 @app.route('/hello')
 def helloWord():
 def helloWord():
     print(request.path)
     print(request.path)
@@ -12,20 +17,22 @@ def helloWord():
 
 
 @app.route('/getOne')
 @app.route('/getOne')
 def getJson():
 def getJson():
-    mysql = mysql_search_utils.mysqlSearchUtils()
     responseDict = {}
     responseDict = {}
-    data = mysql_search_utils.mysqlSearchUtils.get_one(mysql)
+    data = mysql.get_one()
     responseDict["data"] = data
     responseDict["data"] = data
     return responseDict
     return responseDict
 
 
 @app.route('/getList')
 @app.route('/getList')
 def getList():
 def getList():
-    mysql = mysql_search_utils.mysqlSearchUtils();
     responseDict = {}
     responseDict = {}
-    list = mysql_search_utils.mysqlSearchUtils.get_all(mysql)
+    list = mysql.get_all()
     responseDict["list"] = list
     responseDict["list"] = list
     return responseDict
     return responseDict
 
 
+@app.route('/testReport')
+def testReport():
+    rest = httpUtils.get("http://localhost:8079/getOne",{"accountId":"123"},{"accountId":"123"})
+    return json.loads(rest)
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     app.run(host='0.0.0.0',port=8079,debug=True)
     app.run(host='0.0.0.0',port=8079,debug=True)