解决冲突

common/db.py

@@ -24,5 +24,4 @@ if __name__ == '__main__':
     # r = RedisString(0).get('edl:sms_value:17822000010:MOBILE_REGISTER')
     # r = RedisString(0).get('edl:sms_value:17822000010:MOBILE_REGISTER')
     # print(r)
     # print(r)
     # print(str(r)[-7:-1])
     # print(str(r)[-7:-1])
-
     pass
     pass
\ No newline at end of file

common/utils.py

@@ -2,9 +2,6 @@ import requests
 import json
 import json
 from config import BaseConfig
 from config import BaseConfig
 
 
-class RedisBase:
-    pass
-
 def dingTalk(webhook, message):
 def dingTalk(webhook, message):
     """发送消息到钉钉群"""
     """发送消息到钉钉群"""
     data = {'msgtype': 'text', 'text': {"content": message},
     data = {'msgtype': 'text', 'text': {"content": message},
@@ -12,17 +9,3 @@ def dingTalk(webhook, message):
     post_data = json.dumps(data)
     post_data = json.dumps(data)
     response = requests.post(webhook, headers=BaseConfig.headers, data=post_data)
     response = requests.post(webhook, headers=BaseConfig.headers, data=post_data)
     return response.text
     return response.text
-
-
-
-
-
-
-qqqqqq
-aaaaaa
-aaaaaa
-21323213
-12321321
-1233213
-123321
-135123
\ No newline at end of file