bugfix
This commit is contained in:
parent
0b2d410ce4
commit
c30c4a5d63
3
json/build.sh
Executable file
3
json/build.sh
Executable file
@ -0,0 +1,3 @@
|
||||
#!/usr/bin/bash
|
||||
|
||||
xls2ui -m ../models -o ../wwwroot rbac *.json
|
@ -4,7 +4,8 @@
|
||||
"title":"权限",
|
||||
"params":{
|
||||
"idField":"id",
|
||||
"textField":"name",
|
||||
"textField":"path",
|
||||
"sortby":"path",
|
||||
"editable":true,
|
||||
"browserfields":{
|
||||
"alters":{}
|
||||
|
@ -13,7 +13,6 @@ from ahserver.globalEnv import password_encode
|
||||
from ahserver.serverenv import ServerEnv, get_serverenv, set_serverenv
|
||||
import jwt
|
||||
|
||||
ownerid = None
|
||||
defualt_password_key = "!@#$%^&*(*&^%$QWERTYUIqwertyui234567"
|
||||
defualt_secret_key="test1234!@#$2222354"
|
||||
|
||||
@ -56,18 +55,6 @@ async def get_user_roles(userid):
|
||||
roles.append(r.name)
|
||||
return roles
|
||||
|
||||
async def get_owner_orgid(sor, *args):
|
||||
debug('uyyyyyyyyyyyyyyyy')
|
||||
global ownerid
|
||||
if ownerid:
|
||||
return ownerid
|
||||
|
||||
sql = "select * from orgtypes where orgtypeid = 'owner'"
|
||||
recs = await sor.sqlExe(sql, {})
|
||||
if len(recs) > 0:
|
||||
ownerid = recs[0].orgid
|
||||
return ownerid
|
||||
|
||||
async def create_org(sor, ns):
|
||||
await sor.C('organization', ns)
|
||||
otns = {
|
||||
|
@ -3,11 +3,8 @@ db = DBPools()
|
||||
dbname = await rfexe('get_module_dbname', 'sage')
|
||||
async with db.sqlorContext(dbname) as sor:
|
||||
orgid = await register_user(sor, params_kw)
|
||||
try:
|
||||
ownerid = await get_owner_orgid(sor)
|
||||
if get_owner_orgid and openCustomerAccounts:
|
||||
ownerid = await get_owner_orgid(sor, orgid)
|
||||
await openCustomerAccounts(sor, ownerid, orgid)
|
||||
except Exception as e:
|
||||
fe = format_exc()
|
||||
exception(f'{e=}\n{fe}')
|
||||
return UiMessage(title="Success", message="register success")
|
||||
return UiError(title='Error', message="register failed")
|
||||
|
@ -3,6 +3,7 @@
|
||||
"widgettype":"HBox",
|
||||
"options":{
|
||||
"css":"clickable",
|
||||
"tip":"用户功能",
|
||||
"cwidth":12
|
||||
},
|
||||
"binds":[
|
||||
@ -44,12 +45,12 @@
|
||||
"tools":[
|
||||
{
|
||||
"name":"login",
|
||||
"tip":"user login",
|
||||
"tip":"点击登录",
|
||||
"icon":"{{entire_url('/imgs/login.png')}}"
|
||||
},
|
||||
{
|
||||
"name":"register",
|
||||
"tip":"user register",
|
||||
"tip":"点击注册",
|
||||
"icon":"{{entire_url('/imgs/register.png')}}"
|
||||
}
|
||||
]
|
||||
|
Loading…
Reference in New Issue
Block a user