From b4300949d053253d01d88844093964e42fb2ac2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=AF=E5=8D=97=E9=91=AB?= Date: Fri, 17 Aug 2018 14:25:19 +0800 Subject: [PATCH 01/10] add search system Enviroment property, enable pass env params in docker. --- .../main/resources/spring/applicationcontext-xxl-job-admin.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/xxl-job-admin/src/main/resources/spring/applicationcontext-xxl-job-admin.xml b/xxl-job-admin/src/main/resources/spring/applicationcontext-xxl-job-admin.xml index 79da65b3..bd443929 100644 --- a/xxl-job-admin/src/main/resources/spring/applicationcontext-xxl-job-admin.xml +++ b/xxl-job-admin/src/main/resources/spring/applicationcontext-xxl-job-admin.xml @@ -15,6 +15,7 @@ classpath*:xxl-job-admin.properties + From 5421e308dfd49bbf09e63d221085a5dbb181c91b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=AF=E5=8D=97=E9=91=AB?= Date: Fri, 17 Aug 2018 15:42:26 +0800 Subject: [PATCH 04/10] change it to ${xxl.job.db.url} --- .../main/resources/spring/applicationcontext-xxl-job-admin.xml | 1 - xxl-job-admin/src/main/resources/xxl-job-admin.properties | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xxl-job-admin/src/main/resources/spring/applicationcontext-xxl-job-admin.xml b/xxl-job-admin/src/main/resources/spring/applicationcontext-xxl-job-admin.xml index bd443929..79da65b3 100644 --- a/xxl-job-admin/src/main/resources/spring/applicationcontext-xxl-job-admin.xml +++ b/xxl-job-admin/src/main/resources/spring/applicationcontext-xxl-job-admin.xml @@ -15,7 +15,6 @@ classpath*:xxl-job-admin.properties - diff --git a/xxl-job-admin/src/main/resources/xxl-job-admin.properties b/xxl-job-admin/src/main/resources/xxl-job-admin.properties index ac5576f7..2d40b35b 100644 --- a/xxl-job-admin/src/main/resources/xxl-job-admin.properties +++ b/xxl-job-admin/src/main/resources/xxl-job-admin.properties @@ -1,6 +1,7 @@ ### xxl-job db (use & replace & in xml) xxl.job.db.driverClass=com.mysql.jdbc.Driver -xxl.job.db.url=jdbc:mysql://localhost:3306/xxl-job?useUnicode=true&characterEncoding=UTF-8 +#xxl.job.db.url=jdbc:mysql://localhost:3306/xxl-job?useUnicode=true&characterEncoding=UTF-8 +xxl.job.db.url=${xxl.job.db.url} xxl.job.db.user=root xxl.job.db.password=root_pwd From 491f8994486a163ad1fe17ce6fed6e45dadd56bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=AF=E5=8D=97=E9=91=AB?= Date: Fri, 17 Aug 2018 15:52:41 +0800 Subject: [PATCH 05/10] xxl.job.db.url=${xxl-job-db-url} --- xxl-job-admin/src/main/resources/xxl-job-admin.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xxl-job-admin/src/main/resources/xxl-job-admin.properties b/xxl-job-admin/src/main/resources/xxl-job-admin.properties index 2d40b35b..f3a0aa65 100644 --- a/xxl-job-admin/src/main/resources/xxl-job-admin.properties +++ b/xxl-job-admin/src/main/resources/xxl-job-admin.properties @@ -1,7 +1,7 @@ ### xxl-job db (use & replace & in xml) xxl.job.db.driverClass=com.mysql.jdbc.Driver #xxl.job.db.url=jdbc:mysql://localhost:3306/xxl-job?useUnicode=true&characterEncoding=UTF-8 -xxl.job.db.url=${xxl.job.db.url} +xxl.job.db.url=${xxl-job-db-url} xxl.job.db.user=root xxl.job.db.password=root_pwd From b8138ee3bee1f8a05aaa4628b795d1b12c589546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=AF=E5=8D=97=E9=91=AB?= Date: Fri, 17 Aug 2018 16:02:23 +0800 Subject: [PATCH 06/10] change it to env parameters --- .../main/resources/xxl-job-admin.properties | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/xxl-job-admin/src/main/resources/xxl-job-admin.properties b/xxl-job-admin/src/main/resources/xxl-job-admin.properties index f3a0aa65..74894409 100644 --- a/xxl-job-admin/src/main/resources/xxl-job-admin.properties +++ b/xxl-job-admin/src/main/resources/xxl-job-admin.properties @@ -2,20 +2,20 @@ xxl.job.db.driverClass=com.mysql.jdbc.Driver #xxl.job.db.url=jdbc:mysql://localhost:3306/xxl-job?useUnicode=true&characterEncoding=UTF-8 xxl.job.db.url=${xxl-job-db-url} -xxl.job.db.user=root -xxl.job.db.password=root_pwd +xxl.job.db.user=${xxl-job-db-user} +xxl.job.db.password=${xxl-job-db-password} ### xxl-job email -xxl.job.mail.host=smtp.163.com -xxl.job.mail.port=25 -xxl.job.mail.username=ovono802302@163.com -xxl.job.mail.password=asdfzxcv -xxl.job.mail.sendFrom=ovono802302@163.com -xxl.job.mail.sendNick=《任务调度平台XXL-JOB》 +xxl.job.mail.host=${xxl-job-mail-host} +xxl.job.mail.port=${xxl-job-mail-port} +xxl.job.mail.username=${xxl-job-mail-username} +xxl.job.mail.password=${xxl-job-mail-password} +xxl.job.mail.sendFrom=${xxl-job-mail-sendFrom} +xxl.job.mail.sendNick=${xxl-job-mail-sendNick} ### xxl-job login -xxl.job.login.username=admin -xxl.job.login.password=123456 +xxl.job.login.username=${xxl-job-login-username} +xxl.job.login.password=${xxl-job-login-password} ### xxl-job, access token -xxl.job.accessToken= \ No newline at end of file +xxl.job.accessToken=${xxl-job-accessToken} \ No newline at end of file From 22f5e9cd37336fefd497f6f23ad0830bab56eba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=AF=E5=8D=97=E9=91=AB?= Date: Fri, 17 Aug 2018 17:04:50 +0800 Subject: [PATCH 07/10] add new file --- .../xxl/job/admin/controller/UrlFilter.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UrlFilter.java diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UrlFilter.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UrlFilter.java new file mode 100644 index 00000000..77654581 --- /dev/null +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UrlFilter.java @@ -0,0 +1,38 @@ +import org.springframework.stereotype.Component; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +public class UrlFilter implements Filter { + @Value("${application.pre.url}") + private String preUrl; + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + + } + + @Override + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { + HttpServletResponse response = (HttpServletResponse) servletResponse; + HttpServletRequest request = (HttpServletRequest) servletRequest; + String requestURI = request.getRequestURI(); + String[] split = requestURI.split("/"); + if (split != null && split.length > 1 && split[1].equals(preUrl)) { + request.getRequestDispatcher(requestURI.substring(preUrl.length() + 1, requestURI.length())).forward(request, response); + } else { + filterChain.doFilter(request, response); + } + } + + @Override + public void destroy() { + + } +} \ No newline at end of file From 94c7f98399a13a6ca89044356af3495916bad938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=AF=E5=8D=97=E9=91=AB?= Date: Fri, 17 Aug 2018 17:19:35 +0800 Subject: [PATCH 08/10] remote filter files --- .../xxl/job/admin/controller/UrlFilter.java | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UrlFilter.java diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UrlFilter.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UrlFilter.java deleted file mode 100644 index 77654581..00000000 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UrlFilter.java +++ /dev/null @@ -1,38 +0,0 @@ -import org.springframework.stereotype.Component; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -public class UrlFilter implements Filter { - @Value("${application.pre.url}") - private String preUrl; - - @Override - public void init(FilterConfig filterConfig) throws ServletException { - - } - - @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - HttpServletResponse response = (HttpServletResponse) servletResponse; - HttpServletRequest request = (HttpServletRequest) servletRequest; - String requestURI = request.getRequestURI(); - String[] split = requestURI.split("/"); - if (split != null && split.length > 1 && split[1].equals(preUrl)) { - request.getRequestDispatcher(requestURI.substring(preUrl.length() + 1, requestURI.length())).forward(request, response); - } else { - filterChain.doFilter(request, response); - } - } - - @Override - public void destroy() { - - } -} \ No newline at end of file From 564c07f6eefdfbc5eb1758d6b294ad3a917d8b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=AF=E5=8D=97=E9=91=AB?= Date: Fri, 17 Aug 2018 18:01:41 +0800 Subject: [PATCH 09/10] add login entity --- .../job/admin/controller/IndexController.java | 9 +++++--- .../com/xxl/job/admin/core/LoginEntity.java | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 xxl-job-admin/src/main/java/com/xxl/job/admin/core/LoginEntity.java diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java index c63f9cf7..f7346bf0 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java @@ -2,6 +2,7 @@ package com.xxl.job.admin.controller; import com.xxl.job.admin.controller.annotation.PermessionLimit; import com.xxl.job.admin.controller.interceptor.PermissionInterceptor; +import com.xxl.job.admin.core.LoginEntity; import com.xxl.job.admin.core.util.PropertiesUtil; import com.xxl.job.admin.service.XxlJobService; import com.xxl.job.core.biz.model.ReturnT; @@ -26,6 +27,8 @@ public class IndexController { @Resource private XxlJobService xxlJobService; + @Resource + private LoginEntity loginEntity; @RequestMapping("/") public String index(Model model) { @@ -58,15 +61,15 @@ public class IndexController { public ReturnT loginDo(HttpServletRequest request, HttpServletResponse response, String userName, String password, String ifRemember){ if (!PermissionInterceptor.ifLogin(request)) { if (StringUtils.isNotBlank(userName) && StringUtils.isNotBlank(password) - && PropertiesUtil.getString("xxl.job.login.username").equals(userName) - && PropertiesUtil.getString("xxl.job.login.password").equals(password)) { + && loginEntity.getLoginUserName().equals(userName) + && loginEntity.getLoginPassword().equals(password)) { boolean ifRem = false; if (StringUtils.isNotBlank(ifRemember) && "on".equals(ifRemember)) { ifRem = true; } PermissionInterceptor.login(response, ifRem); } else { - return new ReturnT(500, "账号或密码错误"); + return new ReturnT(500, "账号或密码错误, Inner User: "+loginEntity.getLoginUserName() ); } } return ReturnT.SUCCESS; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/LoginEntity.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/LoginEntity.java new file mode 100644 index 00000000..a88cadd8 --- /dev/null +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/LoginEntity.java @@ -0,0 +1,23 @@ +package com.xxl.job.admin.core; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +/** + * Created by Rock on 2018-08-17. + */ +@Component +public class LoginEntity { + + + @Value("${xxl.job.login.username}") + private String loginUserName; + @Value("${xxl.job.login.password}") + private String loginPassword; + + public String getLoginUserName() { return this.loginUserName;} + + public String getLoginPassword() { return this.loginPassword;} + + +} From e1c6e9f922cc5c20f619783ac955ceb5134e774c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=AF=E5=8D=97=E9=91=AB?= Date: Fri, 17 Aug 2018 18:10:05 +0800 Subject: [PATCH 10/10] add login entity --- .../com/xxl/job/admin/{core => controller}/LoginEntity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename xxl-job-admin/src/main/java/com/xxl/job/admin/{core => controller}/LoginEntity.java (92%) diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/LoginEntity.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/LoginEntity.java similarity index 92% rename from xxl-job-admin/src/main/java/com/xxl/job/admin/core/LoginEntity.java rename to xxl-job-admin/src/main/java/com/xxl/job/admin/controller/LoginEntity.java index a88cadd8..05a3d4c3 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/LoginEntity.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/LoginEntity.java @@ -1,8 +1,10 @@ -package com.xxl.job.admin.core; +package com.xxl.job.admin.controller; import org.springframework.beans.factory.annotation.Value; + import org.springframework.stereotype.Component; + /** * Created by Rock on 2018-08-17. */