From 0aa5a2a8620ab69ccb271bb9e5013b3f9702b7cb Mon Sep 17 00:00:00 2001
From: yumoqing <yumoqing@gmail.com>
Date: Thu, 21 May 2026 15:49:04 +0800
Subject: [PATCH] fix: remove uapiset references, use upappid for uapi-upapp
 direct join

---
 models/uapi.json  | 20 +++++++-------------
 models/upapp.json | 13 +++++++------
 uapi/apidata.py   |  2 +-
 uapi/appapi.py    |  4 ++--
 4 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/models/uapi.json b/models/uapi.json
index 70c5747..1e2ebd7 100644
--- a/models/uapi.json
+++ b/models/uapi.json
@@ -16,6 +16,12 @@
             "type": "str",
             "length": 32
         },
+        {
+            "name": "upappid",
+            "title": "上位系统ID",
+            "type": "str",
+            "length": 32
+        },
         {
             "name": "name",
             "title": "api名称",
@@ -28,12 +34,6 @@
             "type": "str",
             "length": 100
         },
-        {
-            "name": "apisetid",
-            "title": "API集id",
-            "type": "str",
-            "length": 32
-        },
         {
             "name": "description",
             "title": "接口描述",
@@ -116,7 +116,7 @@
             "name": "idx1",
             "idxtype": "unique",
             "idxfields": [
-                "apisetid",
+                "upappid",
                 "name"
             ]
         }
@@ -129,12 +129,6 @@
             "textfield": "v",
             "cond": "parentid='httpmethod'"
         },
-        {
-            "field": "apisetid",
-            "table": "uapiset",
-            "valuefield": "id",
-            "textfield": "name"
-        },
         {
             "field": "need_auth",
             "table": "appcodes_kv",
diff --git a/models/upapp.json b/models/upapp.json
index 42f432f..cf87b9c 100644
--- a/models/upapp.json
+++ b/models/upapp.json
@@ -63,6 +63,13 @@
             "title": "动态headers函数",
             "type": "str",
             "length": 255
+        },
+        {
+            "name": "auth_apiname",
+            "title": "认证API名",
+            "type": "str",
+            "length": 200,
+            "nullable": "yes"
         }
     ],
     "codes": [
@@ -71,12 +78,6 @@
             "table": "organization",
             "valuefield": "id",
             "textfield": "orgname"
-        },
-        {
-            "field": "apisetid",
-            "table": "uapiset",
-            "valuefield": "id",
-            "textfield": "name"
         }
     ]
 }
\ No newline at end of file
diff --git a/uapi/apidata.py b/uapi/apidata.py
index 2566cdf..7fb7980 100644
--- a/uapi/apidata.py
+++ b/uapi/apidata.py
@@ -27,7 +27,7 @@ async def sor_get_uapi(sor, upappid, apiname):
 	sql = """select a.*,
 b.auth_apiname
 from uapi a, upapp b
-where a.apisetid = b.apisetid
+where a.upappid = b.id
 	and a.name = ${apiname}$
 	and b.id = ${upappid}$"""
 	recs = await sor.sqlExe(sql, {'upappid': upappid, 'apiname': apiname})
diff --git a/uapi/appapi.py b/uapi/appapi.py
index c860b8c..57d671d 100644
--- a/uapi/appapi.py
+++ b/uapi/appapi.py
@@ -20,7 +20,7 @@ async def get_callerid(orgid):
 
 async def sor_get_uapi_by_appname_apiname(sor, appname, apiname):
 	sql = """select a.* from uapi a, upapp b
-where a.apisetid = b.apisetid
+where a.upappid = b.id
 	and b.name = ${appname}$
 	and a.name = ${apiname}$"""
 	recs = await sor.sqlExe(sql, {'apiname': apiname, 'appname': appname})
@@ -92,7 +92,7 @@ async def sor_get_uapi(sor, upappid, apiname):
 	sql = """select a.*,
 b.auth_apiname
 from uapi a, upapp b
-where a.apisetid = b.apisetid
+where a.upappid = b.id
 	and a.name = ${apiname}$
 	and b.id = ${upappid}$"""
 	recs = await sor.sqlExe(sql, {'upappid': upappid, 'apiname': apiname})