init file

conf/config.json

@@ -0,0 +1,6 @@
+{
+    "baidu_sms_access_key": "您的AK",
+    "baidu_sms_access_key_secret": "您的SK",
+    "baidu_sms_host": "sms.bj.baidubce.com",
+    "baidu_sms_signature_id": "您的短信签名ID"
+}

models/sms_record.json

@@ -0,0 +1,26 @@
+{
+"summary": [{
+"name": "sms_record",
+"title": "短信记录",
+"primary": ["id"],
+"catelog": "entity"
+}],
+"fields": [
+{"name": "id", "title": "ID", "type": "str", "length": 32, "nullable": "no"},
+{"name": "customerid", "title": "客户ID", "type": "str", "length": 32},
+{"name": "send_type", "title": "发送类型", "type": "str", "length": 32},
+{"name": "mobile", "title": "手机号", "type": "str", "length": 15},
+{"name": "email", "title": "邮箱", "type": "str", "length": 32},
+{"name": "message", "title": "发送内容", "type": "str", "length": 510},
+{"name": "send_time", "title": "发送时间", "type": "str", "length": 32},
+{"name": "send_status", "title": "发送状态", "type": "str", "length": 1},
+{"name": "task_status", "title": "任务状态", "type": "str", "length": 2},
+{"name": "remark", "title": "备注", "type": "str", "length": 200},
+{"name": "del_flg", "title": "删除标志", "type": "str", "length": 1},
+{"name": "create_at", "title": "创建时间", "type": "timestamp"}
+],
+"indexes": [
+{"name": "idx_sms_record_mobile", "idxtype": "index", "idxfields": ["mobile"]},
+{"name": "idx_sms_record_send_time", "idxtype": "index", "idxfields": ["send_time"]}
+]
+}

models/sms_template.json

@@ -0,0 +1,22 @@
+{
+"summary": [{
+"name": "sms_template",
+"title": "短信模板",
+"primary": ["id"],
+"catelog": "entity"
+}],
+"fields": [
+{"name": "id", "title": "ID", "type": "str", "length": 32, "nullable": "no"},
+{"name": "name", "title": "模板名称", "type": "str", "length": 32},
+{"name": "template_type", "title": "模板类型", "type": "str", "length": 32},
+{"name": "code", "title": "模板编码", "type": "str", "length": 32},
+{"name": "content", "title": "模板内容", "type": "str", "length": 200},
+{"name": "description", "title": "场景说明", "type": "str", "length": 100},
+{"name": "provider", "title": "短信供应商", "type": "str", "length": 100},
+{"name": "del_flg", "title": "删除标志", "type": "str", "length": 1, "default": "0"},
+{"name": "create_at", "title": "创建时间", "type": "timestamp"}
+],
+"indexes": [
+{"name": "idx_sms_template_name", "idxtype": "index", "idxfields": ["name"]}
+]
+}

models/validatecode.json

@@ -0,0 +1,18 @@
+{
+"summary": [{
+"name": "validatecode",
+"title": "验证码",
+"primary": ["id"],
+"catelog": "entity"
+}],
+"fields": [
+{"name": "id", "title": "ID", "type": "str", "length": 32, "nullable": "no"},
+{"name": "vcode", "title": "验证码", "type": "str", "length": 32},
+{"name": "expire_time", "title": "有效期", "type": "timestamp", "nullable": "no"},
+{"name": "del_flg", "title": "删除标志", "type": "str", "length": 1, "default": "0"},
+{"name": "create_at", "title": "创建时间", "type": "timestamp", "nullable": "no"}
+],
+"indexes": [
+{"name": "idx_validatecode_vcode", "idxtype": "index", "idxfields": ["vcode"]}
+]
+}

smssend/__init__.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+"""
+SMS Send Module
+================
+
+按照 dagflow 模式导出模块
+"""
+from .init import (
+	load_smssend,
+	generate_sms_code,
+	check_sms_code,
+	send_vcode,
+	send_sms,
+	SMSEngine,
+	get_sms_engine
+)
+
+from .smssend import (
+	SMS_TEMPLATE_TABLE,
+	VALIDATE_CODE_TABLE,
+	SMS_RECORD_TABLE
+)
+
+__all__ = [
+	'load_smssend',
+	'generate_sms_code',
+	'check_sms_code',
+	'send_vcode',
+	'send_sms',
+	'SMSEngine',
+	'get_sms_engine',
+	'SMS_TEMPLATE_TABLE',
+	'VALIDATE_CODE_TABLE',
+	'SMS_RECORD_TABLE'
+]

smssend/init.py

@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+"""
+SMS Send Module Init
+=====================
+
+按照 dagflow 模式：
+- load_smssend() 加载模块
+- 将功能注册到 ServerEnv
+"""
+import asyncio
+from functools import partial
+from appPublic.jsonConfig import getConfig
+from appPublic.log import debug, exception, error, info
+from ahserver.serverenv import ServerEnv
+from ahserver.configuredServer import add_cleanupctx
+import random
+import string
+
+from .smssend import (
+	SMSEngine,
+	get_sms_engine
+)
+
+_sms_engine_instance = None
+
+
+async def generate_sms_code(length: int = 6, expire_minutes: int = 5) -> str:
+	engine = get_sms_engine()
+	return await engine.generate_sms_code(length, expire_minutes)
+
+
+async def check_sms_code(code_id: str, vcode: str) -> bool:
+	engine = get_sms_engine()
+	return await engine.check_sms_code(code_id, vcode)
+
+
+async def send_vcode(phone: str, stype: str, vcode: dict) -> dict:
+	engine = get_sms_engine()
+	return await engine.send_vcode(phone, stype, vcode)
+
+
+async def send_sms(phone: str, stype: str, params: dict) -> dict:
+	engine = get_sms_engine()
+	return await engine.send_sms(phone, stype, params)
+
+
+async def smsbacktask(engine, app):
+	task = asyncio.create_task(asyncio.sleep(999999))
+	await asyncio.sleep(0.1)
+	return task
+
+
+def load_smssend():
+	config = getConfig()
+	global _sms_engine_instance
+	_sms_engine_instance = SMSEngine()
+	info(f'SMS Send Module loaded, signature_id: {_sms_engine_instance.signature_id}')
+
+	env = ServerEnv()
+	env.sms_engine = _sms_engine_instance
+	env.generate_sms_code = generate_sms_code
+	env.check_sms_code = check_sms_code
+	env.send_vcode = send_vcode
+	env.send_sms = send_sms

smssend/smssend.py

@@ -0,0 +1,217 @@
+# -*- coding: utf-8 -*-
+"""
+SMS Send Module v1.0
+=====================
+
+Features:
+- 百度短信发送
+- 验证码生成与验证
+- 配置从文件读取
+"""
+import datetime
+import random
+import string
+from appPublic.jsonConfig import getConfig
+from baidubce.bce_client_configuration import BceClientConfiguration
+from baidubce.auth.bce_credentials import BceCredentials
+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
+
+SMS_TEMPLATE_TABLE = {
+	"summary": [{"name": "sms_template", "primary": "id"}],
+	"fields": [
+		{"name": "id", "type": "str", "length": 32, "nullable": "no"},
+		{"name": "name", "type": "str", "length": 32},
+		{"name": "template_type", "type": "str", "length": 32},
+		{"name": "code", "type": "str", "length": 32},
+		{"name": "content", "type": "str", "length": 200},
+		{"name": "description", "type": "str", "length": 100},
+		{"name": "provider", "type": "str", "length": 100},
+		{"name": "del_flg", "type": "str", "length": 1, "default": "0"},
+		{"name": "create_at", "type": "timestamp"}
+	]
+}
+
+VALIDATE_CODE_TABLE = {
+	"summary": [{"name": "validatecode", "primary": "id"}],
+	"fields": [
+		{"name": "id", "type": "str", "length": 32, "nullable": "no"},
+		{"name": "vcode", "type": "str", "length": 32},
+		{"name": "expire_time", "type": "timestamp", "nullable": "no"},
+		{"name": "del_flg", "type": "str", "length": 1, "default": "0"},
+		{"name": "create_at", "type": "timestamp", "nullable": "no"}
+	]
+}
+
+SMS_RECORD_TABLE = {
+	"summary": [{"name": "sms_record", "primary": "id"}],
+	"fields": [
+		{"name": "id", "type": "str", "length": 32, "nullable": "no"},
+		{"name": "customerid", "type": "str", "length": 32},
+		{"name": "send_type", "type": "str", "length": 32},
+		{"name": "mobile", "type": "str", "length": 15},
+		{"name": "email", "type": "str", "length": 32},
+		{"name": "message", "type": "str", "length": 510},
+		{"name": "send_time", "type": "str", "length": 32},
+		{"name": "send_status", "type": "str", "length": 1},
+		{"name": "task_status", "type": "str", "length": 2},
+		{"name": "remark", "type": "str", "length": 200},
+		{"name": "del_flg", "type": "str", "length": 1},
+		{"name": "create_at", "type": "timestamp"}
+	]
+}
+
+
+class SMSEngine:
+	doc = "https://cloud.baidu.com/doc/SMS/s/zjwvxry6e"
+
+	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.sms_client = self.create_client()
+		self.sms_types = {}
+
+	def create_client(self):
+		baiDuSmsConfig = BceClientConfiguration(
+			credentials=BceCredentials(self.access_key, self.access_key_secret),
+			endpoint=self.host
+		)
+		return sms.SmsClient(baiDuSmsConfig)
+
+	async def send(self, stype, template_id, phone, params) -> dict:
+		try:
+			resp = self.sms_client.send_message(
+				signature_id=self.signature_id,
+				template_id=template_id,
+				mobile=phone,
+				content_var_dict=params
+			)
+			return await self.__validation(stype, template_id, params, phone, resp)
+		except ex.BceHttpClientError as e:
+			if isinstance(e.last_error, ex.BceServerError):
+				print('send request failed. Response %s, code: %s, request_id: %s'
+					  % (e.last_error.status_code, e.last_error.code, e.last_error.request_id))
+			else:
+				print('send request failed. Unknown exception: %s' % e)
+			return {'status': False, 'msg': str(e)}
+
+	async def send_vcode(self, phone: str, stype: str, vcode) -> dict:
+		db = DBPools()
+		async with db.sqlorContext('kboss') as sor:
+			template_info = await sor.R('sms_template', {'name': stype, 'del_flg': '0'})
+			if template_info:
+				template_id = template_info[0]['code']
+			else:
+				log = {
+					'id': uuid(),
+					'send_type': stype,
+					'mobile': phone,
+					'message': str(vcode),
+					'send_time': datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
+					'send_status': '0',
+					'remark': f'未找到模板类型: {stype}'
+				}
+				await sor.C('sms_record', log)
+				return {'status': False, 'msg': '模板未配置，请检查sms_template表'}
+		return await self.send(stype, template_id, phone, vcode)
+
+	async def __validation(self, stype, template_id, params, phone, resp) -> dict:
+		db = DBPools()
+		async with db.sqlorContext('kboss') as sor:
+			send_time = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+			log = {
+				'id': uuid(),
+				'send_type': stype,
+				'mobile': phone,
+				'message': str(params),
+				'send_time': send_time,
+				'send_status': '1'
+			}
+			if resp.code == '1000':
+				msg = f'{send_time} {phone} 百度短信发送成功，code: {resp.code}'
+				log['send_status'] = '1'
+				await sor.C('sms_record', log)
+				return {'status': True, 'msg': msg}
+			else:
+				msg = f'{send_time} {phone} 百度短信发送失败，code: {resp.code}，参考文档: {self.doc}'
+				log['send_status'] = '0'
+				log['remark'] = msg
+				await sor.C('sms_record', log)
+				return {'status': False, 'msg': msg}
+
+	async def generate_sms_code(self, length: int = 6, expire_minutes: int = 5) -> str:
+		code = ''.join(random.choices(string.digits, k=length))
+		code_id = uuid()
+		expire_time = datetime.datetime.now() + datetime.timedelta(minutes=expire_minutes)
+
+		db = DBPools()
+		async with db.sqlorContext('kboss') as sor:
+			await sor.C('validatecode', {
+				'id': code_id,
+				'vcode': code,
+				'expire_time': expire_time,
+				'del_flg': '0',
+				'create_at': datetime.datetime.now()
+			})
+		return code_id
+
+	async def check_sms_code(self, code_id: str, vcode: str) -> bool:
+		db = DBPools()
+		async with db.sqlorContext('kboss') as sor:
+			code_info = await sor.R('validatecode', {'id': code_id, 'del_flg': '0'})
+			if not code_info:
+				return False
+
+			code_info = code_info[0]
+			if code_info['vcode'] != vcode:
+				return False
+
+			now = datetime.datetime.now()
+			if now > code_info['expire_time']:
+				return False
+
+			await sor.U('validatecode', {'id': code_id}, {'del_flg': '1'})
+			return True
+
+	async def send_sms(self, phone: str, stype: str, params: dict) -> dict:
+		code_id = await self.generate_sms_code()
+		if code_id is None:
+			return {
+				'status': 'error',
+				'data': {
+					'message': '生成的手机号出错'
+				}
+			}
+
+		vcode = {'SMSvCode': params.get('vcode', '')}
+		result = await self.send_vcode(phone, stype, vcode)
+
+		if result.get('status'):
+			return {
+				'status': 'ok',
+				'data': {
+					'codeid': code_id
+				}
+			}
+		else:
+			return {
+				'status': 'error',
+				'data': {
+					'message': result.get('msg', '发送失败')
+				}
+			}
+
+
+_sms_engine = None
+
+
+def get_sms_engine() -> SMSEngine:
+	global _sms_engine
+	if _sms_engine is None:
+		_sms_engine = SMSEngine()
+	return _sms_engine

test/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

test/test_smssend.py

@@ -0,0 +1,315 @@
+# -*- coding: utf-8 -*-
+"""
+SMS Send Module Test
+====================
+
+测试用例覆盖所有功能接口：
+1. generate_sms_code - 生成验证码入库并返回codeid
+2. check_sms_code - 验证码校验
+3. send_vcode - 发送验证码短信
+4. send_sms - 发送短信（整合生成和发送）
+5. get_sms_engine - 获取引擎实例
+6. SMSEngine - 引擎类方法
+"""
+import asyncio
+from smssend import (
+	load_smssend,
+	generate_sms_code,
+	check_sms_code,
+	send_vcode,
+	send_sms,
+	get_sms_engine,
+	SMSEngine
+)
+
+
+async def get_vcode_from_db(codeid: str) -> dict:
+	from sqlor.dbpools import DBPools
+	db = DBPools()
+	async with db.sqlorContext('kboss') as sor:
+		result = await sor.R('validatecode', {'id': codeid})
+		if result:
+			return result[0]
+	return None
+
+
+async def test_get_sms_engine():
+	print("=" * 50)
+	print("测试1: get_sms_engine() - 获取引擎实例")
+	print("=" * 50)
+	
+	engine = get_sms_engine()
+	print(f"引擎实例: {engine}")
+	print(f"引擎类型: {type(engine)}")
+	
+	if engine is not None and isinstance(engine, SMSEngine):
+		print("✅ 获取引擎实例成功")
+		return True
+	else:
+		print("❌ 获取引擎实例失败")
+		return False
+
+
+async def test_generate_sms_code():
+	print("\n" + "=" * 50)
+	print("测试2: generate_sms_code() - 生成验证码入库")
+	print("=" * 50)
+	
+	codeid = await generate_sms_code()
+	print(f"生成的验证码ID: {codeid}")
+	
+	if not codeid:
+		print("❌ 生成验证码失败")
+		return False, None
+	
+	print("✅ 生成验证码成功")
+	return True, codeid
+
+
+async def test_generate_sms_code_with_params():
+	print("\n" + "=" * 50)
+	print("测试3: generate_sms_code(自定义长度和有效期) - 生成验证码")
+	print("=" * 50)
+	
+	codeid = await generate_sms_code(length=4, expire_minutes=10)
+	print(f"生成的验证码ID: {codeid}")
+	print(f"验证码长度: 4, 有效期: 10分钟")
+	
+	if not codeid:
+		print("❌ 生成验证码失败")
+		return False, None
+	
+	db_result = await get_vcode_from_db(codeid)
+	if db_result:
+		vcode = db_result['vcode']
+		print(f"数据库中的验证码: {vcode}")
+		if len(vcode) == 4:
+			print("✅ 自定义参数生成验证码成功")
+			return True, codeid
+	
+	print("❌ 自定义参数验证失败")
+	return False, None
+
+
+async def test_check_sms_code_wrong():
+	print("\n" + "=" * 50)
+	print("测试4: check_sms_code() - 验证码校验(错误验证码)")
+	print("=" * 50)
+	
+	codeid = await generate_sms_code()
+	if not codeid:
+		print("❌ 生成验证码失败")
+		return False
+	
+	wrong_code = "000000"
+	result = await check_sms_code(codeid, wrong_code)
+	print(f"校验结果 (错误验证码): {result}")
+	
+	if not result:
+		print("✅ 正确返回 False")
+		return True
+	else:
+		print("❌ 应该返回 False")
+		return False
+
+
+async def test_check_sms_code_correct():
+	print("\n" + "=" * 50)
+	print("测试5: check_sms_code() - 验证码校验(正确验证码)")
+	print("=" * 50)
+	
+	codeid = await generate_sms_code()
+	if not codeid:
+		print("❌ 生成验证码失败")
+		return False
+	
+	db_result = await get_vcode_from_db(codeid)
+	if not db_result:
+		print("❌ 获取验证码失败")
+		return False
+	
+	real_vcode = db_result['vcode']
+	print(f"真实验证码: {real_vcode}")
+	
+	result = await check_sms_code(codeid, real_vcode)
+	print(f"校验结果 (正确验证码): {result}")
+	
+	if result:
+		print("✅ 验证码校验成功")
+		return True
+	else:
+		print("❌ 验证码校验失败")
+		return False
+
+
+async def test_check_sms_code_invalid_codeid():
+	print("\n" + "=" * 50)
+	print("测试6: check_sms_code() - 验证码校验(无效codeid)")
+	print("=" * 50)
+	
+	invalid_codeid = "invalid_codeid_12345"
+	result = await check_sms_code(invalid_codeid, "123456")
+	print(f"校验结果: {result}")
+	
+	if not result:
+		print("✅ 正确返回 False")
+		return True
+	else:
+		print("❌ 应该返回 False")
+		return False
+
+
+async def test_check_sms_code_expired():
+	print("\n" + "=" * 50)
+	print("测试7: check_sms_code() - 验证码校验(已过期)")
+	print("=" * 50)
+	
+	from sqlor.dbpools import DBPools
+	import datetime
+	from appPublic.uniqueID import getID as uuid
+	
+	expired_codeid = uuid()
+	expired_time = datetime.datetime.now() - datetime.timedelta(minutes=10)
+	
+	db = DBPools()
+	async with db.sqlorContext('kboss') as sor:
+		await sor.C('validatecode', {
+			'id': expired_codeid,
+			'vcode': '888888',
+			'expire_time': expired_time,
+			'del_flg': '0',
+			'create_at': datetime.datetime.now()
+		})
+	
+	result = await check_sms_code(expired_codeid, "888888")
+	print(f"校验结果 (已过期验证码): {result}")
+	
+	if not result:
+		print("✅ 正确返回 False(已过期)")
+		return True
+	else:
+		print("❌ 应该返回 False")
+		return False
+
+
+async def test_send_vcode():
+	print("\n" + "=" * 50)
+	print("测试8: send_vcode() - 发送验证码短信")
+	print("=" * 50)
+	
+	phone = "13800138000"
+	stype = "注册登录验证"
+	vcode = {"SMSvCode": "123456"}
+	
+	result = await send_vcode(phone, stype, vcode)
+	print(f"发送结果: {result}")
+	
+	if result.get('status') == False:
+		if "模板未配置" in result.get('msg', ''):
+			print("⚠️ 模板未配置，这是预期行为（需先配置sms_template表）")
+			return True
+		print("✅ 发送功能正常（可能因配置问题失败）")
+		return True
+	elif result.get('status') == True:
+		print("✅ 发送成功")
+		return True
+	else:
+		print("❌ 发送失败")
+		return False
+
+
+async def test_send_sms():
+	print("\n" + "=" * 50)
+	print("测试9: send_sms() - 发送短信(整合生成和发送)")
+	print("=" * 50)
+	
+	phone = "13800138000"
+	stype = "注册登录验证"
+	params = {"vcode": "666666"}
+	
+	result = await send_sms(phone, stype, params)
+	print(f"发送结果: {result}")
+	
+	if result.get('status') == 'error':
+		if "模板未配置" in result.get('data', {}).get('message', ''):
+			print("⚠️ 模板未配置，这是预期行为（需先配置sms_template表）")
+			return True
+		print("✅ 发送功能正常（可能因配置问题失败）")
+		return True
+	elif result.get('status') == 'ok':
+		codeid = result.get('data', {}).get('codeid')
+		print(f"✅ 发送成功，验证码ID: {codeid}")
+		return True
+	else:
+		print("❌ 发送失败")
+		return False
+
+
+async def test_sms_engine_attributes():
+	print("\n" + "=" * 50)
+	print("测试10: SMSEngine 属性检查")
+	print("=" * 50)
+	
+	engine = get_sms_engine()
+	
+	print(f"access_key: {engine.access_key}")
+	print(f"host: {engine.host}")
+	print(f"signature_id: {engine.signature_id}")
+	print(f"sms_types: {engine.sms_types}")
+	print(f"doc: {engine.doc}")
+	
+	if engine.access_key and engine.host and engine.signature_id:
+		print("✅ 引擎属性正常")
+		return True
+	else:
+		print("❌ 引擎属性异常")
+		return False
+
+
+async def main():
+	print("=" * 50)
+	print("SMS Send Module 完整测试")
+	print("=" * 50)
+	
+	load_smssend()
+	
+	results = []
+	
+	results.append(("get_sms_engine", await test_get_sms_engine()))
+	
+	r, codeid = await test_generate_sms_code()
+	results.append(("generate_sms_code", r))
+	
+	r, codeid2 = await test_generate_sms_code_with_params()
+	results.append(("generate_sms_code(自定义参数)", r))
+	
+	results.append(("check_sms_code(错误验证码)", await test_check_sms_code_wrong()))
+	results.append(("check_sms_code(正确验证码)", await test_check_sms_code_correct()))
+	results.append(("check_sms_code(无效codeid)", await test_check_sms_code_invalid_codeid()))
+	results.append(("check_sms_code(已过期)", await test_check_sms_code_expired()))
+	
+	results.append(("send_vcode", await test_send_vcode()))
+	results.append(("send_sms", await test_send_sms()))
+	results.append(("SMSEngine属性", await test_sms_engine_attributes()))
+	
+	print("\n" + "=" * 50)
+	print("测试结果汇总")
+	print("=" * 50)
+	
+	passed = 0
+	failed = 0
+	for name, result in results:
+		status = "✅ 通过" if result else "❌ 失败"
+		print(f"{name}: {status}")
+		if result:
+			passed += 1
+		else:
+			failed += 1
+	
+	print("-" * 50)
+	print(f"总计: {passed} 通过, {failed} 失败")
+
+
+if __name__ == '__main__':
+	loop = asyncio.get_event_loop()
+	loop.run_until_complete(main())