Merge branch 'main' of git.opencomputing.cn:yumoqing/dapi

dapi/dapi.py

@@ -28,7 +28,7 @@ async def get_secretkey(sor, appid):
 		return None
 	secretkey = recs[0].secretkey
 	f = get_serverenv('password_decode')
-	return f(secret_key).encode('utf-8')
+	return f(secretkey).encode('utf-8')
 
 async def get_apikey_user(sor, apikey, client_ip):
 	f = get_serverenv('password_encode')

json/downapikey.json

@@ -4,13 +4,13 @@
     "params": {
         "sortby":"name",
         "confidential_fields":["apikey"],
-        "logined_userorgid":"orgid",
+        "logined_userid":"userid",
         "browserfields": {
-            "exclouded": ["id", "apikey", "orgid", "userid" ],
+            "exclouded": ["id", "apikey", "userid" ],
             "alters": {}
         },
         "editexclouded": [
-            "id", "apikey", "orgid", "userid"
+            "id", "apikey", "userid"
         ]
     }
 }