fix: 全面修复所有dspy文件和数据库访问模式

dspy文件修复(27个entcms + 10个dingdingflow):
- 删除所有import语句(dspy环境已预加载)
- 替换 sor = DBPools().sqlorContext() 为 async with db.sqlorContext() as sor:
- 替换 print(json.dumps()) 为 return
- 替换 uuid() 为 getID()
- 替换 datetime.datetime.now() 为 datetime.now()
- 修复 get_user() 缺少 await
- 删除shebang/docstrings等无关内容
- 修正缩进

Python模块修复:
- entcms/init.py: DBNAME从'entcms'改为'ocai_cms'
- app/global_func.py: get_module_dbname返回'ocai_cms'而非'sage'
- 所有函数使用 async with db.sqlorContext() as sor: 正确模式

app/global_func.py

@@ -4,8 +4,8 @@ CMS全局函数 — 注册到ServerEnv供.dspy和.ui调用
 from ahserver.serverenv import ServerEnv
 
 def get_module_dbname(mname):
-    """所有模块共享sage数据库"""
+    """CMS应用统一使用ocai_cms数据库"""
-    return 'sage'
+    return 'ocai_cms'
 
 def UiWindow(title, icon, content, cheight=10, cwidth=15):
     return {

entcms/entcms/init.py

@@ -10,7 +10,7 @@ from sqlor.dbpools import DBPools
 MODULE_NAME = "entcms"
 MODULE_VERSION = "1.0.0"
 
-DBNAME = "entcms"
+DBNAME = "ocai_cms"
 
 
 # ===== CMS Content CRUD =====

wwwroot/api/category_options.dspy

@@ -1,10 +1,8 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     content_type = params_kw.get('content_type', None)
     ns = {'sort': 'sort_order asc'}
@@ -12,4 +10,4 @@ if content_type:
         ns['content_type'] = content_type
     rows = await sor.R('cms_categories', ns)
     options = [{'value': r['id'], 'text': r['name']} for r in rows]
-print(json.dumps({'status': 'ok', 'data': {'options': options}}, ensure_ascii=False))
+    return {'status': 'ok', 'data': {'options': options}}

wwwroot/api/cms_categories_create.dspy

@@ -1,10 +1,8 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     data = {'id': getID()}
 
@@ -33,4 +31,4 @@ if v is not None:
         data['sort_order'] = v
 
     await sor.C('cms_categories', data)
-print(json.dumps({'widgettype': 'Message', 'options': {'text': '创建成功', 'messagetype': 'success'}}, ensure_ascii=False))
+    return {'widgettype': 'Message', 'options': {'text': '创建成功', 'messagetype': 'success'}}

wwwroot/api/cms_categories_delete.dspy

@@ -1,14 +1,11 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     _id = params_kw.get('id', '')
     if not _id:
-    print(json.dumps({'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}, ensure_ascii=False))
+        return {'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}
-    return
     await sor.D('cms_categories', {'id': _id})
-print(json.dumps({'widgettype': 'Message', 'options': {'text': '删除成功', 'messagetype': 'success'}}, ensure_ascii=False))
+    return {'widgettype': 'Message', 'options': {'text': '删除成功', 'messagetype': 'success'}}

wwwroot/api/cms_categories_list.dspy

@@ -1,10 +1,8 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     ns = {'sort': 'sort_order asc'}
 
@@ -29,4 +27,4 @@ if _content_type:
 
     rows = await sor.R('cms_categories', ns)
     total = len(rows)
-print(json.dumps({'status': 'ok', 'rows': rows, 'total': total}, ensure_ascii=False))
+    return {'status': 'ok', 'rows': rows, 'total': total}

wwwroot/api/cms_categories_update.dspy

@@ -1,15 +1,12 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     data = {'id': params_kw.get('id', '')}
     if not data['id']:
-    print(json.dumps({'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}, ensure_ascii=False))
+        return {'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}
-    return
 
     v = params_kw.get('org_id', None)
     if v is not None:
@@ -36,4 +33,4 @@ if v is not None:
         data['sort_order'] = v
 
     await sor.U('cms_categories', data)
-print(json.dumps({'widgettype': 'Message', 'options': {'text': '更新成功', 'messagetype': 'success'}}, ensure_ascii=False))
+    return {'widgettype': 'Message', 'options': {'text': '更新成功', 'messagetype': 'success'}}

wwwroot/api/cms_content_create.dspy

@@ -1,10 +1,8 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     data = {'id': getID()}
 
@@ -57,4 +55,4 @@ if v is not None:
         data['extra_json'] = v
 
     await sor.C('cms_content', data)
-print(json.dumps({'widgettype': 'Message', 'options': {'text': '创建成功', 'messagetype': 'success'}}, ensure_ascii=False))
+    return {'widgettype': 'Message', 'options': {'text': '创建成功', 'messagetype': 'success'}}

wwwroot/api/cms_content_delete.dspy

@@ -1,14 +1,11 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     _id = params_kw.get('id', '')
     if not _id:
-    print(json.dumps({'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}, ensure_ascii=False))
+        return {'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}
-    return
     await sor.D('cms_content', {'id': _id})
-print(json.dumps({'widgettype': 'Message', 'options': {'text': '删除成功', 'messagetype': 'success'}}, ensure_ascii=False))
+    return {'widgettype': 'Message', 'options': {'text': '删除成功', 'messagetype': 'success'}}

wwwroot/api/cms_content_list.dspy

@@ -1,10 +1,8 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     ns = {'sort': 'sort_order asc, created_at desc'}
 
@@ -33,4 +31,4 @@ if _status:
 
     rows = await sor.R('cms_content', ns)
     total = len(rows)
-print(json.dumps({'status': 'ok', 'rows': rows, 'total': total}, ensure_ascii=False))
+    return {'status': 'ok', 'rows': rows, 'total': total}

wwwroot/api/cms_content_update.dspy

@@ -1,15 +1,12 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     data = {'id': params_kw.get('id', '')}
     if not data['id']:
-    print(json.dumps({'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}, ensure_ascii=False))
+        return {'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}
-    return
 
     v = params_kw.get('org_id', None)
     if v is not None:
@@ -68,4 +65,4 @@ if v is not None:
         data['published_at'] = v
 
     await sor.U('cms_content', data)
-print(json.dumps({'widgettype': 'Message', 'options': {'text': '更新成功', 'messagetype': 'success'}}, ensure_ascii=False))
+    return {'widgettype': 'Message', 'options': {'text': '更新成功', 'messagetype': 'success'}}

wwwroot/api/cms_leads_create.dspy

@@ -1,10 +1,8 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     data = {'id': getID()}
 
@@ -65,4 +63,4 @@ if v is not None:
         data['notes'] = v
 
     await sor.C('cms_leads', data)
-print(json.dumps({'widgettype': 'Message', 'options': {'text': '创建成功', 'messagetype': 'success'}}, ensure_ascii=False))
+    return {'widgettype': 'Message', 'options': {'text': '创建成功', 'messagetype': 'success'}}

wwwroot/api/cms_leads_delete.dspy

@@ -1,14 +1,11 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     _id = params_kw.get('id', '')
     if not _id:
-    print(json.dumps({'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}, ensure_ascii=False))
+        return {'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}
-    return
     await sor.D('cms_leads', {'id': _id})
-print(json.dumps({'widgettype': 'Message', 'options': {'text': '删除成功', 'messagetype': 'success'}}, ensure_ascii=False))
+    return {'widgettype': 'Message', 'options': {'text': '删除成功', 'messagetype': 'success'}}

wwwroot/api/cms_leads_list.dspy

@@ -1,10 +1,8 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     ns = {'sort': 'created_at desc'}
 
@@ -33,4 +31,4 @@ if _source:
 
     rows = await sor.R('cms_leads', ns)
     total = len(rows)
-print(json.dumps({'status': 'ok', 'rows': rows, 'total': total}, ensure_ascii=False))
+    return {'status': 'ok', 'rows': rows, 'total': total}

wwwroot/api/cms_leads_update.dspy

@@ -1,15 +1,12 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     data = {'id': params_kw.get('id', '')}
     if not data['id']:
-    print(json.dumps({'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}, ensure_ascii=False))
+        return {'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}
-    return
 
     v = params_kw.get('org_id', None)
     if v is not None:
@@ -68,4 +65,4 @@ if v is not None:
         data['notes'] = v
 
     await sor.U('cms_leads', data)
-print(json.dumps({'widgettype': 'Message', 'options': {'text': '更新成功', 'messagetype': 'success'}}, ensure_ascii=False))
+    return {'widgettype': 'Message', 'options': {'text': '更新成功', 'messagetype': 'success'}}

wwwroot/api/cms_sections_create.dspy

@@ -1,10 +1,8 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     data = {'id': getID()}
     v = params_kw.get('org_id', None)
@@ -41,4 +39,4 @@ v = params_kw.get('static_content', None)
     if v is not None:
         data['static_content'] = v
     await sor.C('cms_sections', data)
-print(json.dumps({'widgettype': 'Message', 'options': {'text': '创建成功', 'messagetype': 'success'}}, ensure_ascii=False))
+    return {'widgettype': 'Message', 'options': {'text': '创建成功', 'messagetype': 'success'}}

wwwroot/api/cms_sections_delete.dspy

@@ -1,14 +1,11 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     _id = params_kw.get('id', '')
     if not _id:
-    print(json.dumps({'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}, ensure_ascii=False))
+        return {'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}
-    return
     await sor.D('cms_sections', {'id': _id})
-print(json.dumps({'widgettype': 'Message', 'options': {'text': '删除成功', 'messagetype': 'success'}}, ensure_ascii=False))
+    return {'widgettype': 'Message', 'options': {'text': '删除成功', 'messagetype': 'success'}}

wwwroot/api/cms_sections_list.dspy

@@ -1,10 +1,8 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     ns = {'sort': 'sort_order asc'}
     filter_json = params_kw.get('data_filter', None)
@@ -19,4 +17,4 @@ if filter_json:
         except Exception:
             pass
     rows = await sor.R('cms_sections', ns)
-print(json.dumps({'status': 'ok', 'rows': rows, 'total': len(rows)}, ensure_ascii=False))
+    return {'status': 'ok', 'rows': rows, 'total': len(rows)}

wwwroot/api/cms_sections_update.dspy

@@ -1,15 +1,12 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     data = {'id': params_kw.get('id', '')}
     if not data['id']:
-    print(json.dumps({'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}, ensure_ascii=False))
+        return {'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}
-    return
     v = params_kw.get('org_id', None)
     if v is not None:
         data['org_id'] = v
@@ -44,4 +41,4 @@ v = params_kw.get('static_content', None)
     if v is not None:
         data['static_content'] = v
     await sor.U('cms_sections', data)
-print(json.dumps({'widgettype': 'Message', 'options': {'text': '更新成功', 'messagetype': 'success'}}, ensure_ascii=False))
+    return {'widgettype': 'Message', 'options': {'text': '更新成功', 'messagetype': 'success'}}

wwwroot/api/cms_site_config_create.dspy

@@ -1,10 +1,8 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     data = {'id': getID()}
 
@@ -33,4 +31,4 @@ if v is not None:
         data['sort_order'] = v
 
     await sor.C('cms_site_config', data)
-print(json.dumps({'widgettype': 'Message', 'options': {'text': '创建成功', 'messagetype': 'success'}}, ensure_ascii=False))
+    return {'widgettype': 'Message', 'options': {'text': '创建成功', 'messagetype': 'success'}}

wwwroot/api/cms_site_config_delete.dspy

@@ -1,14 +1,11 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     _id = params_kw.get('id', '')
     if not _id:
-    print(json.dumps({'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}, ensure_ascii=False))
+        return {'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}
-    return
     await sor.D('cms_site_config', {'id': _id})
-print(json.dumps({'widgettype': 'Message', 'options': {'text': '删除成功', 'messagetype': 'success'}}, ensure_ascii=False))
+    return {'widgettype': 'Message', 'options': {'text': '删除成功', 'messagetype': 'success'}}

wwwroot/api/cms_site_config_list.dspy

@@ -1,10 +1,8 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     ns = {'sort': 'config_group asc, sort_order asc'}
 
@@ -29,4 +27,4 @@ if _config_group:
 
     rows = await sor.R('cms_site_config', ns)
     total = len(rows)
-print(json.dumps({'status': 'ok', 'rows': rows, 'total': total}, ensure_ascii=False))
+    return {'status': 'ok', 'rows': rows, 'total': total}

wwwroot/api/cms_site_config_update.dspy

@@ -1,15 +1,12 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     data = {'id': params_kw.get('id', '')}
     if not data['id']:
-    print(json.dumps({'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}, ensure_ascii=False))
+        return {'widgettype': 'Message', 'options': {'text': '缺少ID', 'messagetype': 'error'}}
-    return
 
     v = params_kw.get('org_id', None)
     if v is not None:
@@ -36,4 +33,4 @@ if v is not None:
         data['sort_order'] = v
 
     await sor.U('cms_site_config', data)
-print(json.dumps({'widgettype': 'Message', 'options': {'text': '更新成功', 'messagetype': 'success'}}, ensure_ascii=False))
+    return {'widgettype': 'Message', 'options': {'text': '更新成功', 'messagetype': 'success'}}

wwwroot/api/get_config.dspy

@@ -1,10 +1,8 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     group = params_kw.get('group', None)
     ns = {'sort': 'sort_order asc'}
@@ -17,4 +15,4 @@ for r in rows:
         if g not in result:
             result[g] = {}
         result[g][r.get('config_key', '')] = r.get('config_value', '')
-print(json.dumps({'status': 'ok', 'data': result}, ensure_ascii=False))
+    return {'status': 'ok', 'data': result}

wwwroot/api/get_content_detail.dspy

@@ -1,18 +1,16 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     _id = params_kw.get('id', '')
     if not _id:
-    print(json.dumps({'status': 'error', 'message': '缺少ID'}, ensure_ascii=False))
+        return {'status': 'error', 'message': '缺少ID'}
     else:
         ns = {'id': _id}
         rows = await sor.R('cms_content', ns)
         if rows:
-        print(json.dumps({'status': 'ok', 'data': rows[0]}, ensure_ascii=False))
+            return {'status': 'ok', 'data': rows[0]}
         else:
-        print(json.dumps({'status': 'error', 'message': '内容不存在'}, ensure_ascii=False))
+            return {'status': 'error', 'message': '内容不存在'}

wwwroot/api/get_published_content.dspy

@@ -1,10 +1,8 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     content_type = params_kw.get('content_type', None)
     limit = int(params_kw.get('limit', '10'))
@@ -14,4 +12,4 @@ if content_type:
     rows = await sor.R('cms_content', ns)
     if limit:
         rows = rows[:limit]
-print(json.dumps({'status': 'ok', 'rows': rows, 'total': len(rows)}, ensure_ascii=False))
+    return {'status': 'ok', 'rows': rows, 'total': len(rows)}

wwwroot/api/get_sections.dspy

@@ -1,10 +1,8 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     ns = {'is_visible': '1', 'sort': 'sort_order asc'}
     rows = await sor.R('cms_sections', ns)
@@ -17,4 +15,4 @@ for r in rows:
                     r[field] = json.loads(v)
                 except:
                     pass
-print(json.dumps({'status': 'ok', 'rows': rows, 'total': len(rows)}, ensure_ascii=False))
+    return {'status': 'ok', 'rows': rows, 'total': len(rows)}

wwwroot/api/submit_content_approval.dspy

@@ -1,14 +1,12 @@
-import json
-from appPublic.uniqueID import getID
 
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     content_id = params_kw.get('content_id', '')
     if not content_id:
-    print(json.dumps({'widgettype': 'Message', 'options': {'text': '缺少内容ID', 'messagetype': 'error'}}, ensure_ascii=False))
+        return {'widgettype': 'Message', 'options': {'text': '缺少内容ID', 'messagetype': 'error'}}
     else:
         # Update status to pending
         await sor.U('cms_content', {'id': content_id, 'status': 'pending'})
@@ -23,6 +21,6 @@ else:
             result = await submit_approval('content_publish', content_id, title, user_id)
             if result and result.get('approval_id'):
                 await sor.U('cms_content', {'id': content_id, 'approval_id': result['approval_id']})
-        print(json.dumps({'widgettype': 'Message', 'options': {'text': '已提交审批', 'messagetype': 'success'}}, ensure_ascii=False))
+            return {'widgettype': 'Message', 'options': {'text': '已提交审批', 'messagetype': 'success'}}
         except ImportError:
-        print(json.dumps({'widgettype': 'Message', 'options': {'text': '审批模块未安装，状态已改为待审批', 'messagetype': 'warning'}}, ensure_ascii=False))
+            return {'widgettype': 'Message', 'options': {'text': '审批模块未安装，状态已改为待审批', 'messagetype': 'warning'}}

wwwroot/api/submit_lead.dspy

@@ -1,10 +1,7 @@
-import json
-from appPublic.uniqueID import getID
-
 config = getConfig('.')
 DBPools(config.databases)
 dbname = get_module_dbname('entcms')
-sor = DBPools().sqlorContext(dbname)
+async with db.sqlorContext(dbname) as sor:
 
     data = {
         'id': getID(),
@@ -19,7 +16,7 @@ for field in ['name', 'company', 'phone', 'email', 'industry', 'region',
             data[field] = v
 
     await sor.C('cms_leads', data)
-print(json.dumps({
+    return {
         'widgettype': 'Message', 
         'options': {'text': '感谢您的留言，我们会尽快联系您！', 'messagetype': 'success'}
-}, ensure_ascii=False))
+    }

wwwroot/dingdingflow/api/dd_approval_configs_create.dspy

@@ -1,7 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""dd_approval_configs create API"""
-
 result = {'widgettype': 'Message', 'options': {'title': 'Error', 'message': 'Invalid request', 'type': 'error'}}
 
 try:
@@ -12,9 +8,9 @@ try:
     if not biz_type:
         result['options'] = {'title': 'Error', 'message': 'biz_type is required', 'type': 'error'}
     else:
-        new_id = uuid()
+        new_id = getID()
         org_id = (await get_userorgid()) or '0'
-        now_str = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+        now_str = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
 
         dbname = get_module_dbname('dingdingflow')
         async with DBPools().sqlorContext(dbname) as sor:
@@ -38,4 +34,4 @@ try:
 except Exception as e:
     result['options'] = {'title': 'Error', 'message': f'创建失败: {str(e)}', 'type': 'error'}
 
-return json.dumps(result, ensure_ascii=False)
+return result

wwwroot/dingdingflow/api/dd_approval_configs_delete.dspy

@@ -1,7 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""dd_approval_configs delete API"""
-
 result = {'widgettype': 'Message', 'options': {'title': 'Error', 'message': 'Invalid request', 'type': 'error'}}
 
 try:
@@ -17,4 +13,4 @@ try:
 except Exception as e:
     result['options'] = {'title': 'Error', 'message': f'删除失败: {str(e)}', 'type': 'error'}
 
-return json.dumps(result, ensure_ascii=False)
+return result

wwwroot/dingdingflow/api/dd_approval_configs_list.dspy

@@ -1,7 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""dd_approval_configs list API"""
-
 result = {'success': False, 'rows': [], 'total': 0}
 
 try:
@@ -55,4 +51,4 @@ try:
 except Exception as e:
     result['error'] = str(e)
 
-return json.dumps(result, ensure_ascii=False, default=str)
+return result

wwwroot/dingdingflow/api/dd_approval_configs_update.dspy

@@ -1,7 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""dd_approval_configs update API"""
-
 result = {'widgettype': 'Message', 'options': {'title': 'Error', 'message': 'Invalid request', 'type': 'error'}}
 
 try:
@@ -21,7 +17,7 @@ try:
                     update_ns[field] = val
 
             # Always update updated_at
-            now_str = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+            now_str = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
             update_fields.append("updated_at=${updated_at}$")
             update_ns['updated_at'] = now_str
 
@@ -33,4 +29,4 @@ try:
 except Exception as e:
     result['options'] = {'title': 'Error', 'message': f'更新失败: {str(e)}', 'type': 'error'}
 
-return json.dumps(result, ensure_ascii=False)
+return result

wwwroot/dingdingflow/api/dd_approvals_create.dspy

@@ -1,7 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""dd_approvals create API"""
-
 result = {'widgettype': 'Message', 'options': {'title': 'Error', 'message': 'Invalid request', 'type': 'error'}}
 
 try:
@@ -13,9 +9,9 @@ try:
     if not biz_type or not title:
         result['options'] = {'title': 'Error', 'message': 'biz_type and title are required', 'type': 'error'}
     else:
-        new_id = uuid()
+        new_id = getID()
         org_id = (await get_userorgid()) or '0'
-        now_str = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+        now_str = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
 
         dbname = get_module_dbname('dingdingflow')
         async with DBPools().sqlorContext(dbname) as sor:
@@ -40,4 +36,4 @@ try:
 except Exception as e:
     result['options'] = {'title': 'Error', 'message': f'创建失败: {str(e)}', 'type': 'error'}
 
-return json.dumps(result, ensure_ascii=False)
+return result

wwwroot/dingdingflow/api/dd_approvals_delete.dspy

@@ -1,7 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""dd_approvals delete API"""
-
 result = {'widgettype': 'Message', 'options': {'title': 'Error', 'message': 'Invalid request', 'type': 'error'}}
 
 try:
@@ -17,4 +13,4 @@ try:
 except Exception as e:
     result['options'] = {'title': 'Error', 'message': f'删除失败: {str(e)}', 'type': 'error'}
 
-return json.dumps(result, ensure_ascii=False)
+return result

wwwroot/dingdingflow/api/dd_approvals_list.dspy

@@ -1,7 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""dd_approvals list API with data_filter support"""
-
 result = {'success': False, 'rows': [], 'total': 0}
 
 try:
@@ -73,4 +69,4 @@ try:
 except Exception as e:
     result['error'] = str(e)
 
-return json.dumps(result, ensure_ascii=False, default=str)
+return result

wwwroot/dingdingflow/api/dd_approvals_update.dspy

@@ -1,7 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""dd_approvals update API"""
-
 result = {'widgettype': 'Message', 'options': {'title': 'Error', 'message': 'Invalid request', 'type': 'error'}}
 
 try:
@@ -33,4 +29,4 @@ try:
 except Exception as e:
     result['options'] = {'title': 'Error', 'message': f'更新失败: {str(e)}', 'type': 'error'}
 
-return json.dumps(result, ensure_ascii=False)
+return result

wwwroot/dingdingflow/api/dingtalk_callback.dspy

@@ -1,20 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-DingTalk webhook callback endpoint.
-PUBLIC endpoint (any permission) - DingTalk servers call this when approval status changes.
-
-Expected POST body:
-{
-    "processInstanceId": "xxx",
-    "processCode": "xxx",
-    "type": "bpms_instance_change",
-    "result": "agree" / "refuse",
-    "staffId": "xxx",
-    "remark": "optional comment"
-}
-"""
-
 result = {'success': False, 'message': 'Invalid callback'}
 
 try:
@@ -59,4 +42,4 @@ try:
 except Exception as e:
     result = {'success': False, 'message': f'Callback processing error: {str(e)}'}
 
-return json.dumps(result, ensure_ascii=False, default=str)
+return result

wwwroot/dingdingflow/api/submit_approval.dspy

@@ -1,10 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-Submit approval API - triggered by entcms when content needs approval.
-Creates a dd_approvals record and calls DingTalk API to start the approval process.
-"""
-
 result = {'success': False, 'message': 'Invalid request'}
 
 try:
@@ -22,7 +15,7 @@ try:
     else:
         # Use current user as applicant if not specified
         if not applicant_id:
-            applicant_id = get_user() or ''
+            applicant_id = (await get_user()) or ''
 
         org_id = (await get_userorgid()) or '0'
 
@@ -33,4 +26,4 @@ try:
 except Exception as e:
     result = {'success': False, 'message': f'提交审批失败: {str(e)}'}
 
-return json.dumps(result, ensure_ascii=False, default=str)
+return result