diff --git a/connect.py b/connect.py index f0f8effd3..5ff7ae268 100755 --- a/connect.py +++ b/connect.py @@ -585,7 +585,7 @@ class Nav(object): print "请输入运行命令所关联系统用户的ID, q退出" try: - role_id = raw_input("\033[1;32mRole>:\033[0m ").strip() + role_id = int(raw_input("\033[1;32mRole>:\033[0m ").strip()) if role_id == 'q': break except (IndexError, ValueError): diff --git a/templates/jperm/perm_role_edit.html b/templates/jperm/perm_role_edit.html index 8ad8ed973..fe10b6c44 100644 --- a/templates/jperm/perm_role_edit.html +++ b/templates/jperm/perm_role_edit.html @@ -94,7 +94,7 @@ $('#roleForm').validator({ timely: 2, theme: "yellow_right_effect", rules: { - check_name: [/(?!^root$)^\w{2,20}$/i, '大小写字母数字和下划线,2-20位,并且非root'], + check_name: [/(?!^root$)^[\w.]{2,20}$/i, '大小写字母数字和下划线小数点,2-20位,并且非root'], check_begin: [/^[\-]+BEGIN RSA PRIVATE KEY[\-]+/gm, 'RSA Key填写有误,请检查'], },