From dd3517351260016b96074ef7137164b2c36902b3 Mon Sep 17 00:00:00 2001 From: xuxueli <931591021@qq.com> Date: Sat, 4 May 2019 23:10:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=EF=BC=9A?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=9C=A8=E7=BA=BF=E7=BB=B4=E6=8A=A4=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xxl-job-admin/src/main/resources/i18n/message.properties | 4 ++-- .../src/main/resources/i18n/message_en.properties | 4 ++-- xxl-job-admin/src/main/resources/static/js/login.1.js | 8 ++++---- .../src/main/resources/templates/common/common.macro.ftl | 2 +- xxl-job-admin/src/main/resources/templates/login.ftl | 4 ++-- .../src/main/resources/templates/user/user.index.ftl | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/xxl-job-admin/src/main/resources/i18n/message.properties b/xxl-job-admin/src/main/resources/i18n/message.properties index 027b49d2..0a377201 100644 --- a/xxl-job-admin/src/main/resources/i18n/message.properties +++ b/xxl-job-admin/src/main/resources/i18n/message.properties @@ -71,9 +71,9 @@ login_remember_me=记住密码 login_username_placeholder=请输入登录账号 login_password_placeholder=请输入登录密码 login_username_empty=请输入登录账号 -login_username_lt_5=登录账号不应低于5位 +login_username_lt_4=登录账号不应低于4位 login_password_empty=请输入登录密码 -login_password_lt_5=登录密码不应低于5位 +login_password_lt_4=登录密码不应低于4位 login_success=登录成功 login_fail=登录失败 login_param_empty=账号或密码为空 diff --git a/xxl-job-admin/src/main/resources/i18n/message_en.properties b/xxl-job-admin/src/main/resources/i18n/message_en.properties index ec19c8bb..3797645a 100644 --- a/xxl-job-admin/src/main/resources/i18n/message_en.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_en.properties @@ -71,9 +71,9 @@ login_remember_me=Remember Me login_username_placeholder=Please enter username login_password_placeholder=Please enter password login_username_empty=Please enter username -login_username_lt_5=Username length should not be less than 5 +login_username_lt_4=Username length should not be less than 4 login_password_empty=Please enter password -login_password_lt_5=Password length should not be less than 5 +login_password_lt_4=Password length should not be less than 4 login_success=Login success login_fail=Login fail login_param_empty=Username or password is empty diff --git a/xxl-job-admin/src/main/resources/static/js/login.1.js b/xxl-job-admin/src/main/resources/static/js/login.1.js index 574d194a..37eba6b5 100644 --- a/xxl-job-admin/src/main/resources/static/js/login.1.js +++ b/xxl-job-admin/src/main/resources/static/js/login.1.js @@ -15,23 +15,23 @@ $(function(){ rules : { userName : { required : true , - minlength: 5, + minlength: 4, maxlength: 18 }, password : { required : true , - minlength: 5, + minlength: 4, maxlength: 18 } }, messages : { userName : { required : I18n.login_username_empty, - minlength : I18n.login_username_lt_5 + minlength : I18n.login_username_lt_4 }, password : { required : I18n.login_password_empty , - minlength : I18n.login_password_lt_5 + minlength : I18n.login_password_lt_4 /*,maxlength:"登录密码不应超过18位"*/ } }, diff --git a/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl b/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl index d37b5e9c..015368b7 100644 --- a/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl +++ b/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl @@ -137,8 +137,8 @@
  • active" >${I18n.job_dashboard_name}
  • active" >${I18n.jobinfo_name}
  • active" >${I18n.joblog_name}
    • -
  • active" >${I18n.jobgroup_name}
    • <#if Request["XXL_JOB_LOGIN_IDENTITY"].role == 1> +
  • active" >${I18n.jobgroup_name}
  • active" >${I18n.user_manage}
  • active" >${I18n.job_help}
    • diff --git a/xxl-job-admin/src/main/resources/templates/login.ftl b/xxl-job-admin/src/main/resources/templates/login.ftl index 2179d28e..785ac7c4 100644 --- a/xxl-job-admin/src/main/resources/templates/login.ftl +++ b/xxl-job-admin/src/main/resources/templates/login.ftl @@ -15,11 +15,11 @@

    ${I18n.admin_name}

    - +
    - +
    diff --git a/xxl-job-admin/src/main/resources/templates/user/user.index.ftl b/xxl-job-admin/src/main/resources/templates/user/user.index.ftl index 9c9b85c4..b31d3387 100644 --- a/xxl-job-admin/src/main/resources/templates/user/user.index.ftl +++ b/xxl-job-admin/src/main/resources/templates/user/user.index.ftl @@ -79,11 +79,11 @@
    -
    +
    -
    +
    @@ -129,11 +129,11 @@
    -
    +
    -
    +