From 0ae4d281f351adf19bb7e774a7a8e63e47db2070 Mon Sep 17 00:00:00 2001 From: "xinyu.huang" Date: Tue, 12 Mar 2019 15:19:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9-=E7=94=A8=E6=88=B7=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=A1=B5=E9=9D=A2=E6=96=87=E5=AD=97=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.properties | 4 ++-- .../main/resources/i18n/message.properties | 1 + .../main/resources/i18n/message_en.properties | 1 + .../templates/common/common.macro.ftl | 2 +- .../templates/jobuser/jobuser.index.ftl | 22 ++----------------- 5 files changed, 7 insertions(+), 23 deletions(-) diff --git a/xxl-job-admin/src/main/resources/application.properties b/xxl-job-admin/src/main/resources/application.properties index 2890c05d..d0a99b89 100644 --- a/xxl-job-admin/src/main/resources/application.properties +++ b/xxl-job-admin/src/main/resources/application.properties @@ -17,9 +17,9 @@ spring.freemarker.settings.number_format=0.########## mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml ### xxl-job, datasource -spring.datasource.url=jdbc:mysql://127.0.01:3306/xxl-job?Unicode=true&characterEncoding=UTF-8 +spring.datasource.url=jdbc:mysql://wechat.yunhaiyouxi.com:3306/xxl-job?Unicode=true&characterEncoding=UTF-8 spring.datasource.username=root -spring.datasource.password=root +spring.datasource.password=yunhai2018nb spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.datasource.type=org.apache.tomcat.jdbc.pool.DataSource diff --git a/xxl-job-admin/src/main/resources/i18n/message.properties b/xxl-job-admin/src/main/resources/i18n/message.properties index e7312cb0..eba29930 100644 --- a/xxl-job-admin/src/main/resources/i18n/message.properties +++ b/xxl-job-admin/src/main/resources/i18n/message.properties @@ -100,6 +100,7 @@ job_dashboard_rate_report=成功比例图 ## job user user_manager=用户管理 user_list=用户列表 +user_update=编辑用戶 user_add=添加用戶 user_login_username=用戶账号 user_login_password=用戶密码 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 48c565dc..0ad1e1b8 100644 --- a/xxl-job-admin/src/main/resources/i18n/message_en.properties +++ b/xxl-job-admin/src/main/resources/i18n/message_en.properties @@ -100,6 +100,7 @@ job_dashboard_rate_report=Percentage distribution ## job user user_manager=User Manager user_list=User List +user_update=Update user user_add=Add User user_login_username=Login Username user_login_password=Password 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 2fa9cca1..c1337b44 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 @@ -98,7 +98,7 @@