Merge pull request 'main' (#99) from main into prod

Reviewed-on: #99

b/user/loginUser.dspy

@@ -140,7 +140,7 @@ async def loginUser(ns):
                 ns['password'] = back_text.decode('utf-8')
 
             type1 = 0
-            if ns.get('username') != 'admin':
+            if ns.get('username') != 'admin' and ns.get('username') != '开元云(北京)科技有限公司':
                 # 这里用户名密码登录也需要手机号，放开下面代码
                 # logincode = await sor.R('params',{'pname':'login_message','pvalue':'0','del_flg':'0'})
                 # if len(logincode) >= 1:
@@ -170,7 +170,7 @@ async def loginUser(ns):
             else:
                 ns['password'] = password_encode(ns['password'])
                 ns['del_flg'] = '0'
-                userreacs = await sor.R('users', ns)
+                userreacs = await sor.R('users', {'username': ns.get('username'), 'password': ns.get('password')})
             if len(userreacs) >= 1:
                 type += 1
                 await remember_user(userreacs[0]['id'], username=userreacs[0]['username'], userorgid=userreacs[0]['orgid'])

b/user/logintype.dspy

@@ -45,7 +45,7 @@ async def logintype(ns):
     async with db.sqlorContext('kboss') as sor:
         
         domain_name = ns.get('domain_name')
-        if domain_name in ['www.opencomputing.cn', 'dev.opencomputing.cn', 'localhost:9527'] and ns.get('username') != '开元云(北京)科技有限公司':
+        if domain_name in ['www.opencomputing.cn', 'dev.opencomputing.cn', 'localhost:9527'] and ns.get('username') not in ['开元云(北京)科技有限公司', 'admin', 'kyy_root']:
             if not ns.get('mobile'):
                 return {
                     'status': False,