diff --git a/common/bin/deploy.bat b/common/bin/deploy.bat index 82292ece..357f797f 100644 --- a/common/bin/deploy.bat +++ b/common/bin/deploy.bat @@ -1,18 +1,19 @@ -@echo off -rem /** -rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. -rem * -rem * Author: ThinkGem@163.com -rem */ -echo. -echo [信息] 部署工程版本到Nexus服务器。 -echo. -pause -echo. - -cd %~dp0 - -cd ../ -call mvn clean deploy -Dmaven.test.skip=true -Pdeploy - +@echo off +rem /** +rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [信息] 部署工程版本到Nexus服务器。 +echo. +pause +echo. + +%~d0 +cd %~dp0 + +cd ../ +call mvn clean deploy -Dmaven.test.skip=true -Pdeploy + pause \ No newline at end of file diff --git a/common/bin/javadoc.bat b/common/bin/javadoc.bat index 7d0ab32f..2a5ea0c5 100644 --- a/common/bin/javadoc.bat +++ b/common/bin/javadoc.bat @@ -1,18 +1,19 @@ -@echo off -rem /** -rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. -rem * -rem * Author: ThinkGem@163.com -rem */ -echo. -echo [信息] 编译工程Javadoc，生成jar包文件。 -echo. -pause -echo. - -cd %~dp0 - -cd ../ -call mvn clean javadoc:jar - +@echo off +rem /** +rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [信息] 编译工程Javadoc，生成jar包文件。 +echo. +pause +echo. + +%~d0 +cd %~dp0 + +cd ../ +call mvn clean javadoc:jar + pause \ No newline at end of file diff --git a/common/bin/package.bat b/common/bin/package.bat index 8353abda..db5ed5da 100644 --- a/common/bin/package.bat +++ b/common/bin/package.bat @@ -1,18 +1,19 @@ -@echo off -rem /** -rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. -rem * -rem * Author: ThinkGem@163.com -rem */ -echo. -echo [信息] 打包安装工程，生成jar包文件。 -echo. -pause -echo. - -cd %~dp0 - -cd ../ -call mvn clean install -Dmaven.test.skip=true -Ppackage - +@echo off +rem /** +rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [信息] 打包安装工程，生成jar包文件。 +echo. +pause +echo. + +%~d0 +cd %~dp0 + +cd ../ +call mvn clean install -Dmaven.test.skip=true -Ppackage + pause \ No newline at end of file diff --git a/common/pom.xml b/common/pom.xml index 1ce8a1ae..9017f113 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -37,7 +37,6 @@ commons-codec commons-codec - ${commons-codec.version} commons-fileupload @@ -47,59 +46,52 @@ commons-beanutils commons-beanutils - ${commons-beanutils.version} com.esotericsoftware kryo - ${esotericsoftware-kryo.version} + ${esotericsoftware.kryo.version} org.codeartisans org.json - ${codeartisans-json.version} + ${codeartisans.json.version} com.fasterxml.jackson.core jackson-core - ${fasterxml-jackson.version} com.fasterxml.jackson.core jackson-databind - ${fasterxml-jackson.version} com.fasterxml.jackson.dataformat jackson-dataformat-xml - ${fasterxml-jackson.version} dom4j dom4j - ${dom4j.version} jaxen jaxen - ${jaxen.version} org.yaml snakeyaml - ${snakeyaml.version} @@ -172,13 +164,7 @@ org.apache.httpcomponents httpclient - 4.5.3 - @@ -242,31 +228,26 @@ org.slf4j slf4j-api - ${slf4j.version} org.slf4j jcl-over-slf4j - ${slf4j.version} org.slf4j jul-to-slf4j - ${slf4j.version} org.slf4j log4j-over-slf4j - ${slf4j.version} ch.qos.logback logback-classic - ${logback.version} @@ -274,31 +255,26 @@ org.springframework spring-core - ${spring.version} org.springframework spring-web - ${spring.version} org.hibernate hibernate-validator - ${validator.version} junit junit - ${junit.version} org.springframework spring-test - ${spring.version} diff --git a/modules/core/bin/deploy.bat b/modules/core/bin/deploy.bat index 82292ece..357f797f 100644 --- a/modules/core/bin/deploy.bat +++ b/modules/core/bin/deploy.bat @@ -1,18 +1,19 @@ -@echo off -rem /** -rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. -rem * -rem * Author: ThinkGem@163.com -rem */ -echo. -echo [信息] 部署工程版本到Nexus服务器。 -echo. -pause -echo. - -cd %~dp0 - -cd ../ -call mvn clean deploy -Dmaven.test.skip=true -Pdeploy - +@echo off +rem /** +rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [信息] 部署工程版本到Nexus服务器。 +echo. +pause +echo. + +%~d0 +cd %~dp0 + +cd ../ +call mvn clean deploy -Dmaven.test.skip=true -Pdeploy + pause \ No newline at end of file diff --git a/modules/core/bin/javadoc.bat b/modules/core/bin/javadoc.bat index 7d0ab32f..2a5ea0c5 100644 --- a/modules/core/bin/javadoc.bat +++ b/modules/core/bin/javadoc.bat @@ -1,18 +1,19 @@ -@echo off -rem /** -rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. -rem * -rem * Author: ThinkGem@163.com -rem */ -echo. -echo [信息] 编译工程Javadoc，生成jar包文件。 -echo. -pause -echo. - -cd %~dp0 - -cd ../ -call mvn clean javadoc:jar - +@echo off +rem /** +rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [信息] 编译工程Javadoc，生成jar包文件。 +echo. +pause +echo. + +%~d0 +cd %~dp0 + +cd ../ +call mvn clean javadoc:jar + pause \ No newline at end of file diff --git a/modules/core/bin/package.bat b/modules/core/bin/package.bat index 8353abda..db5ed5da 100644 --- a/modules/core/bin/package.bat +++ b/modules/core/bin/package.bat @@ -1,18 +1,19 @@ -@echo off -rem /** -rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. -rem * -rem * Author: ThinkGem@163.com -rem */ -echo. -echo [信息] 打包安装工程，生成jar包文件。 -echo. -pause -echo. - -cd %~dp0 - -cd ../ -call mvn clean install -Dmaven.test.skip=true -Ppackage - +@echo off +rem /** +rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [信息] 打包安装工程，生成jar包文件。 +echo. +pause +echo. + +%~d0 +cd %~dp0 + +cd ../ +call mvn clean install -Dmaven.test.skip=true -Ppackage + pause \ No newline at end of file diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/LogoutFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/LogoutFilter.java index 541af705..aa9dd002 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/LogoutFilter.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/LogoutFilter.java @@ -1,71 +1,72 @@ -/** - * Copyright (c) 2013-Now http://jeesite.com All rights reserved. - */ -package com.jeesite.common.shiro.filter; - -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.session.SessionException; -import org.apache.shiro.subject.Subject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.jeesite.common.config.Global; -import com.jeesite.common.web.http.ServletUtils; -import com.jeesite.modules.sys.utils.LogUtils; - -/** - * 鐧诲嚭杩囨护鍣 - * @author ThinkGem - * @version 2017-03-22 - */ -public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter { - - private static final Logger log = LoggerFactory.getLogger(LogoutFilter.class); - - @Override - protected boolean preHandle(ServletRequest request, ServletResponse response) throws Exception { - try{ - Subject subject = getSubject(request, response); - String redirectUrl = getRedirectUrl(request, response, subject); - //try/catch added for SHIRO-298: - try { - // 璁板綍鐢ㄦ埛閫鍑烘棩蹇 - LogUtils.saveLog(ServletUtils.getRequest(), "绯荤粺閫鍑"); - // 閫鍑虹櫥褰 - subject.logout(); - } catch (SessionException ise) { - log.debug("Encountered session exception during logout. This can generally safely be ignored.", ise); - } - - // 濡傛灉鏄疉jax璇锋眰锛岃繑鍥濲son瀛楃涓层 - if (ServletUtils.isAjaxRequest((HttpServletRequest)request)){ - ServletUtils.renderResult((HttpServletResponse)response, Global.TRUE, "閫鍑烘垚鍔燂紒"); - return false; - } - - issueRedirect(request, response, redirectUrl); - }catch(Exception e){ - log.debug("Encountered session exception during logout. This can generally safely be ignored.", e); - } - return false; - } - - /** - * 鐧诲嚭璺宠浆URL - */ - @Override - protected String getRedirectUrl(ServletRequest request, ServletResponse response, Subject subject) { - String url = Global.getProperty("shiro.logoutUrl"); - // 濡傛灉閰嶇疆浜嗙櫥鍑轰箣鍚庤烦杞殑url锛屽苟涓攗rl涓嶈兘涓 ${adminPath}/logout 鍚﹀垯浼氶犳垚姝诲惊鐜 - if (StringUtils.isNoneBlank(url) && !url.equals((Global.getAdminPath()+"/logout"))){ - return url; - } - return super.getRedirectUrl(request, response, subject); - } - -} +/** + * Copyright (c) 2013-Now http://jeesite.com All rights reserved. + */ +package com.jeesite.common.shiro.filter; + +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.session.SessionException; +import org.apache.shiro.subject.Subject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.jeesite.common.config.Global; +import com.jeesite.common.web.http.ServletUtils; +import com.jeesite.modules.sys.utils.LogUtils; + +/** + * 鐧诲嚭杩囨护鍣 + * @author ThinkGem + * @version 2017-03-22 + */ +public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter { + + private static final Logger log = LoggerFactory.getLogger(LogoutFilter.class); + + @Override + protected boolean preHandle(ServletRequest request, ServletResponse response) throws Exception { + return super.preHandle(request, response); +// try{ +// Subject subject = getSubject(request, response); +// String redirectUrl = getRedirectUrl(request, response, subject); +// //try/catch added for SHIRO-298: +// try { +// // 璁板綍鐢ㄦ埛閫鍑烘棩蹇 +// LogUtils.saveLog(ServletUtils.getRequest(), "绯荤粺閫鍑"); +// // 閫鍑虹櫥褰 +// subject.logout(); +// } catch (SessionException ise) { +// log.debug("Encountered session exception during logout. This can generally safely be ignored.", ise); +// } +// +// // 濡傛灉鏄疉jax璇锋眰锛岃繑鍥濲son瀛楃涓层 +// if (ServletUtils.isAjaxRequest((HttpServletRequest)request)){ +// ServletUtils.renderResult((HttpServletResponse)response, Global.TRUE, "閫鍑烘垚鍔燂紒"); +// return false; +// } +// +// issueRedirect(request, response, redirectUrl); +// }catch(Exception e){ +// log.debug("Encountered session exception during logout. This can generally safely be ignored.", e); +// } +// return false; + } + + /** + * 鐧诲嚭璺宠浆URL + */ + @Override + protected String getRedirectUrl(ServletRequest request, ServletResponse response, Subject subject) { + return super.getRedirectUrl(request, response, subject); +// String url = Global.getProperty("shiro.logoutUrl"); +// // 濡傛灉閰嶇疆浜嗙櫥鍑轰箣鍚庤烦杞殑url锛屽苟涓攗rl涓嶈兘涓 ${adminPath}/logout 鍚﹀垯浼氶犳垚姝诲惊鐜 +// if (StringUtils.isNoneBlank(url) && !url.equals((Global.getAdminPath()+"/logout"))){ +// return url; +// } + } + +} diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/PermissionsAuthorizationFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/PermissionsAuthorizationFilter.java index 511ec267..a12678f5 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/PermissionsAuthorizationFilter.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/PermissionsAuthorizationFilter.java @@ -1,81 +1,81 @@ -/** - * Copyright (c) 2013-Now http://jeesite.com All rights reserved. - */ -package com.jeesite.common.shiro.filter; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; - -import org.apache.shiro.SecurityUtils; -import org.apache.shiro.authz.UnauthorizedException; -import org.apache.shiro.subject.Subject; -import org.apache.shiro.web.util.WebUtils; - -import com.jeesite.common.config.Global; -import com.jeesite.common.web.http.ServletUtils; -import com.jeesite.common.web.http.wrapper.GetHttpServletRequestWrapper; - -/** - * 鏉冮檺瀛楃涓茶繃婊ゅ櫒 - * @author ThinkGem - * @version 2017-03-22 - */ -public class PermissionsAuthorizationFilter extends org.apache.shiro.web.filter.authz.PermissionsAuthorizationFilter { - - @Override - protected void redirectToLogin(ServletRequest request, ServletResponse response) throws IOException { - PermissionsAuthorizationFilter.redirectToDefaultPath(request, response); - } - - @Override - protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws IOException { - return PermissionsAuthorizationFilter.redirectTo403Page(request, response); - } - - /** - * 鏃犺闂潈闄愭椂锛岃烦杞埌403椤甸潰 - * @param request - * @param response - * @return - * @throws IOException - * @author ThinkGem - */ - public static boolean redirectTo403Page(ServletRequest request, ServletResponse response) throws IOException { - Subject subject = SecurityUtils.getSubject(); - // If the subject isn't identified, redirect to login URL - if (subject.getPrincipal() == null) { - redirectToDefaultPath(request, response); - } else { - try { - // 濡傛灉璁块棶鐨勬槸鏈巿鏉冮〉闈紝鍒欑洿鎺ヨ浆鍒403椤甸潰锛2016-11-3锛 - request.getRequestDispatcher("/error/403").forward(request, response); - } catch (ServletException e) { - throw new UnauthorizedException(e); - } - } - return false; - } - - /** - * 璺宠浆鐧诲綍椤垫椂锛岃烦杞埌榛樿棣栭〉 - */ - public static void redirectToDefaultPath(ServletRequest request, ServletResponse response) throws IOException { - // AJAX涓嶆敮鎸丷edirect鏀圭敤Forward - String loginUrl = Global.getProperty("defaultPath"); - if (ServletUtils.isAjaxRequest((HttpServletRequest) request)) { - try { - request.getRequestDispatcher(loginUrl).forward( - new GetHttpServletRequestWrapper(request), response); - } catch (ServletException e) { - e.printStackTrace(); - } - }else{ - WebUtils.issueRedirect(request, response, loginUrl); - } - } - -} +/** + * Copyright (c) 2013-Now http://jeesite.com All rights reserved. + */ +package com.jeesite.common.shiro.filter; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; + +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.UnauthorizedException; +import org.apache.shiro.subject.Subject; +import org.apache.shiro.web.util.WebUtils; + +import com.jeesite.common.config.Global; +import com.jeesite.common.web.http.ServletUtils; +import com.jeesite.common.web.http.wrapper.GetHttpServletRequestWrapper; + +/** + * 鏉冮檺瀛楃涓茶繃婊ゅ櫒 + * @author ThinkGem + * @version 2017-03-22 + */ +public class PermissionsAuthorizationFilter extends org.apache.shiro.web.filter.authz.PermissionsAuthorizationFilter { + + @Override + protected void redirectToLogin(ServletRequest request, ServletResponse response) throws IOException { + PermissionsAuthorizationFilter.redirectToDefaultPath(request, response); + } + + @Override + protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws IOException { + return PermissionsAuthorizationFilter.redirectTo403Page(request, response); + } + + /** + * 鏃犺闂潈闄愭椂锛岃烦杞埌403椤甸潰 + * @param request + * @param response + * @return + * @throws IOException + * @author ThinkGem + */ + public static boolean redirectTo403Page(ServletRequest request, ServletResponse response) throws IOException { + Subject subject = SecurityUtils.getSubject(); + // If the subject isn't identified, redirect to login URL + if (subject.getPrincipal() == null) { + redirectToDefaultPath(request, response); + } else { + try { + // 濡傛灉璁块棶鐨勬槸鏈巿鏉冮〉闈紝鍒欑洿鎺ヨ浆鍒403椤甸潰锛2016-11-3锛 + request.getRequestDispatcher("/error/403").forward(request, response); + } catch (ServletException e) { + throw new UnauthorizedException(e); + } + } + return false; + } + + /** + * 璺宠浆鐧诲綍椤垫椂锛岃烦杞埌榛樿棣栭〉 + */ + public static void redirectToDefaultPath(ServletRequest request, ServletResponse response) throws IOException { + // AJAX涓嶆敮鎸丷edirect鏀圭敤Forward + String loginUrl = Global.getProperty("defaultPath"); + if (ServletUtils.isAjaxRequest((HttpServletRequest) request)) { + try { + request.getRequestDispatcher(loginUrl).forward( + new GetHttpServletRequestWrapper(request), response); + } catch (ServletException e) { + e.printStackTrace(); + } + }else{ + WebUtils.issueRedirect(request, response, loginUrl); + } + } + +} diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/RolesAuthorizationFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/RolesAuthorizationFilter.java index fca4f036..1d136ba9 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/RolesAuthorizationFilter.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/RolesAuthorizationFilter.java @@ -1,28 +1,30 @@ -/** - * Copyright (c) 2013-Now http://jeesite.com All rights reserved. - */ -package com.jeesite.common.shiro.filter; - -import java.io.IOException; - -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; - -/** - * 瑙掕壊鏉冮檺杩囨护鍣 - * @author ThinkGem - * @version 2017-03-22 - */ -public class RolesAuthorizationFilter extends org.apache.shiro.web.filter.authz.RolesAuthorizationFilter { - - @Override - protected void redirectToLogin(ServletRequest request, ServletResponse response) throws IOException { - PermissionsAuthorizationFilter.redirectToDefaultPath(request, response); - } - - @Override - protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws IOException { - return PermissionsAuthorizationFilter.redirectTo403Page(request, response); - } - -} +/** + * Copyright (c) 2013-Now http://jeesite.com All rights reserved. + */ +package com.jeesite.common.shiro.filter; + +import java.io.IOException; + +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +/** + * 瑙掕壊鏉冮檺杩囨护鍣 + * @author ThinkGem + * @version 2017-03-22 + */ +public class RolesAuthorizationFilter extends org.apache.shiro.web.filter.authz.RolesAuthorizationFilter { + + @Override + protected void redirectToLogin(ServletRequest request, ServletResponse response) throws IOException { + super.redirectToLogin(request, response); +// PermissionsAuthorizationFilter.redirectToDefaultPath(request, response); + } + + @Override + protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws IOException { + return super.onAccessDenied(request, response); +// return PermissionsAuthorizationFilter.redirectTo403Page(request, response); + } + +} diff --git a/modules/core/src/main/java/com/jeesite/modules/db/InitCoreData.java b/modules/core/src/main/java/com/jeesite/modules/db/InitCoreData.java index 05014b5d..861fade2 100644 --- a/modules/core/src/main/java/com/jeesite/modules/db/InitCoreData.java +++ b/modules/core/src/main/java/com/jeesite/modules/db/InitCoreData.java @@ -49,7 +49,6 @@ import com.jeesite.modules.sys.service.UserService; * @author ThinkGem * @version 2017-10-22 */ -//@Commit public class InitCoreData extends BaseInitDataTests { @Override diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java index 1a243565..9f9cb57f 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java @@ -48,12 +48,12 @@ public class LoginController extends BaseController{ */ @RequestMapping(value = "login", method = RequestMethod.GET) public String login(HttpServletRequest request, HttpServletResponse response, Model model) { -// // 鍦板潃涓鏋滃寘鍚獼SESSIONID锛屽垯璺宠浆涓娆★紝鍘绘帀JSESSIONID淇℃伅銆 -// if (StringUtils.containsIgnoreCase(request.getRequestURI(), ";JSESSIONID=")){ -// String queryString = request.getQueryString(); -// queryString = queryString == null ? "" : "?" + queryString; -// return REDIRECT + adminPath + "/login" + queryString; -// } + // 鍦板潃涓鏋滃寘鍚獼SESSIONID锛屽垯璺宠浆涓娆★紝鍘绘帀JSESSIONID淇℃伅銆 + if (StringUtils.containsIgnoreCase(request.getRequestURI(), ";JSESSIONID=")){ + String queryString = request.getQueryString(); + queryString = queryString == null ? "" : "?" + queryString; + return REDIRECT + adminPath + "/login" + queryString; + } LoginInfo loginInfo = UserUtils.getLoginInfo(); @@ -196,12 +196,12 @@ public class LoginController extends BaseController{ */ @RequestMapping(value = "index") public String index(HttpServletRequest request, HttpServletResponse response, Model model) { -// // 鍦板潃涓鏋滃寘鍚獼SESSIONID锛屽垯璺宠浆涓娆★紝鍘绘帀JSESSIONID淇℃伅銆 -// if (StringUtils.containsIgnoreCase(request.getRequestURI(), ";JSESSIONID=")){ -// String queryString = request.getQueryString(); -// queryString = queryString == null ? "" : "?" + queryString; -// return REDIRECT + adminPath + "/index" + queryString; -// } + // 鍦板潃涓鏋滃寘鍚獼SESSIONID锛屽垯璺宠浆涓娆★紝鍘绘帀JSESSIONID淇℃伅銆 + if (StringUtils.containsIgnoreCase(request.getRequestURI(), ";JSESSIONID=")){ + String queryString = request.getQueryString(); + queryString = queryString == null ? "" : "?" + queryString; + return REDIRECT + adminPath + "/index" + queryString; + } // 楠岃瘉涓嬬敤鎴锋潈闄愶紝浠ヤ究璋冪敤doGetAuthorizationInfo鏂规硶锛屼繚瀛樺崟鐐圭櫥褰曠櫥鍑哄彞鏌 if (!SecurityUtils.getSubject().isPermitted("user")){ diff --git a/parent/bin/deploy.bat b/parent/bin/deploy.bat index 82292ece..357f797f 100644 --- a/parent/bin/deploy.bat +++ b/parent/bin/deploy.bat @@ -1,18 +1,19 @@ -@echo off -rem /** -rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. -rem * -rem * Author: ThinkGem@163.com -rem */ -echo. -echo [信息] 部署工程版本到Nexus服务器。 -echo. -pause -echo. - -cd %~dp0 - -cd ../ -call mvn clean deploy -Dmaven.test.skip=true -Pdeploy - +@echo off +rem /** +rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [信息] 部署工程版本到Nexus服务器。 +echo. +pause +echo. + +%~d0 +cd %~dp0 + +cd ../ +call mvn clean deploy -Dmaven.test.skip=true -Pdeploy + pause \ No newline at end of file diff --git a/parent/bin/package.bat b/parent/bin/package.bat index 8353abda..db5ed5da 100644 --- a/parent/bin/package.bat +++ b/parent/bin/package.bat @@ -1,18 +1,19 @@ -@echo off -rem /** -rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. -rem * -rem * Author: ThinkGem@163.com -rem */ -echo. -echo [信息] 打包安装工程，生成jar包文件。 -echo. -pause -echo. - -cd %~dp0 - -cd ../ -call mvn clean install -Dmaven.test.skip=true -Ppackage - +@echo off +rem /** +rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [信息] 打包安装工程，生成jar包文件。 +echo. +pause +echo. + +%~d0 +cd %~dp0 + +cd ../ +call mvn clean install -Dmaven.test.skip=true -Ppackage + pause \ No newline at end of file diff --git a/parent/pom.xml b/parent/pom.xml index c0c3039d..d5ef0dc6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + com.jeesite jeesite-parent 4.0-SNAPSHOT @@ -12,49 +12,36 @@ http://jeesite.com 2013-Now + + org.springframework.boot + spring-boot-starter-parent + 1.5.9.RELEASE + + 3.4 2.5 - 1.9 1.3.1 - 1.9.2 - 4.0.0 - 20130603 - 2.8.6 - 1.6.1 - 1.1.6 - 2.4 - 1.17 + 4.0.0 + 20130603 5.5.1 - 4.12 3.14 - 1.7.25 - 1.2.3 - 4.3.13.RELEASE - 1.7.4 - 3.1 3.4.5 1.3.1 1.1.3 1.4.0 2.7.11-SNAPSHOT - 2.6.11 2.0.4 - 5.2.4.Final - 2.9.0 - 2.5.2 2.2.3 - UTF-8 - UTF-8 1.7 - false - false + false + false @@ -64,7 +51,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -79,10 +65,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 - ${java.version} - ${java.version} true @@ -95,7 +78,6 @@ org.apache.maven.plugins maven-jar-plugin - 3.0.2 ${project.build.sourceEncoding} @@ -130,35 +112,30 @@ org.apache.maven.plugins maven-resources-plugin - 3.0.2 org.apache.maven.plugins maven-install-plugin - 2.5.2 org.apache.maven.plugins maven-clean-plugin - 3.0.0 org.apache.maven.plugins maven-antrun-plugin - 1.8 org.apache.maven.plugins maven-dependency-plugin - 3.0.2 @@ -171,12 +148,10 @@ org.apache.maven.plugins maven-war-plugin - 3.0.0 ${project.build.directory}/${project.artifactId} - ${project.artifactId} false @@ -188,10 +163,9 @@ org.apache.maven.plugins maven-eclipse-plugin - 2.9 - ${downloadSources} - ${downloadJavadocs} + ${eclipse-plugin-download-sources} + ${eclipse-plugin-download-javadocs} 2.0 6.0 @@ -212,7 +186,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.4 true @@ -270,47 +243,6 @@ - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - [2.10.4,) - - jar - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - [2.10,) - - - copy-dependencies - - - - - - - - - - - - diff --git a/web/bin/clean.bat b/web/bin/clean.bat index e8c5d7c7..fd357abd 100644 --- a/web/bin/clean.bat +++ b/web/bin/clean.bat @@ -1,18 +1,19 @@ -@echo off -rem /** -rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. -rem * -rem * Author: ThinkGem@163.com -rem */ -echo. -echo [信息] 清理生成路径。 -echo. -pause -echo. - -cd %~dp0 - -cd ../ -call mvn clean - +@echo off +rem /** +rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [信息] 清理生成路径。 +echo. +pause +echo. + +%~d0 +cd %~dp0 + +cd ../ +call mvn clean + pause \ No newline at end of file diff --git a/web/bin/cleanide.bat b/web/bin/cleanide.bat index df7a1864..eae74589 100644 --- a/web/bin/cleanide.bat +++ b/web/bin/cleanide.bat @@ -1,21 +1,22 @@ -@echo off -rem /** -rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. -rem * -rem * Author: ThinkGem@163.com -rem */ -echo. -echo [信息] 清理Eclipse工程文件。 -echo. -pause -echo. - -cd %~dp0 - -cd ../ -call mvn -Declipse.workspace=%cd% eclipse:clean eclipse:eclipse - -del .classpath -del .project - +@echo off +rem /** +rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [信息] 清理Eclipse工程文件。 +echo. +pause +echo. + +%~d0 +cd %~dp0 + +cd ../ +call mvn -Declipse.workspace=%cd% eclipse:clean eclipse:eclipse + +del .classpath +del .project + pause \ No newline at end of file diff --git a/web/bin/init-db.bat b/web/bin/init-db.bat index 87659478..7ff092ca 100644 --- a/web/bin/init-db.bat +++ b/web/bin/init-db.bat @@ -1,28 +1,28 @@ -@echo off -rem /** -rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. -rem * -rem * Author: ThinkGem@163.com -rem */ -echo. -echo [信息] 初始化数据库，请谨慎操作。 -echo. -pause -echo. -echo [信息] 此操作会清空您的现有数据表，并恢复初始状态。 -echo. -echo [信息] 确认继续吗？否则请关闭窗口。 -echo. -pause -echo. -echo [信息] 您真的确认继续吗？否则请关闭窗口。 -echo. -pause -echo. - -cd %~dp0 - -cd ../ -call mvn test -Dtest=com.jeesite.test.InitCoreData - +@echo off +rem /** +rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [信息] 初始化数据库，请谨慎操作。 +echo. +pause +echo. +echo [信息] 此操作会清空您的现有数据表，并恢复初始状态。 +echo. +echo [信息] 确认继续吗？否则请关闭窗口。 +echo. +pause +echo. +echo [信息] 您真的确认继续吗？否则请关闭窗口。 +echo. +pause +echo. + +cd %~dp0 + +cd ../ +call mvn test -Dtest=com.jeesite.test.InitCoreData + pause \ No newline at end of file diff --git a/web/bin/package.bat b/web/bin/package.bat index 5a8f1c90..03131d32 100644 --- a/web/bin/package.bat +++ b/web/bin/package.bat @@ -1,18 +1,19 @@ -@echo off -rem /** -rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. -rem * -rem * Author: ThinkGem@163.com -rem */ -echo. -echo [信息] 打包Web工程，生成war包文件。 -echo. -pause -echo. - -cd %~dp0 - -cd ../ -call mvn clean package -Dmaven.test.skip=true -Ppackage -U - +@echo off +rem /** +rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +rem * +rem * Author: ThinkGem@163.com +rem */ +echo. +echo [信息] 打包Web工程，生成war包文件。 +echo. +pause +echo. + +%~d0 +cd %~dp0 + +cd ../ +call mvn clean package -Dmaven.test.skip=true -Ppackage -U + pause \ No newline at end of file diff --git a/web/bin/run-jetty.bat b/web/bin/run-jetty.bat index 53f6b355..af57e678 100644 --- a/web/bin/run-jetty.bat +++ b/web/bin/run-jetty.bat @@ -1,34 +1,34 @@ -@echo off -rem /** -rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. -rem * -rem * Author: ThinkGem@163.com -rem */ -title %cd% -echo. -echo [信息] 使用Jetty插件运行Web工程。 -echo. -rem pause -rem echo. - -cd %~dp0 -cd .. -set currPath=%cd% - -set MAVEN_OPTS=%MAVEN_OPTS% -Xms256m -Xmx512m -XX:PermSize=128m -XX:MaxPermSize=256m - -if exist "../parent/pom.xml" ( - cd ../parent - call mvn clean install -Dmaven.test.skip=true -) - -if exist "../modules/pom.xml" ( - cd ../modules - call mvn clean install -Dmaven.test.skip=true -) - -cd %currPath% -call mvn jetty:run -D maven.javadoc.skip=true -U - -cd bin +@echo off +rem /** +rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. +rem * +rem * Author: ThinkGem@163.com +rem */ +title %cd% +echo. +echo [信息] 使用Jetty插件运行Web工程。 +echo. +rem pause +rem echo. + +cd %~dp0 +cd .. +set currPath=%cd% + +set MAVEN_OPTS=%MAVEN_OPTS% -Xms256m -Xmx512m -XX:PermSize=128m -XX:MaxPermSize=256m + +if exist "../parent/pom.xml" ( + cd ../parent + call mvn clean install -Dmaven.test.skip=true +) + +if exist "../modules/pom.xml" ( + cd ../modules + call mvn clean install -Dmaven.test.skip=true +) + +cd %currPath% +call mvn jetty:run -D maven.javadoc.skip=true -U + +cd bin pause \ No newline at end of file diff --git a/web/bin/run-tomcat7.bat b/web/bin/run-tomcat7.bat deleted file mode 100644 index 008f031b..00000000 --- a/web/bin/run-tomcat7.bat +++ /dev/null @@ -1,33 +0,0 @@ -@echo off -rem /** -rem * Copyright (c) 2013-Now http://jeesite.com All rights reserved. -rem * -rem * Author: ThinkGem@163.com -rem */ -title %cd% -echo. -echo [信息] 使用Tomcat7插件运行Web工程。 -echo. -rem pause -rem echo. - -cd %~dp0 -cd .. -set currPath=%cd% - -set MAVEN_OPTS=%MAVEN_OPTS% -Xms256m -Xmx512m -XX:PermSize=128m -XX:MaxPermSize=256m - -if exist "../parent/pom.xml" ( - cd ../parent - call mvn clean install -Dmaven.test.skip=true -) - -if exist "../modules/pom.xml" ( - cd ../modules - call mvn clean install -Dmaven.test.skip=true -) - -cd %currPath% -call mvn clean tomcat7:run -Dmaven.javadoc.skip=true -U - -pause \ No newline at end of file diff --git a/web/src/test/java/com/jeesite/test/InitCoreData.java b/web/src/test/java/com/jeesite/test/InitCoreData.java index cb5b4ffd..05f0f839 100644 --- a/web/src/test/java/com/jeesite/test/InitCoreData.java +++ b/web/src/test/java/com/jeesite/test/InitCoreData.java @@ -5,29 +5,31 @@ package com.jeesite.test; import org.junit.Test; import org.springframework.test.annotation.Commit; +import org.springframework.test.context.ContextConfiguration; /** * 鍒濆鍖栨牳蹇冭〃鏁版嵁 * @author ThinkGem * @version 2017-10-22 */ +@ContextConfiguration(locations={"classpath*:/spring/spring-context-test.xml"}) @Commit public class InitCoreData extends com.jeesite.modules.db.InitCoreData { @Test public void initCoreData() throws Exception{ initLog(); - initConfig(); - initModule(); - initDict(); - initRole(); - initMenu(); - initUser(); +// initConfig(); +// initModule(); +// initDict(); +// initRole(); +// initMenu(); +// initUser(); // initArea(); - initOffice(); - initCompany(); - initPost(); - initEmpUser(); +// initOffice(); +// initCompany(); +// initPost(); +// initEmpUser(); } }