reyserver 1.1.69__py3-none-any.whl → 1.1.71__py3-none-any.whl

reyserver/rauth.py

@@ -78,7 +78,7 @@ class DatabaseORMTableUser(rorm.Table):
     create_time: rorm.Datetime = rorm.Field(field_default=':create_time', not_null=True, index_n=True, comment='Record create time.')
     update_time: rorm.Datetime = rorm.Field(field_default=':update_time', not_null=True, index_n=True, comment='Record update time.')
     user_id: int = rorm.Field(rorm.types_mysql.MEDIUMINT(unsigned=True), key_auto=True, comment='User ID.')
-    name: str = rorm.Field(rorm.types.VARCHAR(50), not_null=True, index_u=True, comment='User name.')
+    name: str = rorm.Field(rorm.types.VARCHAR(50), not_null=True, index_u=True, comment='User name, use lowercase letters.')
     password: str = rorm.Field(rorm.types.CHAR(60), not_null=True, comment='User password, encrypted with "bcrypt".')
     email: rorm.Email = rorm.Field(rorm.types.VARCHAR(255), index_u=True, comment='User email.')
     phone: str = rorm.Field(rorm.types.CHAR(11), index_u=True, comment='User phone.')
@@ -328,6 +328,7 @@ async def get_user_data(
     """
 
     # Parameters.
+    database = conn.engine.database
     if filter_invalid:
         sql_where = (
             '    WHERE (\n'
@@ -353,28 +354,28 @@ async def get_user_data(
         "    GROUP_CONCAT(DISTINCT `perm`.`api` SEPARATOR ';') AS `perm_apis`\n"
         'FROM (\n'
         '    SELECT `create_time`, `update_time`, `user_id`, `password`, `name`, `email`, `phone`, `avatar`\n'
-        '    FROM `test`.`user`\n'
+        f'    FROM `{database}`.`user`\n'
         f'{sql_where}'
         '    LIMIT 1\n'
         ') as `user`\n'
         'LEFT JOIN (\n'
         '    SELECT `user_id`, `role_id`\n'
-        '    FROM `test`.`user_role`\n'
+        f'    FROM `{database}`.`user_role`\n'
         ') as `user_role`\n'
         'ON `user_role`.`user_id` = `user`.`user_id`\n'
         'LEFT JOIN (\n'
         '    SELECT `role_id`, `name`\n'
-        '    FROM `test`.`role`\n'
+        f'    FROM `{database}`.`role`\n'
         ') AS `role`\n'
         'ON `user_role`.`role_id` = `role`.`role_id`\n'
         'LEFT JOIN (\n'
         '    SELECT `role_id`, `perm_id`\n'
-        '    FROM `test`.`role_perm`\n'
+        f'    FROM `{database}`.`role_perm`\n'
         ') as `role_perm`\n'
         'ON `role_perm`.`role_id` = `role`.`role_id`\n'
         'LEFT JOIN (\n'
         "    SELECT `perm_id`, `name`, `api`\n"
-        '    FROM `test`.`perm`\n'
+        f'    FROM `{database}`.`perm`\n'
         ') AS `perm`\n'
         'ON `role_perm`.`perm_id` = `perm`.`perm_id`\n'
         'GROUP BY `user_id`'

{reyserver-1.1.69.dist-info → reyserver-1.1.71.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reyserver
-Version: 1.1.69
+Version: 1.1.71
 Summary: Backend server method set.
 Project-URL: homepage, https://github.com/reyxbo/reyserver/
 Author-email: Rey <reyxbo@163.com>

{reyserver-1.1.69.dist-info → reyserver-1.1.71.dist-info}/RECORD

@@ -1,11 +1,11 @@
 reyserver/__init__.py,sha256=7GX64p7uI2eetJH9NJ-DTg-8iyQwOsGcviADFJCPxVA,373
 reyserver/rall.py,sha256=riyDRTUsigco_Bee1H4aZFb8IgvjnxdX9qcnVb9i9mE,270
-reyserver/rauth.py,sha256=mqyo5FsN4vdW5GRgvZssWcpfku1Dfo_Md8vvoo8JzhU,15122
+reyserver/rauth.py,sha256=SGBtopM4fwn7pFjFPmrh6mD61c0iSJmqYEYUpgoCayA,15217
 reyserver/rbase.py,sha256=OKXZ_VOfPEVgO3oVn6j-pqHjnIbDL0UoZtp8GcN9hzw,8990
 reyserver/rclient.py,sha256=og5YuWm-PODkFn9njBwYQpGlk0j1BfqFuEarlCFSQYI,6229
 reyserver/rfile.py,sha256=tf3zKuKMXFsKUagiUp6plK5I33fBMjtiarVSKGaAZZo,8868
 reyserver/rserver.py,sha256=V-iZX8JohlJNQ8XwZoT8yoUIMgwNwVW77lBvP_pytpU,11381
-reyserver-1.1.69.dist-info/METADATA,sha256=wulmFjlM7-rSXF7orejZ5AHWRxRsgOJIV_W2uiAkJSc,1666
-reyserver-1.1.69.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reyserver-1.1.69.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reyserver-1.1.69.dist-info/RECORD,,
+reyserver-1.1.71.dist-info/METADATA,sha256=PapgPnN6sqCjbBJK280Q7R3ySrN3zQEeHh8lEgwGZcA,1666
+reyserver-1.1.71.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reyserver-1.1.71.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reyserver-1.1.71.dist-info/RECORD,,