diff --git a/scripts/__pycache__/load_path.cpython-310.pyc b/scripts/__pycache__/load_path.cpython-310.pyc new file mode 100644 index 0000000..64e929b Binary files /dev/null and b/scripts/__pycache__/load_path.cpython-310.pyc differ diff --git a/wwwroot/create_apikey.dspy b/wwwroot/create_apikey.dspy index cb1cb49..23d2eef 100644 --- a/wwwroot/create_apikey.dspy +++ b/wwwroot/create_apikey.dspy @@ -20,26 +20,34 @@ kw = { ] } -async with db.sqlorContext(dbname) as sor: - orgid = await get_userorgid() - userid = await get_user() - ns = { - "id": params_kw.id, - "name": params_kw.appname, - "description": params_kw.description, - "secretkey": password_encode(uuid()), - "allowedips": params_kw.allowedips, - "orgid": orgid - } - await sor.C('downapp', ns) - ns1 = { - "id": uuid(), - "dappid": ns['id'], - "userid": userid, - "apikey": password_encode(uuid()), - "enabled_date": curDateString(), - "expired_date": '9999-12-31' - } - await sor.C('downapikey', ns1) - return UiMessage(title="create apikey", message=f"apikey created", **kw) +try: + async with db.sqlorContext(dbname) as sor: + orgid = await get_userorgid() + userid = await get_user() + ns = { + "id": params_kw.id, + "name": params_kw.appname, + "description": params_kw.description, + "secretkey": password_encode(uuid()), + "allowedips": params_kw.allowedips, + "orgid": orgid + } + await sor.C('downapp', ns) + ns1 = { + "id": uuid(), + "dappid": ns['id'], + "userid": userid, + "apikey": password_encode(uuid()), + "enabled_date": curDateString(), + "expired_date": '9999-12-31' + } + await sor.C('downapikey', ns1) + return UiMessage(title="create apikey", message=f"apikey created", **kw) +except Exception as e: + err_msg = str(e) + debug(f'create_apikey error: {format_exc()}') + if 'Duplicate' in err_msg or '1062' in err_msg: + return UiError(title='创建失败', message='应用ID或名称已存在,请使用不同的ID或名称') + return UiError(title='创建失败', message=f'创建API Key失败: {err_msg}') + return UiError(title='create apikey', message='add apikey error')