diff --git a/smssend/__pycache__/__init__.cpython-310.pyc b/smssend/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..49a0368 Binary files /dev/null and b/smssend/__pycache__/__init__.cpython-310.pyc differ diff --git a/smssend/__pycache__/__init__.cpython-38.pyc b/smssend/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..cc2d097 Binary files /dev/null and b/smssend/__pycache__/__init__.cpython-38.pyc differ diff --git a/smssend/__pycache__/init.cpython-310.pyc b/smssend/__pycache__/init.cpython-310.pyc new file mode 100644 index 0000000..4f526ea Binary files /dev/null and b/smssend/__pycache__/init.cpython-310.pyc differ diff --git a/smssend/__pycache__/init.cpython-38.pyc b/smssend/__pycache__/init.cpython-38.pyc new file mode 100644 index 0000000..d2aa73a Binary files /dev/null and b/smssend/__pycache__/init.cpython-38.pyc differ diff --git a/smssend/__pycache__/smssend.cpython-310.pyc b/smssend/__pycache__/smssend.cpython-310.pyc new file mode 100644 index 0000000..108009f Binary files /dev/null and b/smssend/__pycache__/smssend.cpython-310.pyc differ diff --git a/smssend/init.py b/smssend/init.py index 6260183..bb31744 100644 --- a/smssend/init.py +++ b/smssend/init.py @@ -7,6 +7,9 @@ SMS Send Module Init - load_smssend() 加载模块 - 将功能注册到 ServerEnv """ +import sys +sys.path.append('D:/Code/dagflow_demo/') + import asyncio from functools import partial from appPublic.jsonConfig import getConfig diff --git a/smssend/smssend.py b/smssend/smssend.py index f58e259..db74ae9 100644 --- a/smssend/smssend.py +++ b/smssend/smssend.py @@ -18,6 +18,11 @@ import baidubce.services.sms.sms_client as sms import baidubce.exception as ex from sqlor.dbpools import DBPools from appPublic.uniqueID import getID as uuid +from ahserver.serverenv import ServerEnv + +p = 'D:/Code/backend_code/test_/' +config = getConfig(p) +DBPools(config.databases) SMS_TEMPLATE_TABLE = { "summary": [{"name": "sms_template", "primary": "id"}], @@ -69,10 +74,10 @@ class SMSEngine: def __init__(self): config = getConfig() - self.access_key = config.baidu_sms_access_key - self.access_key_secret = config.baidu_sms_access_key_secret - self.host = config.baidu_sms_host - self.signature_id = config.baidu_sms_signature_id + self.access_key = config.smsConfig.baidu_sms_access_key + self.access_key_secret = config.smsConfig.baidu_sms_access_key_secret + self.host = config.smsConfig.baidu_sms_host + self.signature_id = config.smsConfig.baidu_sms_signature_id self.sms_client = self.create_client() self.sms_types = {} @@ -149,8 +154,11 @@ class SMSEngine: code_id = uuid() expire_time = datetime.datetime.now() + datetime.timedelta(minutes=expire_minutes) - db = DBPools() - async with db.sqlorContext('kboss') as sor: + # db = DBPools(config.databases) + # async with db.sqlorContext('kboss') as sor: + from sqlor.dbpools import get_sor_context + env = ServerEnv() + async with get_sor_context(env, 'kboss') as sor: await sor.C('validatecode', { 'id': code_id, 'vcode': code, diff --git a/test/test_smssend.py b/test/test_smssend.py index bbf2db0..375a413 100644 --- a/test/test_smssend.py +++ b/test/test_smssend.py @@ -11,6 +11,9 @@ SMS Send Module Test 5. get_sms_engine - 获取引擎实例 6. SMSEngine - 引擎类方法 """ +import sys +sys.path.append('D:/Code/dagflow_demo/smssend') + import asyncio from smssend import ( load_smssend, @@ -311,5 +314,11 @@ async def main(): if __name__ == '__main__': + from sqlor.dbpools import DBPools + from appPublic.jsonConfig import getConfig + + p = 'D:/Code/backend_code/test_/' + config = getConfig(p) + DBPools(config.databases) loop = asyncio.get_event_loop() loop.run_until_complete(main())