diff --git a/build.gradle b/build.gradle index c7b99e617..70e973891 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,11 @@ configurations.all { //all*.exclude group: 'commons-logging' //exclude group: 'org.slf4j', module: 'slf4j-api' //compile.exclude module: 'commons' + //all*.exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging' + //all*.exclude group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j' } + + // Apply the java plugin to add support for Java //apply plugin: 'java' allprojects { @@ -32,6 +36,14 @@ allprojects { //apply plugin: "findbugs" //apply plugin: "jdepend" + configurations.all { + transitive = false// 为本依赖关闭依赖传递特性 + //all*.exclude group: 'commons-logging' + //exclude group: 'org.slf4j', module: 'slf4j-api' + //compile.exclude module: 'commons' + //all*.exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging' + exclude(group: "org.apache.logging.log4j", module: "log4j-to-slf4j") + } sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -80,6 +92,23 @@ subprojects { //apply plugin: 'org.springframework.boot' //apply plugin: 'io.spring.dependency-management' + //项目名 + println project.name + //项目相对路径 + println project.path + //项目描述 + println project.description + //项目的绝对路径 + println project.projectDir + //项目的build文件绝对路径 + println project.buildDir + //项目所在的group + println project.group + //项目的版本号 + println project.version + //项目的ant对象 + println project.ant + sourceSets { main { java { @@ -135,8 +164,9 @@ subprojects { compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.10' compile group: 'org.apache.velocity', name: 'velocity', version: '1.7' compile group: 'velocity', name: 'velocity-dep', version: '1.4' - testCompile group: 'org.apache.commons', name: 'not-yet-commons-ssl', version: '0.3.9' - + compile group: 'org.freemarker', name: 'freemarker', version: '2.3.28' + //compile group: 'org.apache.commons', name: 'not-yet-commons-ssl', version: '0.3.9' + compile group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: "${log4jVersion}" compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: "${log4jVersion}" compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: "${log4jVersion}" @@ -146,13 +176,13 @@ subprojects { compile group: 'org.apache.logging.log4j', name: 'log4j-web', version: "${log4jVersion}" compile group: 'org.slf4j', name: 'slf4j-api', version: "${slf4jVersion}" - compile group: 'org.springframework', name: 'spring-webmvc', version: "${springVersion}" - compile group: 'org.springframework', name: 'spring-core', version: "${springVersion}" compile group: 'org.springframework', name: 'spring-aop', version: "${springVersion}" compile group: 'org.springframework', name: 'spring-aspects', version: "${springVersion}" - compile group: 'org.springframework', name: 'spring-context', version: "${springVersion}" - compile group: 'org.springframework', name: 'spring-context-index', version: "${springVersion}" + compile group: 'org.springframework', name: 'spring-beans', version: "${springVersion}" compile group: 'org.springframework', name: 'spring-core', version: "${springVersion}" + compile group: 'org.springframework', name: 'spring-context', version: "${springVersion}" + compile group: 'org.springframework', name: 'spring-context-indexer', version: "${springVersion}" + compile group: 'org.springframework', name: 'spring-context-support', version: "${springVersion}" compile group: 'org.springframework', name: 'spring-expression', version: "${springVersion}" compile group: 'org.springframework', name: 'spring-instrument', version: "${springVersion}" compile group: 'org.springframework', name: 'spring-jcl', version: "${springVersion}" @@ -165,31 +195,46 @@ subprojects { compile group: 'org.springframework', name: 'spring-tx', version: "${springVersion}" compile group: 'org.springframework', name: 'spring-web', version: "${springVersion}" compile group: 'org.springframework', name: 'spring-webflux', version: "${springVersion}" + compile group: 'org.springframework', name: 'spring-webmvc', version: "${springVersion}" compile group: 'org.springframework', name: 'spring-websocket', version: "${springVersion}" compile group: 'org.springframework.security', name: 'spring-security-core', version: "${springSecurityVersion}" compile group: 'org.springframework.security', name: 'spring-security-web', version: "${springSecurityVersion}" compile group: 'org.springframework.security', name: 'spring-security-crypto', version: "${springSecurityVersion}" + compile group: 'org.springframework.boot', name: 'spring-boot', version: "${springBootVersion}" + compile group: 'org.springframework.boot', name: 'spring-boot-starter', version: "${springBootVersion}" + compile group: 'org.springframework.boot', name: 'spring-boot-actuator', version: "${springBootVersion}" + compile group: 'org.springframework.boot', name: 'spring-boot-autoconfigure', version: "${springBootVersion}" + compile group: 'org.springframework.boot', name: 'spring-boot-starter-freemarker', version: "${springBootVersion}" + compile group: 'org.springframework.boot', name: 'spring-boot-starter-log4j2', version: "${springBootVersion}" + compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${springBootVersion}" + compile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: "${springBootVersion}" + testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: "${springBootVersion}" + compile group: 'org.opensaml', name: 'opensaml', version: '2.6.4' compile group: 'org.opensaml', name: 'openws', version: '1.5.4' compile group: 'org.opensaml', name: 'xmltooling', version: '1.4.4' compile group: 'org.javassist', name: 'javassist', version: '3.23.0-GA' - compile group: 'javax.activation', name: 'activation', version: '1.1.1' + compile group: 'org.owasp.esapi', name: 'esapi', version: '2.2.0.0' compile group: 'com.sun.mail', name: 'javax.mail', version: '1.6.2' - compile group: 'javax.transaction', name: 'jta', version: '1.1' compile group: 'taglibs', name: 'standard', version: '1.1.2' compile group: 'javax.servlet.jsp.jstl', name: 'jstl', version: '1.2' + compile group: 'javax.activation', name: 'activation', version: '1.1.1' + compile group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2' + compile group: 'javax.transaction', name: 'jta', version: '1.1' compile group: 'javax.transaction', name: 'javax.transaction-api', version: '1.3' compile group: 'javax.validation', name: 'validation-api', version: '2.0.1.Final' - compile group: 'org.owasp.esapi', name: 'esapi', version: '2.2.0.0' + compile group: 'javax.xml', name: 'jsr173', version: '1.0' + compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.60' compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.60' compile group: 'org.bouncycastle', name: 'bcprov-ext-jdk15on', version: '1.60' compile group: 'com.google.crypto.tink', name: 'tink', version: '1.2.2' + compile group: 'com.jhlabs', name: 'filters', version: '2.0.235-1' compile group: 'com.github.penggle', name: 'kaptcha', version: '2.3.2' compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5' @@ -211,7 +256,7 @@ subprojects { compile group: 'org.mybatis', name: 'mybatis-spring', version: '2.0.1' compile group: 'mysql', name: 'mysql-connector-java', version: '5.1.47' compile group: 'com.mchange', name: 'c3p0', version: '0.9.5.4' - compile group: 'com.mchange', name: 'mchange-commons-java', version: '0.2.16' + //compile group: 'com.mchange', name: 'mchange-commons-java', version: '0.2.15' compile group: 'org.hibernate.validator', name: 'hibernate-validator', version: '6.0.17.Final' compile group: 'org.hibernate', name: 'hibernate-validator-cdi', version: '6.0.17.Final' compile group: 'org.hibernate.validator', name: 'hibernate-validator-annotation-processor', version: '6.0.17.Final' @@ -232,32 +277,33 @@ subprojects { compile group: 'aopalliance', name: 'aopalliance', version: '1.0' compile group: 'org.aspectj', name: 'aspectjtools', version: '1.9.4' compile group: 'dom4j', name: 'dom4j', version: '1.6.1' - compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' - compile group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.1' - compile group: 'javax.xml', name: 'jsr173', version: '1.0' - compile group: 'xalan', name: 'serializer', version: '2.7.2' - compile group: 'xalan', name: 'xalan', version: '2.7.2' - compile group: 'xerces', name: 'xercesImpl', version: '2.12.0' - compile group: 'xml-apis', name: 'xml-apis', version: '1.0.b2' + //compile group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.2' + //compile group: 'xalan', name: 'serializer', version: '2.7.2' + //compile group: 'xalan', name: 'xalan', version: '2.7.2' + //compile group: 'xml-apis', name: 'xml-apis', version: '1.4.01' compile group: 'xml-resolver', name: 'xml-resolver', version: '1.2' compile group: 'org.apache.santuario', name: 'xmlsec', version: '1.5.8' compile group: 'org.ogce', name: 'xpp3', version: '1.1.6' compile group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.10' testCompile group: 'xmlunit', name: 'xmlunit', version: '1.6' - - compile group: 'com.belerweb', name: 'pinyin4j', version: '2.5.1' - - compile group: 'org.springframework.boot', name: 'spring-boot', version: "${springBootVersion}" - compile group: 'org.springframework.boot', name: 'spring-boot-starter', version: "${springBootVersion}" - compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${springBootVersion}" - testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: "${springBootVersion}" testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19' - //compile("org.springframework.boot:spring-boot-starter-web") - //testCompile('org.springframework.boot:spring-boot-starter-test') + //local jars + compile fileTree(dir: "${rootDir}/maxkey-lib/", include: '*/*.jar') + + compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '8.5.43' + compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '8.5.43' + compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '8.5.2' + + //compile group: 'org.eclipse.jdt.core.compiler', name: 'ecj', version: '4.6.1' + //compile group: 'javax.el', name: 'javax.el-api', version: '3.0.0' + //compile group: 'el-impl', name: 'el-impl', version: '1.0' + + + } @@ -272,8 +318,8 @@ subprojects { "Implementation-Version": project.version) } } - /* - task checkenv<<{ + + /* task checkenv<<{ //项目名 println project.name //项目相对路径 diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/cas/CasEndpoint.java b/maxkey-authentications/src/main/java/org/maxkey/authn/support/cas/CasEndpoint.java deleted file mode 100644 index 6aac64b68..000000000 --- a/maxkey-authentications/src/main/java/org/maxkey/authn/support/cas/CasEndpoint.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.maxkey.authn.support.cas; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.jasig.cas.client.util.AbstractCasFilter; -import org.jasig.cas.client.validation.Assertion; -import org.maxkey.config.ApplicationConfig; -import org.maxkey.constants.LOGINTYPE; -import org.maxkey.web.WebContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.ModelAndView; - - -/** - * @author Crystal.Sea - * - */ -@Controller -public class CasEndpoint { - private static Logger _logger = LoggerFactory.getLogger(CasEndpoint.class); - - @Autowired - @Qualifier("applicationConfig") - protected ApplicationConfig applicationConfig; - - - /** - * init login - * @return - */ - @RequestMapping(value={"/logon/cas"}) - public ModelAndView casLogin( - HttpServletRequest request, - HttpServletResponse response) { - _logger.debug("CasEndpoint /cas."); - - Assertion assertion = (Assertion) request.getSession().getAttribute(AbstractCasFilter.CONST_CAS_ASSERTION); - - - String username= assertion.getPrincipal().getName(); - - _logger.debug("CAS username : "+username); - - if(WebContext.setAuthentication(username,LOGINTYPE.CAS,"","","success")){ - - } - - - return WebContext.redirect("/login"); - } -} diff --git a/maxkey-authentications/src/main/java/org/maxkey/authn/support/cas/CasEntryPoint.java b/maxkey-authentications/src/main/java/org/maxkey/authn/support/cas/CasEntryPoint.java deleted file mode 100644 index 2b09a76d5..000000000 --- a/maxkey-authentications/src/main/java/org/maxkey/authn/support/cas/CasEntryPoint.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.maxkey.authn.support.cas; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.web.AuthenticationEntryPoint; - -public class CasEntryPoint implements AuthenticationEntryPoint { - - private static final Logger _logger = LoggerFactory.getLogger(CasEntryPoint.class); - - /* (non-Javadoc) - * @see org.springframework.security.web.AuthenticationEntryPoint#commence(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, org.springframework.security.core.AuthenticationException) - */ - public void commence(HttpServletRequest request, HttpServletResponse response, - AuthenticationException ex) throws IOException, ServletException { - - _logger.debug("CasEntryPoint.."); - } - -} diff --git a/maxkey-core/src/main/java/org/maxkey/crypto/cert/X509CertUtils.java b/maxkey-core/src/main/java/org/maxkey/crypto/cert/X509CertUtils.java index 8a3bd030e..c9d308370 100644 --- a/maxkey-core/src/main/java/org/maxkey/crypto/cert/X509CertUtils.java +++ b/maxkey-core/src/main/java/org/maxkey/crypto/cert/X509CertUtils.java @@ -41,7 +41,10 @@ import javax.security.auth.x500.X500Principal; import org.apache.commons.codec.binary.Base64; import org.bouncycastle.asn1.DERObjectIdentifier; +import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x509.X509Name; +import org.bouncycastle.cert.X509v3CertificateBuilder; +import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder; import org.bouncycastle.jce.PKCS10CertificationRequest; import org.bouncycastle.jce.PrincipalUtil; import org.bouncycastle.jce.X509Principal; @@ -590,10 +593,14 @@ public final class X509CertUtils { int iValidity, PublicKey publicKey, PrivateKey privateKey, SignatureType signatureType) throws CryptoException { // Holds certificate attributes + + + Hashtable attrs = new Hashtable(); Vector vOrder = new Vector(); // Load certificate attributes + /* if (sCommonName != null) { attrs.put(X509Name.CN, sCommonName); vOrder.add(0, X509Name.CN); @@ -627,7 +634,7 @@ public final class X509CertUtils { if (sEmailAddress != null) { attrs.put(X509Name.E, sEmailAddress); vOrder.add(0, X509Name.E); - } + }*/ // Get an X509 Version 1 Certificate generator X509V3CertificateGenerator certGen = new X509V3CertificateGenerator(); @@ -654,6 +661,14 @@ public final class X509CertUtils { // Set the serial number certGen.setSerialNumber(generateX509SerialNumber()); + X509v3CertificateBuilder builder = new JcaX509v3CertificateBuilder( + new X500Name("issueDn"), + generateX509SerialNumber(), + new Date(System.currentTimeMillis()), + new Date(System.currentTimeMillis()+ ((long) iValidity * 24 * 60 * 60 * 1000)), + new X500Name("subjectDn"), + publicKey); + try { // Generate an X.509 certificate, based on the current issuer and // subject diff --git a/maxkey-core/src/main/java/org/maxkey/crypto/jose/JWEAlgorithmEmbed.java b/maxkey-core/src/main/java/org/maxkey/crypto/jose/JWEAlgorithmEmbed.java index 66d8d3156..0a9e6165b 100644 --- a/maxkey-core/src/main/java/org/maxkey/crypto/jose/JWEAlgorithmEmbed.java +++ b/maxkey-core/src/main/java/org/maxkey/crypto/jose/JWEAlgorithmEmbed.java @@ -19,10 +19,6 @@ */ package org.maxkey.crypto.jose; -import javax.persistence.Basic; -import javax.persistence.Embeddable; -import javax.persistence.Transient; - import com.google.common.base.Strings; import com.nimbusds.jose.JWEAlgorithm; @@ -33,7 +29,7 @@ import com.nimbusds.jose.JWEAlgorithm; * @author jricher * */ -@Embeddable + public class JWEAlgorithmEmbed { public static final JWEAlgorithmEmbed NONE = getForAlgorithmName("none"); @@ -62,7 +58,7 @@ public class JWEAlgorithmEmbed { * Get the name of this algorithm, return null if no algorithm set. * @return */ - @Basic + public String getAlgorithmName() { if (algorithm != null) { return algorithm.getName(); @@ -95,7 +91,6 @@ public class JWEAlgorithmEmbed { /** * @return the algorithm */ - @Transient public JWEAlgorithm getAlgorithm() { return algorithm; } diff --git a/maxkey-core/src/main/java/org/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java b/maxkey-core/src/main/java/org/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java index 0a3be15d4..5a7bce962 100644 --- a/maxkey-core/src/main/java/org/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java +++ b/maxkey-core/src/main/java/org/maxkey/crypto/jose/JWEEncryptionMethodEmbed.java @@ -19,9 +19,6 @@ */ package org.maxkey.crypto.jose; -import javax.persistence.Basic; -import javax.persistence.Embeddable; -import javax.persistence.Transient; import com.google.common.base.Strings; import com.nimbusds.jose.EncryptionMethod; @@ -30,7 +27,7 @@ import com.nimbusds.jose.EncryptionMethod; * @author jricher * */ -@Embeddable + public class JWEEncryptionMethodEmbed { public static final JWEEncryptionMethodEmbed NONE = getForAlgorithmName("none"); @@ -59,7 +56,7 @@ public class JWEEncryptionMethodEmbed { * Get the name of this algorithm, return null if no algorithm set. * @return */ - @Basic + public String getAlgorithmName() { if (algorithm != null) { return algorithm.getName(); @@ -92,7 +89,7 @@ public class JWEEncryptionMethodEmbed { /** * @return the algorithm */ - @Transient + public EncryptionMethod getAlgorithm() { return algorithm; } diff --git a/maxkey-core/src/main/java/org/maxkey/crypto/jose/JWSAlgorithmEmbed.java b/maxkey-core/src/main/java/org/maxkey/crypto/jose/JWSAlgorithmEmbed.java index 406a7ecf4..a00028779 100644 --- a/maxkey-core/src/main/java/org/maxkey/crypto/jose/JWSAlgorithmEmbed.java +++ b/maxkey-core/src/main/java/org/maxkey/crypto/jose/JWSAlgorithmEmbed.java @@ -19,10 +19,6 @@ */ package org.maxkey.crypto.jose; -import javax.persistence.Basic; -import javax.persistence.Embeddable; -import javax.persistence.Transient; - import com.google.common.base.Strings; import com.nimbusds.jose.JWSAlgorithm; @@ -33,7 +29,7 @@ import com.nimbusds.jose.JWSAlgorithm; * @author jricher * */ -@Embeddable + public class JWSAlgorithmEmbed { public static final JWSAlgorithmEmbed NONE = getForAlgorithmName("none"); @@ -67,7 +63,7 @@ public class JWSAlgorithmEmbed { * Get the name of this algorithm, return null if no algorithm set. * @return */ - @Basic + public String getAlgorithmName() { if (algorithm != null) { return algorithm.getName(); @@ -92,7 +88,7 @@ public class JWSAlgorithmEmbed { /** * @return the algorithm */ - @Transient + public JWSAlgorithm getAlgorithm() { return algorithm; } diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/SerializationUtils.java b/maxkey-core/src/main/java/org/maxkey/util/SerializationUtils.java similarity index 95% rename from maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/SerializationUtils.java rename to maxkey-core/src/main/java/org/maxkey/util/SerializationUtils.java index 01ba1b216..4214bb6c3 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/common/util/SerializationUtils.java +++ b/maxkey-core/src/main/java/org/maxkey/util/SerializationUtils.java @@ -1,4 +1,4 @@ -package org.maxkey.authz.oauth2.common.util; +package org.maxkey.util; import java.io.*; diff --git a/maxkey-core/src/main/java/org/maxkey/web/MaxKeyFreeMarkerConfigurer.java b/maxkey-core/src/main/java/org/maxkey/web/MaxKeyFreeMarkerConfigurer.java new file mode 100644 index 000000000..eccee9223 --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/web/MaxKeyFreeMarkerConfigurer.java @@ -0,0 +1,47 @@ +package org.maxkey.web; + +import java.io.IOException; +import java.util.Map; + +import javax.annotation.PostConstruct; + +import org.maxkey.web.tag.BaseTagDirective; +import org.maxkey.web.tag.FreemarkerTag; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; + +import freemarker.template.Configuration; +import freemarker.template.TemplateException; + +@Component +public class MaxKeyFreeMarkerConfigurer implements ApplicationContextAware { + + ApplicationContext applicationContext ; + + @Autowired + Configuration configuration; + + @Autowired + BaseTagDirective baseTagDirective; + + @PostConstruct // 在项目启动时执行方法 + public void setSharedVariable() throws IOException, TemplateException { + // configuration.setSharedVariable("base", baseTagDirective); + // 根据注解FreemarkerTag获取bean ,key is bean name ,value is bean object + Map map = this.applicationContext.getBeansWithAnnotation(FreemarkerTag.class); + for (String key : map.keySet()) { + configuration.setSharedVariable(key, map.get(key)); + } + + } + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + this.applicationContext = applicationContext; + + } + +} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/BasePathTag.java b/maxkey-core/src/main/java/org/maxkey/web/tag/BasePathTag.java deleted file mode 100644 index e9eef7c71..000000000 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/BasePathTag.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.maxkey.web.tag; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.BodyTagSupport; - - -/** - * 获取请求地址及应用上下文标签 - * get Http Context full Path,if port equals 80 is omitted - * @return String - * eg:http://192.168.1.20:9080/webcontext or http://www.website.com/webcontext - * @author Crystal.Sea - * - */ -public class BasePathTag extends BodyTagSupport{ - private static final long serialVersionUID = 4494502315876572711L; - - private PageContext pageContext; - - public void setPageContext(PageContext pageContext) { - this.pageContext = pageContext; - } - - - public final int doStartTag() throws JspException{ - return SKIP_BODY; - } - - public final int doEndTag() throws JspException{ - int tagReturn=EVAL_PAGE; - String basePath=""; - HttpServletRequest request = (HttpServletRequest)this.pageContext.getRequest(); - basePath = request.getScheme()+"://"+request.getServerName(); - int port=request.getServerPort(); - if(port==443 && request.getScheme().equalsIgnoreCase("https")){ - - }else if(port==80 && request.getScheme().equalsIgnoreCase("http")){ - - }else{ - basePath += ":"+port; - } - basePath += request.getContextPath()+""; - - try{ - pageContext.getOut().print(basePath); - pageContext.getOut().flush(); - }catch(Exception e){ - throw new JspException("exception="+e.getMessage()); - } - return tagReturn; - } - - public void realse(){ - pageContext=null; - } -} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/BasePathTagDirective.java b/maxkey-core/src/main/java/org/maxkey/web/tag/BasePathTagDirective.java new file mode 100644 index 000000000..106f5d98e --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/web/tag/BasePathTagDirective.java @@ -0,0 +1,53 @@ +package org.maxkey.web.tag; + +import java.io.IOException; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + +import org.springframework.beans.factory.annotation.Autowired; + +import freemarker.core.Environment; +import freemarker.template.TemplateDirectiveBody; +import freemarker.template.TemplateDirectiveModel; +import freemarker.template.TemplateException; +import freemarker.template.TemplateModel; + +/** + * <@basePath/> + * 获取请求地址及应用上下文标签 + * get Http Context full Path,if port equals 80 443 is omitted + * @return String + * eg:http://192.168.1.20:9080/webcontext or http://www.website.com/webcontext + * @author Crystal.Sea + * + */ + +@FreemarkerTag("basePath") +public class BasePathTagDirective implements TemplateDirectiveModel { + @Autowired + private HttpServletRequest request; + + private String basePath = null; + + @Override + public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) + throws TemplateException, IOException { + if(basePath==null) { + basePath = request.getScheme()+"://"+request.getServerName(); + int port=request.getServerPort(); + if(port==443 && request.getScheme().equalsIgnoreCase("https")){ + + }else if(port==80 && request.getScheme().equalsIgnoreCase("http")){ + + }else{ + basePath += ":"+port; + } + basePath += request.getContextPath()+""; + } + env.getOut().append(basePath); + + + } + +} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/BaseTag.java b/maxkey-core/src/main/java/org/maxkey/web/tag/BaseTag.java deleted file mode 100644 index 31ed14177..000000000 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/BaseTag.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.maxkey.web.tag; - -import javax.servlet.http.HttpServletRequest; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.BodyTagSupport; - - -/** - * 获取应用上下文标签 - * @author Crystal.Sea - * - */ -public class BaseTag extends BodyTagSupport -{ - private static final long serialVersionUID = 4494502315876572711L; - - private PageContext pageContext; - - public void setPageContext(PageContext pageContext) { - this.pageContext = pageContext; - } - - - public final int doStartTag() throws JspException{ - return SKIP_BODY; - } - - public final int doEndTag() throws JspException{ - int tagReturn=EVAL_PAGE; - String base=""; - - HttpServletRequest request = (HttpServletRequest)this.pageContext.getRequest(); - base=request.getContextPath(); - - try{ - pageContext.getOut().print(base); - pageContext.getOut().flush(); - }catch(Exception e){ - throw new JspException("exception="+e.getMessage()); - } - return tagReturn; - - } - - public void realse(){ - pageContext=null; - } -} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/BaseTagDirective.java b/maxkey-core/src/main/java/org/maxkey/web/tag/BaseTagDirective.java new file mode 100644 index 000000000..30edacc67 --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/web/tag/BaseTagDirective.java @@ -0,0 +1,41 @@ +package org.maxkey.web.tag; + +import java.io.IOException; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + +import org.springframework.beans.factory.annotation.Autowired; + +import freemarker.core.Environment; +import freemarker.template.TemplateDirectiveBody; +import freemarker.template.TemplateDirectiveModel; +import freemarker.template.TemplateException; +import freemarker.template.TemplateModel; +/** + * 获取应用上下文标签 + * <@base/> + * @author Crystal.Sea + * + */ + +@FreemarkerTag("base") +public class BaseTagDirective implements TemplateDirectiveModel { + @Autowired + private HttpServletRequest request; + + private static String base = null; + + @Override + public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) + throws TemplateException, IOException { + //String url = params.get(URL).toString(); + if(base==null) { + base=request.getContextPath(); + } + env.getOut().append(base); + + + } + +} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/BrowserTag.java b/maxkey-core/src/main/java/org/maxkey/web/tag/BrowserTag.java deleted file mode 100644 index fcb72a478..000000000 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/BrowserTag.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.maxkey.web.tag; - -import java.io.IOException; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.BodyTagSupport; - -/** - * 浏览器版本标签 - * 根据浏览器版本包含html - * @author Crystal.Sea - * - */ -public class BrowserTag extends BodyTagSupport{ - - /** - * - */ - private static final long serialVersionUID = -2336696641611234784L; - - private PageContext pageContext; - - String version; - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } - - public void setPageContext(PageContext pageContext) { - this.pageContext = pageContext; - } - - public int doEndTag() throws JspException { - return super.doEndTag(); - } - - public int doStartTag() throws JspException { - - HttpServletRequest request = (HttpServletRequest)this.pageContext.getRequest(); - String userAgent = request.getHeader("User-Agent"); - try { - pageContext.getOut().print(""); - } catch (IOException e) { - e.printStackTrace(); - } - - if(userAgent.indexOf(version)>0){ - return EVAL_BODY_INCLUDE; - } - - return SKIP_BODY; - - } -} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/BrowserTagDirective.java b/maxkey-core/src/main/java/org/maxkey/web/tag/BrowserTagDirective.java new file mode 100644 index 000000000..b18949f8f --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/web/tag/BrowserTagDirective.java @@ -0,0 +1,39 @@ +package org.maxkey.web.tag; + +import java.io.IOException; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + +import org.springframework.beans.factory.annotation.Autowired; + +import freemarker.core.Environment; +import freemarker.template.TemplateDirectiveBody; +import freemarker.template.TemplateDirectiveModel; +import freemarker.template.TemplateException; +import freemarker.template.TemplateModel; +/** + * 获取应用上下文标签 + * <@browser name=""> + * @author Crystal.Sea + * + */ + +@FreemarkerTag("browser") +public class BrowserTagDirective implements TemplateDirectiveModel { + @Autowired + private HttpServletRequest request; + + @Override + public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) + throws TemplateException, IOException { + String browser = params.get("name").toString(); + String userAgent = request.getHeader("User-Agent"); + env.getOut().append(""); + + if(userAgent.indexOf(browser)>0){ + body.render(env.getOut()); + } + } + +} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/ColumnTag.java b/maxkey-core/src/main/java/org/maxkey/web/tag/ColumnTag.java deleted file mode 100644 index 67c682630..000000000 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/ColumnTag.java +++ /dev/null @@ -1,135 +0,0 @@ -package org.maxkey.web.tag; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.Tag; -import javax.servlet.jsp.tagext.TagSupport; - -import org.maxkey.web.WebContext; - -public class ColumnTag extends TagSupport { - - private String field; - - private String title; - - private int width; - - private boolean hidden; - - private boolean sortable; - - private String formatter; - - private PageContext pageContext; - - /** - * - */ - private static final long serialVersionUID = 5581918481537828383L; - - - - - public void setPageContext(PageContext pageContext) { - this.pageContext = pageContext; - } - - - - @Override - @SuppressWarnings("unchecked") - public int doStartTag() throws JspException { - Tag pTag =this.getParent(); - if(pTag.getClass().getSimpleName().equalsIgnoreCase("GridTag")){ - List listGridColumn=(List)pageContext.getAttribute(GridTag.GridTagAttribute); - String i18nTitle=WebContext.getI18nValue(title); - if(i18nTitle != null){ - title = i18nTitle; - } - GridColumn gridColumn=new GridColumn(field,title,width,hidden,sortable,formatter); - - if(listGridColumn == null){ - listGridColumn=new ArrayList(); - } - - listGridColumn.add(gridColumn); - pageContext.setAttribute(GridTag.GridTagAttribute, listGridColumn); - - }else{ - return SKIP_BODY; - } - return super.doStartTag(); - } - - - @Override - public int doEndTag() throws JspException { - return super.doEndTag(); - } - - - public String getField() { - return field; - } - - - public void setField(String field) { - this.field = field; - } - - - public String getTitle() { - return title; - } - - - public void setTitle(String title) { - this.title = title; - } - - - public int getWidth() { - return width; - } - - - public void setWidth(int width) { - this.width = width; - } - - - public boolean isHidden() { - return hidden; - } - - - public void setHidden(boolean hidden) { - this.hidden = hidden; - } - - - public boolean isSortable() { - return sortable; - } - - - public void setSortable(boolean sortable) { - this.sortable = sortable; - } - - - public String getFormatter() { - return formatter; - } - - - public void setFormatter(String formatter) { - this.formatter = formatter; - } - - -} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/DateTag.java b/maxkey-core/src/main/java/org/maxkey/web/tag/DateTag.java deleted file mode 100644 index 5f3e8f05f..000000000 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/DateTag.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.maxkey.web.tag; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.BodyTagSupport; - -import org.maxkey.util.DateUtils; - -public class DateTag extends BodyTagSupport { - /** - * - */ - private static final long serialVersionUID = 2223298103020379292L; - private PageContext pageContext; - private String format; - - private String name; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getFormat() { - return format; - } - - public void setFormat(String format) { - this.format = format; - } - - public void setPageContext(PageContext pageContext) { - this.pageContext = pageContext; - } - - - public final int doStartTag() throws JspException{ - - return SKIP_BODY; - } - - - public final int doEndTag() throws JspException{ - int tagReturn=EVAL_PAGE; - try { -// HttpServletRequest request = (HttpServletRequest) pageContext.getRequest(); - if (format != null && !format.equals("")) { - pageContext.getOut().print(DateUtils.getCurrentDateAsString(format)); - }else{ - pageContext.getOut().print(DateUtils.getCurrentDateAsString(DateUtils.FORMAT_DATE_YYYY_MM_DD)); - } - pageContext.getOut().flush(); - } catch (Exception e) { - throw new JspException("exception="+e.getMessage()); - // TODO: handle exception - } - return tagReturn; - } - public void realse(){ - pageContext=null; - } -} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/DateTagDirective.java b/maxkey-core/src/main/java/org/maxkey/web/tag/DateTagDirective.java new file mode 100644 index 000000000..400bd80b4 --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/web/tag/DateTagDirective.java @@ -0,0 +1,52 @@ +package org.maxkey.web.tag; + +import java.io.IOException; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + +import org.maxkey.util.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; + +import freemarker.core.Environment; +import freemarker.template.TemplateDirectiveBody; +import freemarker.template.TemplateDirectiveModel; +import freemarker.template.TemplateException; +import freemarker.template.TemplateModel; +/** + * 获取应用上下文标签 + * <@date format="" value=""> + * @author Crystal.Sea + * + */ + +@FreemarkerTag("date") +public class DateTagDirective implements TemplateDirectiveModel { + @Autowired + private HttpServletRequest request; + + @Override + public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) + throws TemplateException, IOException { + String dateValue = params.get("value").toString(); + String format = params.get("format").toString(); + String dateString=""; + if(dateValue==null) { + if(format==null) { + dateString=DateUtils.getCurrentDateAsString(DateUtils.FORMAT_DATE_YYYY_MM_DD); + }else { + dateString=DateUtils.getCurrentDateAsString(format); + } + }else { + if(format==null) { + dateString=DateUtils.format(DateUtils.tryParse(dateValue),DateUtils.FORMAT_DATE_YYYY_MM_DD); + }else { + dateString=DateUtils.format(DateUtils.tryParse(dateValue),format); + } + } + + env.getOut().append(dateString); + + } + +} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/DialogTag.java b/maxkey-core/src/main/java/org/maxkey/web/tag/DialogTag.java deleted file mode 100644 index 1bb3204f7..000000000 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/DialogTag.java +++ /dev/null @@ -1,103 +0,0 @@ -package org.maxkey.web.tag; - -import java.io.IOException; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.TagSupport; - -import org.maxkey.web.WebContext; - -public class DialogTag extends TagSupport { - - /** - * - */ - private static final long serialVersionUID = -3872210456717811884L; - - - private String url; - - private String title; - - private int width=300; - - private int height=400; - - private String text; - - private PageContext pageContext; - - - @Override - public int doStartTag() throws JspException { - - String i18nTitle=WebContext.getI18nValue(title); - if(i18nTitle != null){ - title = i18nTitle; - } - - String i18nText=WebContext.getI18nValue(text); - if(i18nText != null){ - text = i18nText; - } - - try { - pageContext.getOut().println("" ); - return SKIP_BODY; - } catch (IOException e) { - e.printStackTrace(); - } - - return super.doStartTag(); - } - - public void setPageContext(PageContext pageContext) { - this.pageContext = pageContext; - } - - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public int getWidth() { - return width; - } - - public void setWidth(int width) { - this.width = width; - } - - public int getHeight() { - return height; - } - - public void setHeight(int height) { - this.height = height; - } - - public String getText() { - return text; - } - - public void setText(String text) { - this.text = text; - } - - - -} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/DialogTagDirective.java b/maxkey-core/src/main/java/org/maxkey/web/tag/DialogTagDirective.java new file mode 100644 index 000000000..9cbb13082 --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/web/tag/DialogTagDirective.java @@ -0,0 +1,57 @@ +package org.maxkey.web.tag; + +import java.io.IOException; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + +import org.maxkey.util.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; + +import freemarker.core.Environment; +import freemarker.template.TemplateDirectiveBody; +import freemarker.template.TemplateDirectiveModel; +import freemarker.template.TemplateException; +import freemarker.template.TemplateModel; +/** + * 获取应用上下文标签 + * <@dialog url="" title="" text="" width=500 height=100 /> + * @author Crystal.Sea + * + */ + +@FreemarkerTag("dialog") +public class DialogTagDirective implements TemplateDirectiveModel { + @Autowired + private HttpServletRequest request; + + private String url; + + private String title; + + private int width=300; + + private int height=400; + + private String text; + + @Override + public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) + throws TemplateException, IOException { + + url=params.get("url").toString(); + title=params.get("title").toString(); + text=params.get("text").toString(); + if(params.get("width")!=null) { + width=Integer.parseInt(params.get("width").toString()); + } + if(params.get("height")!=null) { + height=Integer.parseInt(params.get("height").toString()); + } + + env.getOut().append("" ); + + } + +} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/FreemarkerTag.java b/maxkey-core/src/main/java/org/maxkey/web/tag/FreemarkerTag.java new file mode 100644 index 000000000..a526f7e79 --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/web/tag/FreemarkerTag.java @@ -0,0 +1,15 @@ +package org.maxkey.web.tag; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.springframework.stereotype.Component; + +@Target(value = ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Component +public @interface FreemarkerTag { + String value() default ""; +} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/GenIdTag.java b/maxkey-core/src/main/java/org/maxkey/web/tag/GenIdTag.java deleted file mode 100644 index dffc189af..000000000 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/GenIdTag.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.maxkey.web.tag; - -import java.util.UUID; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.BodyTagSupport; - - -/** - * 主键或者唯一编号生成标签 - * @author Crystal.Sea - * - */ -public class GenIdTag extends BodyTagSupport -{ - private static final long serialVersionUID = 4494502315876572711L; - private PageContext pageContext; - public void setPageContext(PageContext pageContext) { - this.pageContext = pageContext; - } - - - public final int doStartTag() throws JspException{ - return SKIP_BODY; - } - - public final int doEndTag() throws JspException{ - int tagReturn=EVAL_PAGE; - try{ - pageContext.getOut().print(UUID.randomUUID().toString().toLowerCase()); - pageContext.getOut().flush(); - }catch(Exception e){ - throw new JspException("exception="+e.getMessage()); - } - return tagReturn; - - } - - public void realse(){ - pageContext=null; - } -} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/GenIdTagDirective.java b/maxkey-core/src/main/java/org/maxkey/web/tag/GenIdTagDirective.java new file mode 100644 index 000000000..7b0a80e79 --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/web/tag/GenIdTagDirective.java @@ -0,0 +1,30 @@ +package org.maxkey.web.tag; + +import java.io.IOException; +import java.util.Map; +import java.util.UUID; + +import freemarker.core.Environment; +import freemarker.template.TemplateDirectiveBody; +import freemarker.template.TemplateDirectiveModel; +import freemarker.template.TemplateException; +import freemarker.template.TemplateModel; +/** + * 获取应用上下文标签 + * <@genId/> + * @author Crystal.Sea + * + */ + +@FreemarkerTag("genId") +public class GenIdTagDirective implements TemplateDirectiveModel { + + @Override + public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) + throws TemplateException, IOException { + env.getOut().append(UUID.randomUUID().toString().toLowerCase()); + + + } + +} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/GridColumn.java b/maxkey-core/src/main/java/org/maxkey/web/tag/GridColumn.java deleted file mode 100644 index 02f70b16e..000000000 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/GridColumn.java +++ /dev/null @@ -1,118 +0,0 @@ -package org.maxkey.web.tag; - -public class GridColumn { - - private String field; - - private String title; - - private int width; - - private boolean hidden; - - private boolean sortable; - - private String formatter; - - - - /** - * - */ - public GridColumn() { - super(); - } - - - - /** - * @param field - * @param title - * @param width - * @param hidden - * @param sortable - * @param formatter - */ - public GridColumn(String field, String title, int width, boolean hidden, - boolean sortable, String formatter) { - this.field = field; - this.title = title; - this.width = width; - this.hidden = hidden; - this.sortable = sortable; - this.formatter = formatter; - } - - - - public String getField() { - return field; - } - - public void setField(String field) { - this.field = field; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public int getWidth() { - return width; - } - - public void setWidth(int width) { - this.width = width; - } - - public boolean isHidden() { - return hidden; - } - - public void setHidden(boolean hidden) { - this.hidden = hidden; - } - - public boolean isSortable() { - return sortable; - } - - public void setSortable(boolean sortable) { - this.sortable = sortable; - } - - public String getFormatter() { - return formatter; - } - - public void setFormatter(String formatter) { - this.formatter = formatter; - } - - public String getJson(){ - StringBuffer sb=new StringBuffer("{"); - sb.append("name :\"").append(this.field).append("\", "); - sb.append("index :\"").append(this.field).append("\", "); - sb.append("width :").append(this.width).append(", "); - sb.append("hidden :").append(this.hidden).append(", "); - if(this.formatter==null){ - sb.append("sortable :").append(this.sortable).append(" "); - }else{ - sb.append("sortable :").append(this.sortable).append(", "); - sb.append("formatter :").append(this.formatter).append(""); - } - sb.append("}"); - return sb.toString(); - } - - @Override - public String toString() { - return "GridColumn [field=" + field + ", title=" + title + ", width=" - + width + ", hidden=" + hidden + ", sortable=" + sortable - + ", formatter=" + formatter + "]"; - } -} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/GridTag.java b/maxkey-core/src/main/java/org/maxkey/web/tag/GridTag.java deleted file mode 100644 index eed103f8e..000000000 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/GridTag.java +++ /dev/null @@ -1,265 +0,0 @@ -package org.maxkey.web.tag; - -import java.io.IOException; -import java.util.List; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.TagSupport; - -import org.maxkey.web.WebContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -public class GridTag extends TagSupport { - final static Logger _logger = LoggerFactory.getLogger(GridTag.class); - - /** - * - */ - private static final long serialVersionUID = 1243669057069893859L; - - - public static final String GridTagAttribute=GridTag.class.getName()+"_GridTagAttribute"; - - public static final int MultiSelectColumnWidth=903; - - public static final int DefaultColumnWidth=928; - - private String id; - - private String url; - - private boolean multiselect; - - private String onSelect; - - private PageContext pageContext; - - private boolean resize=true; - - private int rowLimit=10; - - private String rowList="[10,50,100]"; - - - - @Override - @SuppressWarnings("unchecked") - public int doEndTag() throws JspException { - List listGridColumn=(List)pageContext.getAttribute(GridTag.GridTagAttribute); - - try { - if(url == null){ - pageContext.getOut().println("
Grid URL can not be null .
"); - return super.doEndTag(); - } - _logger.debug(""+listGridColumn); - - StringBuffer colNames=new StringBuffer(""); - colNames.append("\t colNames : [\n"); - - StringBuffer colModel=new StringBuffer(""); - colModel.append("\t colModel : [\n"); - int visibleColumnWidth=0; - int visibleColumnCount=0; - for(int i=0;i1?localPath.length-1:0)]; - titleText=titleText.toUpperCase().charAt(0)+titleText.substring(1); - } - if(iMultiSelectColumnWidth&&this.isMultiselect()){ - gridsb.append("
Grid Column Width "+visibleColumnWidth+" greate than "+MultiSelectColumnWidth+" .
"); - pageContext.getOut().println(gridsb); - return super.doEndTag(); - }else if(visibleColumnWidth>DefaultColumnWidth){ - gridsb.append("
Grid Column Width "+visibleColumnWidth+" greate than "+DefaultColumnWidth+" .
"); - pageContext.getOut().println(gridsb); - return super.doEndTag(); - } - - int currentRowLimit = rowLimit; - if(WebContext.getAttribute(GridTag.class.getName()+"_PageResults")!=null){ - currentRowLimit=Integer.parseInt(WebContext.getAttribute(GridTag.class.getName()+"_PageResults").toString()); - _logger.debug("current RowLimit "+currentRowLimit); - } - - gridsb.append("\n"); - - gridsb.append("\n
"); - gridsb.append("\n
"); - pageContext.getOut().println(gridsb); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - pageContext.removeAttribute(GridTag.GridTagAttribute); - - return super.doEndTag(); - } - - - public int bulidColumnWidth(int visibleColumnCount){ - int columnWidth=0; - if(this.isMultiselect()){ - if(visibleColumnCount>5){ - columnWidth=MultiSelectColumnWidth-5*(visibleColumnCount-6); - }else if(visibleColumnCount<5){ - columnWidth=MultiSelectColumnWidth+5*(5-visibleColumnCount); - }else{ - columnWidth=MultiSelectColumnWidth; - } - }else{ - if(visibleColumnCount>5){ - columnWidth=DefaultColumnWidth-5*(visibleColumnCount-6); - }else if(visibleColumnCount<5){ - columnWidth=DefaultColumnWidth+5*(5-visibleColumnCount); - }else{ - columnWidth=DefaultColumnWidth; - } - } - return columnWidth; - } - - @Override - - public int doStartTag() throws JspException { - return EVAL_BODY_INCLUDE; - } - - public void setPageContext(PageContext pageContext) { - this.pageContext = pageContext; - } - - - - @Override - public void setValue(String k, Object o) { - // TODO Auto-generated method stub - super.setValue(k, o); - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public boolean isMultiselect() { - return multiselect; - } - - public void setMultiselect(boolean multiselect) { - this.multiselect = multiselect; - } - - - public String getId() { - return id; - } - - - public void setId(String id) { - this.id = id; - } - - - public String getOnSelect() { - return onSelect; - } - - - public void setOnSelect(String onSelect) { - this.onSelect = onSelect; - } - - - public boolean isResize() { - return resize; - } - - - public void setResize(boolean resize) { - this.resize = resize; - } - - - /** - * @return the rowLimit - */ - public int getRowLimit() { - return rowLimit; - } - - - /** - * @param rowLimit the rowLimit to set - */ - public void setRowLimit(int rowLimit) { - this.rowLimit = rowLimit; - } - - - /** - * @return the rowList - */ - public String getRowList() { - return rowList; - } - - - /** - * @param rowList the rowList to set - */ - public void setRowList(String rowList) { - this.rowList = rowList; - } - -} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTag.java b/maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTag.java deleted file mode 100644 index 78c86e843..000000000 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTag.java +++ /dev/null @@ -1,422 +0,0 @@ -/* - * Copyright 2002-2018 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.maxkey.web.tag; - -import java.io.IOException; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspTagException; - -import org.springframework.context.MessageSource; -import org.springframework.context.MessageSourceResolvable; -import org.springframework.context.NoSuchMessageException; -import org.springframework.lang.Nullable; -import org.springframework.util.ObjectUtils; -import org.springframework.util.StringUtils; -import org.springframework.web.servlet.tags.ArgumentAware; -import org.springframework.web.servlet.tags.HtmlEscapingAwareTag; -import org.springframework.web.util.JavaScriptUtils; -import org.springframework.web.util.TagUtils; - -/** - * The {@code } tag looks up a message in the scope of this page. - * Messages are resolved using the ApplicationContext and thus support - * internationalization. - * - *

Detects an HTML escaping setting, either on this tag instance, the page level, - * or the {@code web.xml} level. Can also apply JavaScript escaping. - * - *

If "code" isn't set or cannot be resolved, "text" will be used as default - * message. Thus, this tag can also be used for HTML escaping of any texts. - * - *

Message arguments can be specified via the {@link #setArguments(Object) arguments} - * attribute or by using nested {@code } tags. - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
Attribute Summary
AttributeRequired?Runtime Expression?Description
argumentsfalsetrueSet optional message arguments for this tag, as a (comma-)delimited - * String (each String argument can contain JSP EL), an Object array (used as - * argument array), or a single Object (used as single argument).
argumentSeparatorfalsetrueThe separator character to be used for splitting the arguments string - * value; defaults to a 'comma' (',').
codefalsetrueThe code (key) to use when looking up the message. - * If code is not provided, the text attribute will be used.
htmlEscapefalsetrueSet HTML escaping for this tag, as boolean value. - * Overrides the default HTML escaping setting for the current page.
javaScriptEscapefalsetrueSet JavaScript escaping for this tag, as boolean value. - * Default is false.
messagefalsetrueA MessageSourceResolvable argument (direct or through JSP EL). - * Fits nicely when used in conjunction with Spring’s own validation error - * classes which all implement the MessageSourceResolvable interface. - * For example, this allows you to iterate over all of the errors in a form, - * passing each error (using a runtime expression) as the value of this - * 'message' attribute, thus effecting the easy display of such error - * messages.
scopefalsetrueThe scope to use when exporting the result to a variable. This attribute - * is only used when var is also set. Possible values are page, request, session - * and application.
textfalsetrueDefault text to output when a message for the given code could not be - * found. If both text and code are not set, the tag will output null.
varfalsetrueThe string to use when binding the result to the page, request, session - * or application scope. If not specified, the result gets outputted to the writer - * (i.e. typically directly to the JSP).
- * - * @author Rod Johnson - * @author Juergen Hoeller - * @author Nicholas Williams - * @see #setCode - * @see #setText - * @see #setHtmlEscape - * @see #setJavaScriptEscape - * @see HtmlEscapeTag#setDefaultHtmlEscape - * @see org.springframework.web.util.WebUtils#HTML_ESCAPE_CONTEXT_PARAM - * @see ArgumentTag - */ -@SuppressWarnings("serial") -public class LocaleTag extends HtmlEscapingAwareTag implements ArgumentAware { - - /** - * Default separator for splitting an arguments String: a comma (","). - */ - public static final String DEFAULT_ARGUMENT_SEPARATOR = ","; - - - @Nullable - private MessageSourceResolvable message; - - @Nullable - private String code; - - @Nullable - private Object arguments; - - private String argumentSeparator = DEFAULT_ARGUMENT_SEPARATOR; - - private List nestedArguments = Collections.emptyList(); - - @Nullable - private String text; - - @Nullable - private String var; - - private String scope = TagUtils.SCOPE_PAGE; - - private boolean javaScriptEscape = false; - - - /** - * Set the MessageSourceResolvable for this tag. - *

If a MessageSourceResolvable is specified, it effectively overrides - * any code, arguments or text specified on this tag. - */ - public void setMessage(MessageSourceResolvable message) { - this.message = message; - } - - /** - * Set the message code for this tag. - */ - public void setCode(String code) { - this.code = code; - } - - /** - * Set optional message arguments for this tag, as a comma-delimited - * String (each String argument can contain JSP EL), an Object array - * (used as argument array), or a single Object (used as single argument). - */ - public void setArguments(Object arguments) { - this.arguments = arguments; - } - - /** - * Set the separator to use for splitting an arguments String. - * Default is a comma (","). - * @see #setArguments - */ - public void setArgumentSeparator(String argumentSeparator) { - this.argumentSeparator = argumentSeparator; - } - - @Override - public void addArgument(@Nullable Object argument) throws JspTagException { - this.nestedArguments.add(argument); - } - - /** - * Set the message text for this tag. - */ - public void setText(String text) { - this.text = text; - } - - /** - * Set PageContext attribute name under which to expose - * a variable that contains the resolved message. - * @see #setScope - * @see javax.servlet.jsp.PageContext#setAttribute - */ - public void setVar(String var) { - this.var = var; - } - - /** - * Set the scope to export the variable to. - * Default is SCOPE_PAGE ("page"). - * @see #setVar - * @see org.springframework.web.util.TagUtils#SCOPE_PAGE - * @see javax.servlet.jsp.PageContext#setAttribute - */ - public void setScope(String scope) { - this.scope = scope; - } - - /** - * Set JavaScript escaping for this tag, as boolean value. - * Default is "false". - */ - public void setJavaScriptEscape(boolean javaScriptEscape) throws JspException { - this.javaScriptEscape = javaScriptEscape; - } - - - @Override - protected final int doStartTagInternal() throws JspException, IOException { - this.nestedArguments = new LinkedList<>(); - return EVAL_BODY_INCLUDE; - } - - /** - * Resolves the message, escapes it if demanded, - * and writes it to the page (or exposes it as variable). - * @see #resolveMessage() - * @see org.springframework.web.util.HtmlUtils#htmlEscape(String) - * @see org.springframework.web.util.JavaScriptUtils#javaScriptEscape(String) - * @see #writeMessage(String) - */ - @Override - public int doEndTag() throws JspException { - try { - if(code==null) { - pageContext.getOut().print(getRequestContext().getLocale()); - }else { - // Resolve the unescaped message. - String msg = resolveMessage(); - - // HTML and/or JavaScript escape, if demanded. - msg = htmlEscape(msg); - msg = this.javaScriptEscape ? JavaScriptUtils.javaScriptEscape(msg) : msg; - - // Expose as variable, if demanded, else write to the page. - if (this.var != null) { - this.pageContext.setAttribute(this.var, msg, TagUtils.getScope(this.scope)); - } - else { - writeMessage(msg); - } - } - return EVAL_PAGE; - } - catch (IOException ex) { - System.out.println("IOException code "+code); - throw new JspTagException(ex.getMessage(), ex); - } - catch (NoSuchMessageException ex) { - System.out.println("IOException code "+code); - throw new JspTagException(getNoSuchMessageExceptionDescription(ex)); - } - } - - @Override - public void release() { - super.release(); - this.arguments = null; - } - - - /** - * Resolve the specified message into a concrete message String. - * The returned message String should be unescaped. - */ - protected String resolveMessage() throws JspException, NoSuchMessageException { - MessageSource messageSource = getMessageSource(); - - // Evaluate the specified MessageSourceResolvable, if any. - if (this.message != null) { - // We have a given MessageSourceResolvable. - return messageSource.getMessage(this.message, getRequestContext().getLocale()); - } - - if (this.code != null || this.text != null) { - // We have a code or default text that we need to resolve. - Object[] argumentsArray = resolveArguments(this.arguments); - if (!this.nestedArguments.isEmpty()) { - argumentsArray = appendArguments(argumentsArray, this.nestedArguments.toArray()); - } - - if (this.text != null) { - // We have a fallback text to consider. - String msg = messageSource.getMessage( - this.code, argumentsArray, this.text, getRequestContext().getLocale()); - return (msg != null ? msg : ""); - } - else { - // We have no fallback text to consider. - return messageSource.getMessage( - this.code, argumentsArray, getRequestContext().getLocale()); - } - } - - System.out.println("No resolvable message for code "+code); - return argumentSeparator; - } - - private Object[] appendArguments(@Nullable Object[] sourceArguments, Object[] additionalArguments) { - if (ObjectUtils.isEmpty(sourceArguments)) { - return additionalArguments; - } - Object[] arguments = new Object[sourceArguments.length + additionalArguments.length]; - System.arraycopy(sourceArguments, 0, arguments, 0, sourceArguments.length); - System.arraycopy(additionalArguments, 0, arguments, sourceArguments.length, additionalArguments.length); - return arguments; - } - - /** - * Resolve the given arguments Object into an arguments array. - * @param arguments the specified arguments Object - * @return the resolved arguments as array - * @throws JspException if argument conversion failed - * @see #setArguments - */ - @Nullable - protected Object[] resolveArguments(@Nullable Object arguments) throws JspException { - if (arguments instanceof String) { - String[] stringArray = - StringUtils.delimitedListToStringArray((String) arguments, this.argumentSeparator); - if (stringArray.length == 1) { - Object argument = stringArray[0]; - if (argument != null && argument.getClass().isArray()) { - return ObjectUtils.toObjectArray(argument); - } - else { - return new Object[] {argument}; - } - } - else { - return stringArray; - } - } - else if (arguments instanceof Object[]) { - return (Object[]) arguments; - } - else if (arguments instanceof Collection) { - return ((Collection) arguments).toArray(); - } - else if (arguments != null) { - // Assume a single argument object. - return new Object[] {arguments}; - } - else { - return null; - } - } - - /** - * Write the message to the page. - *

Can be overridden in subclasses, e.g. for testing purposes. - * @param msg the message to write - * @throws IOException if writing failed - */ - protected void writeMessage(String msg) throws IOException { - this.pageContext.getOut().write(String.valueOf(msg)); - } - - /** - * Use the current RequestContext's application context as MessageSource. - */ - protected MessageSource getMessageSource() { - return getRequestContext().getMessageSource(); - } - - /** - * Return default exception message. - */ - protected String getNoSuchMessageExceptionDescription(NoSuchMessageException ex) { - return ex.getMessage(); - } - -} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTagDirective.java b/maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTagDirective.java new file mode 100644 index 000000000..adbcd64a2 --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTagDirective.java @@ -0,0 +1,45 @@ +package org.maxkey.web.tag; + +import java.io.IOException; +import java.util.Locale; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.servlet.support.RequestContextUtils; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.servlet.support.RequestContext; +import org.springframework.web.servlet.tags.RequestContextAwareTag; + +import freemarker.core.Environment; +import freemarker.template.TemplateDirectiveBody; +import freemarker.template.TemplateDirectiveModel; +import freemarker.template.TemplateException; +import freemarker.template.TemplateModel; +/** + * 获取应用上下文标签 + * <@locale/> + * @author Crystal.Sea + * + */ + +@FreemarkerTag("locale") +public class LocaleTagDirective implements TemplateDirectiveModel { + @Autowired + private HttpServletRequest request; + + + @Override + public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) + throws TemplateException, IOException { + WebApplicationContext webApplicationContext =RequestContextUtils.findWebApplicationContext(request); + if(params.get("code")==null) { + env.getOut().append(RequestContextUtils.getLocale(request).getLanguage()); + }else { + env.getOut().append(webApplicationContext.getMessage(params.get("code").toString(), null, RequestContextUtils.getLocale(request))); + } + } + +} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/ParameterTag.java b/maxkey-core/src/main/java/org/maxkey/web/tag/ParameterTag.java deleted file mode 100644 index e505e1dfb..000000000 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/ParameterTag.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.maxkey.web.tag; - -import java.io.IOException; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.TagSupport; - -/** - * 获取请求参数标签 - * @author Crystal.Sea - * - */ -public class ParameterTag extends TagSupport{ - - /** - * - */ - private static final long serialVersionUID = 9094347470856820500L; - - private PageContext pageContext; - - private String name; - - - - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public void setPageContext(PageContext pageContext) { - this.pageContext = pageContext; - } - - public final int doStartTag() throws JspException{ - return SKIP_BODY; - } - - public final int doEndTag() throws JspException{ - int tagReturn=EVAL_PAGE; - try{ - if(this.getName()!=null&&!this.getName().equals("")){ - pageContext.getOut().print(this.pageContext.getRequest().getParameter(this.getName())); - pageContext.getOut().flush(); - } - } catch (IOException e){ - throw new JspException("exception="+e.getMessage()); - } - return tagReturn; - - } - -} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/ParameterTagDirective.java b/maxkey-core/src/main/java/org/maxkey/web/tag/ParameterTagDirective.java new file mode 100644 index 000000000..c2035dedf --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/web/tag/ParameterTagDirective.java @@ -0,0 +1,37 @@ +package org.maxkey.web.tag; + +import java.io.IOException; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + +import org.springframework.beans.factory.annotation.Autowired; + +import freemarker.core.Environment; +import freemarker.template.TemplateDirectiveBody; +import freemarker.template.TemplateDirectiveModel; +import freemarker.template.TemplateException; +import freemarker.template.TemplateModel; +/** + * 获取应用上下文标签 + * <@parameter/> + * @author Crystal.Sea + * + */ + +@FreemarkerTag("parameter") +public class ParameterTagDirective implements TemplateDirectiveModel { + @Autowired + private HttpServletRequest request; + + private String name; + + + @Override + public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) + throws TemplateException, IOException { + name=params.get("name").toString(); + env.getOut().append(request.getParameter(name)); + } + +} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/PathVarTagDirective.java b/maxkey-core/src/main/java/org/maxkey/web/tag/PathVarTagDirective.java new file mode 100644 index 000000000..f93b333e6 --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/web/tag/PathVarTagDirective.java @@ -0,0 +1,49 @@ +package org.maxkey.web.tag; + +import java.io.IOException; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + +import org.springframework.beans.factory.annotation.Autowired; + +import freemarker.core.Environment; +import freemarker.template.TemplateDirectiveBody; +import freemarker.template.TemplateDirectiveModel; +import freemarker.template.TemplateException; +import freemarker.template.TemplateModel; +/** + * 获取应用上下文标签 + * <@pathVar/> + * @author Crystal.Sea + * + */ + +@FreemarkerTag("pathVar") +public class PathVarTagDirective implements TemplateDirectiveModel { + @Autowired + private HttpServletRequest request; + + private int index; + String pathVariable; + + @Override + public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) + throws TemplateException, IOException { + + index=Integer.parseInt(params.get("index").toString()); + String[] pathVariables=request.getAttribute(org.springframework.web.util.WebUtils.FORWARD_REQUEST_URI_ATTRIBUTE).toString().split("/"); + + if(pathVariables==null){ + pathVariables=request.getRequestURI().split("/"); + } + + if(index==0){ + pathVariable=pathVariables[pathVariables.length-1]; + }else{ + pathVariable=pathVariables[index+1]; + } + env.getOut().append(request.getParameter(pathVariable)); + } + +} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/PathVariableTag.java b/maxkey-core/src/main/java/org/maxkey/web/tag/PathVariableTag.java deleted file mode 100644 index ee3e6bc18..000000000 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/PathVariableTag.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.maxkey.web.tag; - -import java.io.IOException; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.TagSupport; - - -/** - * 获取访问地址url参数标签 - * @author Crystal.Sea - * - */ -public class PathVariableTag extends TagSupport{ - - /** - * - */ - private static final long serialVersionUID = -3906613920420893358L; - - private PageContext pageContext; - - private int index; - - public int getIndex() { - return index; - } - - public void setIndex(int index) { - this.index = index; - } - - public void setPageContext(PageContext pageContext) { - this.pageContext = pageContext; - } - - public final int doStartTag() throws JspException{ - return SKIP_BODY; - } - - public final int doEndTag() throws JspException{ - int tagReturn=EVAL_PAGE; - String pathVariable=""; - try - { - HttpServletRequest request = (HttpServletRequest)this.pageContext.getRequest(); - String[] pathVariables=request.getAttribute(org.springframework.web.util.WebUtils.FORWARD_REQUEST_URI_ATTRIBUTE).toString().split("/"); - - if(pathVariables==null){ - pathVariables=request.getRequestURI().split("/"); - } - - if(this.getIndex()==0){ - pathVariable=pathVariables[pathVariables.length-1]; - }else{ - pathVariable=pathVariables[this.getIndex()+1]; - } - - pageContext.getOut().print(pathVariable); - pageContext.getOut().flush(); - } catch (IOException e) - { - throw new JspException("exception="+e.getMessage()); - } - return tagReturn; - - } - -} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/RedirectTagDirective.java b/maxkey-core/src/main/java/org/maxkey/web/tag/RedirectTagDirective.java new file mode 100644 index 000000000..525a578e6 --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/web/tag/RedirectTagDirective.java @@ -0,0 +1,54 @@ +package org.maxkey.web.tag; + +import java.io.IOException; +import java.util.Locale; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.servlet.support.RequestContextUtils; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.servlet.support.RequestContext; +import org.springframework.web.servlet.tags.RequestContextAwareTag; + +import freemarker.core.Environment; +import freemarker.template.TemplateDirectiveBody; +import freemarker.template.TemplateDirectiveModel; +import freemarker.template.TemplateException; +import freemarker.template.TemplateModel; +/** + * 获取应用上下文标签 + * <@locale/> + * @author Crystal.Sea + * + */ + +@FreemarkerTag("redirect") +public class RedirectTagDirective implements TemplateDirectiveModel { + @Autowired + private HttpServletRequest request; + private HttpServletResponse response; + + private String basePath = null; + + @Override + public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) + throws TemplateException, IOException { + String location=params.get("url").toString(); + + basePath = request.getScheme()+"://"+request.getServerName(); + int port=request.getServerPort(); + //Ignore 443 or 80 port + if((port==443 && request.getScheme().equalsIgnoreCase("https")) + ||(port==80 && request.getScheme().equalsIgnoreCase("http"))){ + }else{ + basePath += ":"+port; + } + basePath += request.getContextPath()+""; + + response.sendRedirect(basePath+"/"+location); + } + +} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/TreeTag.java b/maxkey-core/src/main/java/org/maxkey/web/tag/TreeTag.java deleted file mode 100644 index 40273fd4a..000000000 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/TreeTag.java +++ /dev/null @@ -1,171 +0,0 @@ -package org.maxkey.web.tag; - -import java.io.IOException; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.TagSupport; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -public class TreeTag extends TagSupport { - final static Logger _logger = LoggerFactory.getLogger(TreeTag.class); - - /** - * - */ - private static final long serialVersionUID = 1243669057069893859L; - - - private String id; - - private String url; - - private String rootId; - - private boolean checkbox; - - private int width=300; - - private int height; - - private String onClick="null"; - - private String onDblClick="null"; - - private PageContext pageContext; - - - - - @Override - public int doEndTag() throws JspException { - - return super.doEndTag(); - } - - - @Override - - public int doStartTag() throws JspException { - try{ - StringBuffer sb=new StringBuffer(""); - sb.append("\n"); - - sb.append("\n

"); - - pageContext.getOut().println(sb); - - } catch (IOException e) { - e.printStackTrace(); - } - - return EVAL_BODY_INCLUDE; - } - - public void setPageContext(PageContext pageContext) { - this.pageContext = pageContext; - } - - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - - public String getId() { - return id; - } - - - public void setId(String id) { - this.id = id; - } - - - public String getRootId() { - return rootId; - } - - - public void setRootId(String rootId) { - this.rootId = rootId; - } - - - public boolean isCheckbox() { - return checkbox; - } - - - public void setCheckbox(boolean checkbox) { - this.checkbox = checkbox; - } - - - public int getWidth() { - return width; - } - - - public void setWidth(int width) { - this.width = width; - } - - - public int getHeight() { - return height; - } - - - public void setHeight(int height) { - this.height = height; - } - - - public String getOnClick() { - return onClick; - } - - - public void setOnClick(String onClick) { - this.onClick = onClick; - } - - - public String getOnDblClick() { - return onDblClick; - } - - - public void setOnDblClick(String onDblClick) { - this.onDblClick = onDblClick; - } - - - public PageContext getPageContext() { - return pageContext; - } - -} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/TreeTagDirective.java b/maxkey-core/src/main/java/org/maxkey/web/tag/TreeTagDirective.java new file mode 100644 index 000000000..e0a0049eb --- /dev/null +++ b/maxkey-core/src/main/java/org/maxkey/web/tag/TreeTagDirective.java @@ -0,0 +1,95 @@ +package org.maxkey.web.tag; + +import java.io.IOException; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + +import org.springframework.beans.factory.annotation.Autowired; + +import freemarker.core.Environment; +import freemarker.template.TemplateDirectiveBody; +import freemarker.template.TemplateDirectiveModel; +import freemarker.template.TemplateException; +import freemarker.template.TemplateModel; +/** + * 获取应用上下文标签 + * <@base/> + * @author Crystal.Sea + * + */ + +@FreemarkerTag("tree") +public class TreeTagDirective implements TemplateDirectiveModel { + @Autowired + private HttpServletRequest request; + + private String id; + + private String url; + + private String rootId; + + private String checkbox; + + private int width=300; + + private int height; + + private String onClick="null"; + + private String onDblClick="null"; + + + @Override + public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) + throws TemplateException, IOException { + id = params.get("id").toString(); + url = params.get("url").toString(); + rootId = params.get("rootId").toString(); + checkbox = params.get("checkbox").toString(); + if(params.get("width")!=null) { + width=Integer.parseInt(params.get("width").toString()); + } + if(params.get("height")!=null) { + height=Integer.parseInt(params.get("height").toString()); + } + if(params.get("onClick")!=null) { + onClick = params.get("onClick").toString(); + } + if(params.get("onDblClick")!=null) { + onDblClick = params.get("onDblClick").toString(); + } + + try{ + StringBuffer sb=new StringBuffer(""); + sb.append("\n"); + + sb.append("\n
"); + + env.getOut().append(sb); + + } catch (IOException e) { + e.printStackTrace(); + } + + + + } + +} diff --git a/maxkey-core/src/main/java/org/maxkey/web/tag/UsernameTag.java b/maxkey-core/src/main/java/org/maxkey/web/tag/UsernameTag.java deleted file mode 100644 index 8b6140c69..000000000 --- a/maxkey-core/src/main/java/org/maxkey/web/tag/UsernameTag.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.maxkey.web.tag; - -import java.io.IOException; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.TagSupport; - -import org.maxkey.domain.UserInfo; -import org.maxkey.web.WebContext; - -/** - * 获取当前登录用户标签 - * @author Crystal.Sea - * - */ -public class UsernameTag extends TagSupport -{ - private PageContext pageContext; - private static final long serialVersionUID = 4494502315876572711L; - public void setPageContext(PageContext pageContext) { - this.pageContext = pageContext; - } - - public final int doStartTag() throws JspException{ - return SKIP_BODY; - } - - public final int doEndTag() throws JspException{ - int tagReturn=EVAL_PAGE; - try - { - UserInfo userInfo=WebContext.getUserInfo(); - if(userInfo!=null&&!userInfo.getUsername().equals("")){ - pageContext.getOut().print(userInfo.getUsername()); - pageContext.getOut().flush(); - } - } catch (IOException e) - { - throw new JspException("exception="+e.getMessage()); - } - return tagReturn; - - } - -} diff --git a/maxkey-lib/other/jaxb-impl-2.2_1.jar b/maxkey-lib/other/jaxb-impl-2.2_1.jar new file mode 100644 index 000000000..7b0bff609 Binary files /dev/null and b/maxkey-lib/other/jaxb-impl-2.2_1.jar differ diff --git a/maxkey-lib/other/mchange-commons-java-0.2.16.jar b/maxkey-lib/other/mchange-commons-java-0.2.16.jar new file mode 100644 index 000000000..115ec1cc6 Binary files /dev/null and b/maxkey-lib/other/mchange-commons-java-0.2.16.jar differ diff --git a/maxkey-lib/other/not-yet-commons-ssl-0.3.9.jar b/maxkey-lib/other/not-yet-commons-ssl-0.3.9.jar new file mode 100644 index 000000000..cb1bee3ab Binary files /dev/null and b/maxkey-lib/other/not-yet-commons-ssl-0.3.9.jar differ diff --git a/maxkey-lib/other/serializer-2.10.0.jar b/maxkey-lib/other/serializer-2.10.0.jar new file mode 100644 index 000000000..de9b007b4 Binary files /dev/null and b/maxkey-lib/other/serializer-2.10.0.jar differ diff --git a/maxkey-lib/other/xalan-2.7.1.jar b/maxkey-lib/other/xalan-2.7.1.jar new file mode 100644 index 000000000..458fa73d9 Binary files /dev/null and b/maxkey-lib/other/xalan-2.7.1.jar differ diff --git a/maxkey-lib/other/xml-apis-2.10.0.jar b/maxkey-lib/other/xml-apis-2.10.0.jar new file mode 100644 index 000000000..46733464f Binary files /dev/null and b/maxkey-lib/other/xml-apis-2.10.0.jar differ diff --git a/maxkey-protocols/maxkey-protocol-authorize/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-authorize/bin/main/.gitignore deleted file mode 100644 index cf1db2eed..000000000 --- a/maxkey-protocols/maxkey-protocol-authorize/bin/main/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/org/ diff --git a/maxkey-protocols/maxkey-protocol-authorize/bin/main/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-authorize/bin/main/META-INF/MANIFEST.MF new file mode 100644 index 000000000..254272e1c --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-authorize/bin/main/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/maxkey-protocols/maxkey-protocol-cas/bin/main/.gitignore b/maxkey-protocols/maxkey-protocol-cas/bin/main/.gitignore deleted file mode 100644 index cf1db2eed..000000000 --- a/maxkey-protocols/maxkey-protocol-cas/bin/main/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/org/ diff --git a/maxkey-protocols/maxkey-protocol-cas/bin/main/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-cas/bin/main/META-INF/MANIFEST.MF new file mode 100644 index 000000000..254272e1c --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-cas/bin/main/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java index d22329caf..ca9f7fd0c 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java @@ -80,7 +80,13 @@ renew [OPTIONAL] - if this parameter is set, ticket validation will only succeed @RequestParam(value = CasConstants.PARAMETER.SERVICE) String service, @RequestParam(value = CasConstants.PARAMETER.RENEW,required=false) String renew ){ - Ticket storedTicket=ticketServices.consumeTicket(ticket); + Ticket storedTicket=null; + try { + storedTicket = ticketServices.consumeTicket(ticket); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } if(storedTicket!=null){ return new Service10ResponseBuilder().success() diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java index 95be9fe95..445a3776c 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java @@ -179,7 +179,13 @@ For all error codes, it is RECOMMENDED that CAS provide a more detailed message @RequestParam(value = CasConstants.PARAMETER.FORMAT,required=false,defaultValue=CasConstants.FORMAT_TYPE.XML) String format){ - Ticket storedTicket=ticketServices.consumeTicket(ticket); + Ticket storedTicket=null; + try { + storedTicket = ticketServices.consumeTicket(ticket); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } ServiceResponseBuilder serviceResponseBuilder=new ServiceResponseBuilder(); if(storedTicket!=null){ @@ -276,7 +282,12 @@ Response on ticket validation failure: @RequestParam(value = CasConstants.PARAMETER.FORMAT,required=false,defaultValue=CasConstants.FORMAT_TYPE.XML) String format){ - Ticket storedTicket=ticketServices.consumeTicket(ticket); + Ticket storedTicket=null; + try { + storedTicket = ticketServices.consumeTicket(ticket); + } catch (Exception e) { + e.printStackTrace(); + } ServiceResponseBuilder serviceResponseBuilder=new ServiceResponseBuilder(); if(storedTicket!=null){ diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java index 3bc2c63f8..6f1c5269f 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java @@ -61,7 +61,12 @@ public class Cas30AuthorizeEndpoint extends AuthorizeBaseEndpoint{ @RequestParam(value = CasConstants.PARAMETER.FORMAT,required=false,defaultValue=CasConstants.FORMAT_TYPE.XML) String format){ - Ticket storedTicket=ticketServices.consumeTicket(ticket); + Ticket storedTicket=null; + try { + storedTicket = ticketServices.consumeTicket(ticket); + } catch (Exception e) { + e.printStackTrace(); + } ServiceResponseBuilder serviceResponseBuilder=new ServiceResponseBuilder(); if(storedTicket!=null){ @@ -98,7 +103,12 @@ public class Cas30AuthorizeEndpoint extends AuthorizeBaseEndpoint{ @RequestParam(value = CasConstants.PARAMETER.FORMAT,required=false,defaultValue=CasConstants.FORMAT_TYPE.XML) String format){ - Ticket storedTicket=ticketServices.consumeTicket(ticket); + Ticket storedTicket=null; + try { + storedTicket = ticketServices.consumeTicket(ticket); + } catch (Exception e) { + e.printStackTrace(); + } ServiceResponseBuilder serviceResponseBuilder=new ServiceResponseBuilder(); if(storedTicket!=null){ diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/service/JdbcTicketServices.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/service/JdbcTicketServices.java index 08bf1c922..94f52cc34 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/service/JdbcTicketServices.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/service/JdbcTicketServices.java @@ -7,7 +7,7 @@ import java.sql.Types; import javax.sql.DataSource; import org.maxkey.authz.cas.endpoint.ticket.Ticket; -import org.maxkey.authz.oauth2.common.util.SerializationUtils; +import org.maxkey.util.SerializationUtils; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/service/RandomServiceTicketServices.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/service/RandomServiceTicketServices.java index 8d0ca1027..537632f98 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/service/RandomServiceTicketServices.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/service/RandomServiceTicketServices.java @@ -3,7 +3,6 @@ package org.maxkey.authz.cas.endpoint.ticket.service; import org.maxkey.authz.cas.endpoint.ticket.CasConstants; import org.maxkey.authz.cas.endpoint.ticket.Ticket; import org.maxkey.authz.cas.endpoint.ticket.generator.DefaultUniqueTicketIdGenerator; -import org.maxkey.authz.oauth2.common.exceptions.InvalidGrantException; public abstract class RandomServiceTicketServices implements TicketServices { @@ -39,11 +38,10 @@ public abstract class RandomServiceTicketServices implements TicketServices { return ticketId; } - public Ticket consumeTicket(String ticketId) - throws InvalidGrantException { + public Ticket consumeTicket(String ticketId) throws Exception{ Ticket ticket = this.remove(ticketId); if (ticket == null) { - throw new InvalidGrantException("Invalid authorization code: " + ticketId); + throw new Exception("Invalid authorization code: " + ticketId); } return ticket; } diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/service/TicketServices.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/service/TicketServices.java index ef9edac40..a8365dec4 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/service/TicketServices.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/authz/cas/endpoint/ticket/service/TicketServices.java @@ -1,7 +1,6 @@ package org.maxkey.authz.cas.endpoint.ticket.service; import org.maxkey.authz.cas.endpoint.ticket.Ticket; -import org.maxkey.authz.oauth2.common.exceptions.InvalidGrantException; public interface TicketServices { @@ -21,6 +20,6 @@ public interface TicketServices { * @throws InvalidGrantException If the authorization code is invalid or expired. */ Ticket consumeTicket(String ticketId) - throws InvalidGrantException; + throws Exception; } diff --git a/maxkey-protocols/maxkey-protocol-desktop/bin/main/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-desktop/bin/main/META-INF/MANIFEST.MF new file mode 100644 index 000000000..254272e1c --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-desktop/bin/main/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/maxkey-protocols/maxkey-protocol-extendapi/bin/main/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-extendapi/bin/main/META-INF/MANIFEST.MF new file mode 100644 index 000000000..254272e1c --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-extendapi/bin/main/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/maxkey-protocols/maxkey-protocol-ltpa/bin/main/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-ltpa/bin/main/META-INF/MANIFEST.MF new file mode 100644 index 000000000..254272e1c --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-ltpa/bin/main/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/META-INF/MANIFEST.MF new file mode 100644 index 000000000..254272e1c --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/META-INF/spring.handlers b/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/META-INF/spring.handlers new file mode 100644 index 000000000..c9bae2aa3 --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/META-INF/spring.handlers @@ -0,0 +1,2 @@ +http\://www.springframework.org/schema/security/oauth2=org.springframework.security.oauth2.config.xml.OAuth2SecurityNamespaceHandler +http\://www.springframework.org/schema/security/oauth=org.springframework.security.oauth.config.OAuthSecurityNamespaceHandler diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/META-INF/spring.schemas b/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/META-INF/spring.schemas new file mode 100644 index 000000000..af765299f --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/bin/main/META-INF/spring.schemas @@ -0,0 +1,5 @@ +http\://www.springframework.org/schema/security/spring-security-oauth2-1.0.xsd=org/springframework/security/oauth2/spring-security-oauth2-1.0.xsd +http\://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd=org/springframework/security/oauth2/spring-security-oauth2-2.0.xsd +http\://www.springframework.org/schema/security/spring-security-oauth2.xsd=org/springframework/security/oauth2/spring-security-oauth2-2.0.xsd +http\://www.springframework.org/schema/security/spring-security-oauth-1.0.xsd=org/springframework/security/oauth/spring-security-oauth-1.0.xsd +http\://www.springframework.org/schema/security/spring-security-oauth.xsd=org/springframework/security/oauth/spring-security-oauth-1.0.xsd \ No newline at end of file diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/build.gradle b/maxkey-protocols/maxkey-protocol-oauth-2.0/build.gradle index f6d929917..cef067c21 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/build.gradle +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/build.gradle @@ -5,6 +5,7 @@ dependencies { compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar') compile project(":maxkey-core") + compile project(":maxkey-dao") compile project(":maxkey-jose-jwt") compile project(":maxkey-protocols:maxkey-protocol-authorize") diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/JdbcAuthorizationCodeServices.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/JdbcAuthorizationCodeServices.java index 60ce2abda..676657d5e 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/JdbcAuthorizationCodeServices.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/code/JdbcAuthorizationCodeServices.java @@ -6,8 +6,8 @@ import java.sql.Types; import javax.sql.DataSource; -import org.maxkey.authz.oauth2.common.util.SerializationUtils; import org.maxkey.authz.oauth2.provider.OAuth2Authentication; +import org.maxkey.util.SerializationUtils; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/JdbcTokenStore.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/JdbcTokenStore.java index faf4383a7..667b90318 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/JdbcTokenStore.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/JdbcTokenStore.java @@ -17,11 +17,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.maxkey.authz.oauth2.common.OAuth2AccessToken; import org.maxkey.authz.oauth2.common.OAuth2RefreshToken; -import org.maxkey.authz.oauth2.common.util.SerializationUtils; import org.maxkey.authz.oauth2.provider.OAuth2Authentication; import org.maxkey.authz.oauth2.provider.token.AuthenticationKeyGenerator; import org.maxkey.authz.oauth2.provider.token.DefaultAuthenticationKeyGenerator; import org.maxkey.authz.oauth2.provider.token.TokenStore; +import org.maxkey.util.SerializationUtils; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/bin/main/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-saml-2.0/bin/main/META-INF/MANIFEST.MF new file mode 100644 index 000000000..254272e1c --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/bin/main/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java index a48624265..59c83ec2b 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java @@ -76,7 +76,7 @@ public class ConsumerEndpoint { private String assertionConsumerServiceURL; @Autowired - @Qualifier("bindingAdpater") + @Qualifier("extractRedirectBindingAdapter") private ExtractBindingAdapter extractBindingAdapter; @Autowired diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/bin/main/META-INF/MANIFEST.MF b/maxkey-protocols/maxkey-protocol-tokenbased/bin/main/META-INF/MANIFEST.MF new file mode 100644 index 000000000..254272e1c --- /dev/null +++ b/maxkey-protocols/maxkey-protocol-tokenbased/bin/main/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/maxkey-web-manage/.settings/org.eclipse.wst.common.component b/maxkey-web-manage/.settings/org.eclipse.wst.common.component index f0cd3398d..97c8a9e93 100644 --- a/maxkey-web-manage/.settings/org.eclipse.wst.common.component +++ b/maxkey-web-manage/.settings/org.eclipse.wst.common.component @@ -5,26 +5,23 @@ - - uses - - - uses - - - uses - - - uses - uses uses + + uses + uses + + uses + + + uses + diff --git a/maxkey-web-maxkey/.settings/org.eclipse.core.resources.prefs b/maxkey-web-maxkey/.settings/org.eclipse.core.resources.prefs index 896a9a53a..68380449f 100644 --- a/maxkey-web-maxkey/.settings/org.eclipse.core.resources.prefs +++ b/maxkey-web-maxkey/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,5 @@ eclipse.preferences.version=1 -encoding/=UTF-8 \ No newline at end of file +encoding//src/main/resources/templates/views/authorize/formbased_netease_163email_sso_submint.ftl=UTF-8 +encoding//src/main/resources/templates/views/authorize/formbased_redirect_post_submint.ftl=UTF-8 +encoding//src/main/resources/templates/views/profile/myProfile.ftl=UTF-8 +encoding/=UTF-8 diff --git a/maxkey-web-maxkey/.settings/org.eclipse.wst.common.component b/maxkey-web-maxkey/.settings/org.eclipse.wst.common.component index f7cbf6de4..2fb6a1292 100644 --- a/maxkey-web-maxkey/.settings/org.eclipse.wst.common.component +++ b/maxkey-web-maxkey/.settings/org.eclipse.wst.common.component @@ -5,9 +5,24 @@ + + uses + + + uses + + + uses + + + uses + uses + + uses + uses @@ -29,23 +44,8 @@ uses - - uses - uses - - uses - - - uses - - - uses - - - uses - diff --git a/maxkey-web-maxkey/build.gradle b/maxkey-web-maxkey/build.gradle index 0b6c68dc1..e2fe264c7 100644 --- a/maxkey-web-maxkey/build.gradle +++ b/maxkey-web-maxkey/build.gradle @@ -21,10 +21,7 @@ dependencies { tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}", "org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}", "org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}" - - //local jars - compile fileTree(dir: '../maxkey-lib/', include: '*/*.jar') - + compile project(":maxkey-core") compile project(":maxkey-dao") compile project(":maxkey-jose-jwt") diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java new file mode 100644 index 000000000..f57e1c5fe --- /dev/null +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyApplication.java @@ -0,0 +1,19 @@ +package org.maxkey; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + +@SpringBootApplication +public class MaxKeyApplication extends SpringBootServletInitializer { + + public static void main(String[] args) { + SpringApplication.run(MaxKeyApplication.class, args); + } + + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(MaxKeyApplication.class); + } + +} diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java new file mode 100644 index 000000000..deb10a939 --- /dev/null +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java @@ -0,0 +1,10 @@ +package org.maxkey; + +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.ImportResource; + +@Configuration +@ImportResource(locations={"classpath:spring/maxkey.xml"}) +public class MaxKeyConfig { + +} diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java index fcd657a8a..644d0ae20 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/AppListController.java @@ -79,11 +79,6 @@ public class AppListController{ WebContext.setAttribute(app.getId(), app.getIcon()); } - if(appList.size()%5>0){ - for(int i=0;i<=appList.size()%5;i++){ - appList.add(new UserApplications()); - } - } return appList; } diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/OneTimePasswordController.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/OneTimePasswordController.java index fcce9d467..e8377da8e 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/OneTimePasswordController.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/OneTimePasswordController.java @@ -54,7 +54,7 @@ public class OneTimePasswordController { @RequestMapping(value={"/timebased"}) public ModelAndView timebased(){ - ModelAndView modelAndView=new ModelAndView("otp/timeBased"); + ModelAndView modelAndView=new ModelAndView("safe/timeBased"); UserInfo userInfo=WebContext.getUserInfo(); String sharedSecret=passwordReciprocal.decoder(userInfo.getSharedSecret()); timeBasedKeyUriFormat.setSecret(sharedSecret); @@ -84,7 +84,7 @@ public class OneTimePasswordController { @RequestMapping(value={"/counterbased"}) public ModelAndView counterbased(){ - ModelAndView modelAndView=new ModelAndView("otp/counterBased"); + ModelAndView modelAndView=new ModelAndView("safe/counterBased"); UserInfo userInfo=WebContext.getUserInfo(); String sharedSecret=passwordReciprocal.decoder(userInfo.getSharedSecret()); counterBasedKeyUriFormat.setSecret(sharedSecret); @@ -117,7 +117,7 @@ public class OneTimePasswordController { @RequestMapping(value={"/hotp"}) public ModelAndView hotp(){ - ModelAndView modelAndView=new ModelAndView("otp/hotp"); + ModelAndView modelAndView=new ModelAndView("safe/hotp"); UserInfo userInfo=WebContext.getUserInfo(); String sharedSecret=passwordReciprocal.decoder(userInfo.getSharedSecret()); hotpKeyUriFormat.setSecret(sharedSecret); diff --git a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java index a77d3a3c4..83277298c 100644 --- a/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java +++ b/maxkey-web-maxkey/src/main/java/org/maxkey/web/endpoint/LoginEndpoint.java @@ -67,9 +67,9 @@ public class LoginEndpoint { @Qualifier("userInfoService") UserInfoService userInfoService; - @Autowired + /*@Autowired @Qualifier("wsFederationService") - WsFederationService wsFederationService; + WsFederationService wsFederationService;*/ @Autowired @Qualifier("authenticationProvider") @@ -117,7 +117,7 @@ public class LoginEndpoint { if(applicationConfig.getLoginConfig().isWsFederation()&& StringUtils.isNotEmpty(wsFederationWA) && wsFederationWA.equalsIgnoreCase(WsFederationConstants.WSIGNIN)){ - isAuthenticated=wsFederationService.login(wsFederationWA,wsFederationWResult,request); + //isAuthenticated=wsFederationService.login(wsFederationWA,wsFederationWResult,request); } } diff --git a/maxkey-web-maxkey/src/main/resources/application.properties b/maxkey-web-maxkey/src/main/resources/application.properties new file mode 100644 index 000000000..dda4f0bb4 --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/application.properties @@ -0,0 +1,22 @@ +#server config +#spring.profiles.active=dev +#server port +server.port=80 +#web app context path +server.servlet.context-path=/maxkey + +#for freemarker +spring.freemarker.template-loader-path=classpath:/templates/views +spring.freemarker.cache=false +spring.freemarker.charset=UTF-8 +spring.freemarker.check-template-location=true +spring.freemarker.content-type=text/html +spring.freemarker.expose-request-attributes=false +spring.freemarker.expose-session-attributes=false +spring.freemarker.request-context-attribute=request +spring.freemarker.suffix=.ftl + +#static resources +spring.mvc.static-path-pattern=/static/** + +spring.main.allow-bean-definition-overriding=true \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/log4j2.xml b/maxkey-web-maxkey/src/main/resources/log4j2.xml index c7a23b2c7..9c1ab46a5 100644 --- a/maxkey-web-maxkey/src/main/resources/log4j2.xml +++ b/maxkey-web-maxkey/src/main/resources/log4j2.xml @@ -5,22 +5,16 @@ - - - + + - - + diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-persistence.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-persistence.xml similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-persistence.xml rename to maxkey-web-maxkey/src/main/resources/spring/maxkey-persistence.xml diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-protocol-cas.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-protocol-cas.xml similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-protocol-cas.xml rename to maxkey-web-maxkey/src/main/resources/spring/maxkey-protocol-cas.xml diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-protocol-oauth2.0.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-protocol-oauth2.0.xml similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-protocol-oauth2.0.xml rename to maxkey-web-maxkey/src/main/resources/spring/maxkey-protocol-oauth2.0.xml diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-protocol-saml.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-protocol-saml.xml similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-protocol-saml.xml rename to maxkey-web-maxkey/src/main/resources/spring/maxkey-protocol-saml.xml diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-protocol.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-protocol.xml similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-protocol.xml rename to maxkey-web-maxkey/src/main/resources/spring/maxkey-protocol.xml diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-security.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-security.xml similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-security.xml rename to maxkey-web-maxkey/src/main/resources/spring/maxkey-security.xml diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-basic.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-support-basic.xml similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-basic.xml rename to maxkey-web-maxkey/src/main/resources/spring/maxkey-support-basic.xml diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-httpheader.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-support-httpheader.xml similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-httpheader.xml rename to maxkey-web-maxkey/src/main/resources/spring/maxkey-support-httpheader.xml diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-jwt.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-support-jwt.xml similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-jwt.xml rename to maxkey-web-maxkey/src/main/resources/spring/maxkey-support-jwt.xml diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-kerberos.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-support-kerberos.xml similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-kerberos.xml rename to maxkey-web-maxkey/src/main/resources/spring/maxkey-support-kerberos.xml diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-social.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-support-social.xml similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-social.xml rename to maxkey-web-maxkey/src/main/resources/spring/maxkey-support-social.xml diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-wsfederation.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-support-wsfederation.xml similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-wsfederation.xml rename to maxkey-web-maxkey/src/main/resources/spring/maxkey-support-wsfederation.xml diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-support.xml similarity index 96% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support.xml rename to maxkey-web-maxkey/src/main/resources/spring/maxkey-support.xml index 06cf637fb..07bcd79d7 100644 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support.xml +++ b/maxkey-web-maxkey/src/main/resources/spring/maxkey-support.xml @@ -26,11 +26,10 @@ - - - - diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-task.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-task.xml similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-task.xml rename to maxkey-web-maxkey/src/main/resources/spring/maxkey-task.xml diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-web.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey-web.xml similarity index 97% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-web.xml rename to maxkey-web-maxkey/src/main/resources/spring/maxkey-web.xml index a4a3d5b95..83ae9edea 100644 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-web.xml +++ b/maxkey-web-maxkey/src/main/resources/spring/maxkey-web.xml @@ -108,9 +108,9 @@ - - - + diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey.xml b/maxkey-web-maxkey/src/main/resources/spring/maxkey.xml similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey.xml rename to maxkey-web-maxkey/src/main/resources/spring/maxkey.xml diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap-grid.css b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap-grid.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap-grid.css rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap-grid.css diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap-grid.css.map b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap-grid.css.map similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap-grid.css.map rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap-grid.css.map diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap-grid.min.css b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap-grid.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap-grid.min.css rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap-grid.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap-grid.min.css.map b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap-grid.min.css.map similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap-grid.min.css.map rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap-grid.min.css.map diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap-reboot.css b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap-reboot.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap-reboot.css rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap-reboot.css diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap-reboot.css.map b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap-reboot.css.map similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap-reboot.css.map rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap-reboot.css.map diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap-reboot.min.css b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap-reboot.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap-reboot.min.css rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap-reboot.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap-reboot.min.css.map b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap-reboot.min.css.map similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap-reboot.min.css.map rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap-reboot.min.css.map diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap.css b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap.css rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap.css diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap.css.map b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap.css.map similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap.css.map rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap.css.map diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap.min.css b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap.min.css rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap.min.css.map b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap.min.css.map similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/css/bootstrap.min.css.map rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/css/bootstrap.min.css.map diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/js/bootstrap.bundle.js b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/js/bootstrap.bundle.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/js/bootstrap.bundle.js rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/js/bootstrap.bundle.js diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/js/bootstrap.bundle.js.map b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/js/bootstrap.bundle.js.map similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/js/bootstrap.bundle.js.map rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/js/bootstrap.bundle.js.map diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/js/bootstrap.bundle.min.js b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/js/bootstrap.bundle.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/js/bootstrap.bundle.min.js rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/js/bootstrap.bundle.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/js/bootstrap.bundle.min.js.map b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/js/bootstrap.bundle.min.js.map similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/js/bootstrap.bundle.min.js.map rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/js/bootstrap.bundle.min.js.map diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/js/bootstrap.js b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/js/bootstrap.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/js/bootstrap.js rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/js/bootstrap.js diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/js/bootstrap.js.map b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/js/bootstrap.js.map similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/js/bootstrap.js.map rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/js/bootstrap.js.map diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/js/bootstrap.min.js b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/js/bootstrap.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/js/bootstrap.min.js rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/js/bootstrap.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/js/bootstrap.min.js.map b/maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/js/bootstrap.min.js.map similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/bootstrap-4.3.1/js/bootstrap.min.js.map rename to maxkey-web-maxkey/src/main/resources/static/bootstrap-4.3.1/js/bootstrap.min.js.map diff --git a/maxkey-web-maxkey/src/main/webapp/css/base.css b/maxkey-web-maxkey/src/main/resources/static/css/base.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/base.css rename to maxkey-web-maxkey/src/main/resources/static/css/base.css diff --git a/maxkey-web-maxkey/src/main/webapp/css/base2.css b/maxkey-web-maxkey/src/main/resources/static/css/base2.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/base2.css rename to maxkey-web-maxkey/src/main/resources/static/css/base2.css diff --git a/maxkey-web-maxkey/src/main/webapp/css/blitzer/images/animated-overlay.gif b/maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/animated-overlay.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/blitzer/images/animated-overlay.gif rename to maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/animated-overlay.gif diff --git a/maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_diagonals-thick_75_f3d8d8_40x40.png b/maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_diagonals-thick_75_f3d8d8_40x40.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_diagonals-thick_75_f3d8d8_40x40.png rename to maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_diagonals-thick_75_f3d8d8_40x40.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_dots-small_65_a6a6a6_2x2.png b/maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_dots-small_65_a6a6a6_2x2.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_dots-small_65_a6a6a6_2x2.png rename to maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_dots-small_65_a6a6a6_2x2.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_flat_0_333333_40x100.png b/maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_flat_0_333333_40x100.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_flat_0_333333_40x100.png rename to maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_flat_0_333333_40x100.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_flat_65_ffffff_40x100.png b/maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_flat_65_ffffff_40x100.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_flat_65_ffffff_40x100.png rename to maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_flat_65_ffffff_40x100.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_flat_75_ffffff_40x100.png b/maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_flat_75_ffffff_40x100.png rename to maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_flat_75_ffffff_40x100.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_glass_55_fbf8ee_1x400.png b/maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_glass_55_fbf8ee_1x400.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_glass_55_fbf8ee_1x400.png rename to maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_glass_55_fbf8ee_1x400.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_highlight-hard_100_eeeeee_1x100.png b/maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_highlight-hard_100_eeeeee_1x100.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_highlight-hard_100_eeeeee_1x100.png rename to maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_highlight-hard_100_eeeeee_1x100.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_highlight-hard_100_f6f6f6_1x100.png b/maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_highlight-hard_100_f6f6f6_1x100.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_highlight-hard_100_f6f6f6_1x100.png rename to maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_highlight-hard_100_f6f6f6_1x100.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_highlight-soft_15_cc0000_1x100.png b/maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_highlight-soft_15_cc0000_1x100.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-bg_highlight-soft_15_cc0000_1x100.png rename to maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-bg_highlight-soft_15_cc0000_1x100.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-icons_004276_256x240.png b/maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-icons_004276_256x240.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-icons_004276_256x240.png rename to maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-icons_004276_256x240.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-icons_cc0000_256x240.png b/maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-icons_cc0000_256x240.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-icons_cc0000_256x240.png rename to maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-icons_cc0000_256x240.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-icons_ffffff_256x240.png b/maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-icons_ffffff_256x240.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/blitzer/images/ui-icons_ffffff_256x240.png rename to maxkey-web-maxkey/src/main/resources/static/css/blitzer/images/ui-icons_ffffff_256x240.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/blitzer/jquery-ui-1.10.2.custom.css b/maxkey-web-maxkey/src/main/resources/static/css/blitzer/jquery-ui-1.10.2.custom.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/blitzer/jquery-ui-1.10.2.custom.css rename to maxkey-web-maxkey/src/main/resources/static/css/blitzer/jquery-ui-1.10.2.custom.css diff --git a/maxkey-web-maxkey/src/main/webapp/css/blitzer/jquery-ui-1.10.2.custom.min.css b/maxkey-web-maxkey/src/main/resources/static/css/blitzer/jquery-ui-1.10.2.custom.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/blitzer/jquery-ui-1.10.2.custom.min.css rename to maxkey-web-maxkey/src/main/resources/static/css/blitzer/jquery-ui-1.10.2.custom.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/css/flick/images/animated-overlay.gif b/maxkey-web-maxkey/src/main/resources/static/css/flick/images/animated-overlay.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/flick/images/animated-overlay.gif rename to maxkey-web-maxkey/src/main/resources/static/css/flick/images/animated-overlay.gif diff --git a/maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-bg_flat_0_aaaaaa_40x100.png b/maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-bg_flat_0_aaaaaa_40x100.png rename to maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-bg_flat_0_eeeeee_40x100.png b/maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-bg_flat_0_eeeeee_40x100.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-bg_flat_0_eeeeee_40x100.png rename to maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-bg_flat_0_eeeeee_40x100.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-bg_flat_55_ffffff_40x100.png b/maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-bg_flat_55_ffffff_40x100.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-bg_flat_55_ffffff_40x100.png rename to maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-bg_flat_55_ffffff_40x100.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-bg_flat_75_ffffff_40x100.png b/maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-bg_flat_75_ffffff_40x100.png rename to maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-bg_flat_75_ffffff_40x100.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-bg_glass_65_ffffff_1x400.png b/maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-bg_glass_65_ffffff_1x400.png rename to maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png b/maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png rename to maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-bg_highlight-soft_25_0073ea_1x100.png b/maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-bg_highlight-soft_25_0073ea_1x100.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-bg_highlight-soft_25_0073ea_1x100.png rename to maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-bg_highlight-soft_25_0073ea_1x100.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-bg_highlight-soft_50_dddddd_1x100.png b/maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-bg_highlight-soft_50_dddddd_1x100.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-bg_highlight-soft_50_dddddd_1x100.png rename to maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-bg_highlight-soft_50_dddddd_1x100.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-icons_0073ea_256x240.png b/maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-icons_0073ea_256x240.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-icons_0073ea_256x240.png rename to maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-icons_0073ea_256x240.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-icons_454545_256x240.png b/maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-icons_454545_256x240.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-icons_454545_256x240.png rename to maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-icons_454545_256x240.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-icons_666666_256x240.png b/maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-icons_666666_256x240.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-icons_666666_256x240.png rename to maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-icons_666666_256x240.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-icons_ff0084_256x240.png b/maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-icons_ff0084_256x240.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-icons_ff0084_256x240.png rename to maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-icons_ff0084_256x240.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-icons_ffffff_256x240.png b/maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-icons_ffffff_256x240.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/flick/images/ui-icons_ffffff_256x240.png rename to maxkey-web-maxkey/src/main/resources/static/css/flick/images/ui-icons_ffffff_256x240.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/flick/jquery-ui-1.10.2.custom.css b/maxkey-web-maxkey/src/main/resources/static/css/flick/jquery-ui-1.10.2.custom.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/flick/jquery-ui-1.10.2.custom.css rename to maxkey-web-maxkey/src/main/resources/static/css/flick/jquery-ui-1.10.2.custom.css diff --git a/maxkey-web-maxkey/src/main/webapp/css/flick/jquery-ui-1.10.2.custom.min.css b/maxkey-web-maxkey/src/main/resources/static/css/flick/jquery-ui-1.10.2.custom.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/flick/jquery-ui-1.10.2.custom.min.css rename to maxkey-web-maxkey/src/main/resources/static/css/flick/jquery-ui-1.10.2.custom.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/css/login.css b/maxkey-web-maxkey/src/main/resources/static/css/login.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/login.css rename to maxkey-web-maxkey/src/main/resources/static/css/login.css diff --git a/maxkey-web-maxkey/src/main/webapp/css/menu.css b/maxkey-web-maxkey/src/main/resources/static/css/menu.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/menu.css rename to maxkey-web-maxkey/src/main/resources/static/css/menu.css diff --git a/maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/animated-overlay.gif b/maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/animated-overlay.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/animated-overlay.gif rename to maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/animated-overlay.gif diff --git a/maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png rename to maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png rename to maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png rename to maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png rename to maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png rename to maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png b/maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png rename to maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png rename to maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png rename to maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png rename to maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-icons_222222_256x240.png b/maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-icons_222222_256x240.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-icons_222222_256x240.png rename to maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-icons_222222_256x240.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-icons_228ef1_256x240.png b/maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-icons_228ef1_256x240.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-icons_228ef1_256x240.png rename to maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-icons_228ef1_256x240.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-icons_ef8c08_256x240.png b/maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-icons_ef8c08_256x240.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-icons_ef8c08_256x240.png rename to maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-icons_ef8c08_256x240.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-icons_ffd27a_256x240.png b/maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-icons_ffd27a_256x240.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-icons_ffd27a_256x240.png rename to maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-icons_ffd27a_256x240.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-icons_ffffff_256x240.png b/maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-icons_ffffff_256x240.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/ui-lightness/images/ui-icons_ffffff_256x240.png rename to maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/images/ui-icons_ffffff_256x240.png diff --git a/maxkey-web-maxkey/src/main/webapp/css/ui-lightness/jquery-ui-1.10.2.custom.css b/maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/jquery-ui-1.10.2.custom.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/ui-lightness/jquery-ui-1.10.2.custom.css rename to maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/jquery-ui-1.10.2.custom.css diff --git a/maxkey-web-maxkey/src/main/webapp/css/ui-lightness/jquery-ui-1.10.2.custom.min.css b/maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/jquery-ui-1.10.2.custom.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/css/ui-lightness/jquery-ui-1.10.2.custom.min.css rename to maxkey-web-maxkey/src/main/resources/static/css/ui-lightness/jquery-ui-1.10.2.custom.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/images/checkbox.png b/maxkey-web-maxkey/src/main/resources/static/images/checkbox.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/images/checkbox.png rename to maxkey-web-maxkey/src/main/resources/static/images/checkbox.png diff --git a/maxkey-web-maxkey/src/main/webapp/images/favicon.ico b/maxkey-web-maxkey/src/main/resources/static/images/favicon.ico similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/images/favicon.ico rename to maxkey-web-maxkey/src/main/resources/static/images/favicon.ico diff --git a/maxkey-web-maxkey/src/main/webapp/images/grid.png b/maxkey-web-maxkey/src/main/resources/static/images/grid.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/images/grid.png rename to maxkey-web-maxkey/src/main/resources/static/images/grid.png diff --git a/maxkey-web-maxkey/src/main/webapp/images/grid_sel.png b/maxkey-web-maxkey/src/main/resources/static/images/grid_sel.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/images/grid_sel.png rename to maxkey-web-maxkey/src/main/resources/static/images/grid_sel.png diff --git a/maxkey-web-maxkey/src/main/webapp/images/list.png b/maxkey-web-maxkey/src/main/resources/static/images/list.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/images/list.png rename to maxkey-web-maxkey/src/main/resources/static/images/list.png diff --git a/maxkey-web-maxkey/src/main/webapp/images/list_sel.png b/maxkey-web-maxkey/src/main/resources/static/images/list_sel.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/images/list_sel.png rename to maxkey-web-maxkey/src/main/resources/static/images/list_sel.png diff --git a/maxkey-web-maxkey/src/main/webapp/images/loading_img.gif b/maxkey-web-maxkey/src/main/resources/static/images/loading_img.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/images/loading_img.gif rename to maxkey-web-maxkey/src/main/resources/static/images/loading_img.gif diff --git a/maxkey-web-maxkey/src/main/webapp/images/logo.jpg b/maxkey-web-maxkey/src/main/resources/static/images/logo.jpg similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/images/logo.jpg rename to maxkey-web-maxkey/src/main/resources/static/images/logo.jpg diff --git a/maxkey-web-maxkey/src/main/webapp/images/progress_bar.gif b/maxkey-web-maxkey/src/main/resources/static/images/progress_bar.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/images/progress_bar.gif rename to maxkey-web-maxkey/src/main/resources/static/images/progress_bar.gif diff --git a/maxkey-web-maxkey/src/main/webapp/images/social/facebook.png b/maxkey-web-maxkey/src/main/resources/static/images/social/facebook.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/images/social/facebook.png rename to maxkey-web-maxkey/src/main/resources/static/images/social/facebook.png diff --git a/maxkey-web-maxkey/src/main/webapp/images/social/google.png b/maxkey-web-maxkey/src/main/resources/static/images/social/google.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/images/social/google.png rename to maxkey-web-maxkey/src/main/resources/static/images/social/google.png diff --git a/maxkey-web-maxkey/src/main/webapp/images/social/live.png b/maxkey-web-maxkey/src/main/resources/static/images/social/live.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/images/social/live.png rename to maxkey-web-maxkey/src/main/resources/static/images/social/live.png diff --git a/maxkey-web-maxkey/src/main/webapp/images/social/qq.png b/maxkey-web-maxkey/src/main/resources/static/images/social/qq.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/images/social/qq.png rename to maxkey-web-maxkey/src/main/resources/static/images/social/qq.png diff --git a/maxkey-web-maxkey/src/main/webapp/images/social/sinaweibo.png b/maxkey-web-maxkey/src/main/resources/static/images/social/sinaweibo.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/images/social/sinaweibo.png rename to maxkey-web-maxkey/src/main/resources/static/images/social/sinaweibo.png diff --git a/maxkey-web-maxkey/src/main/webapp/images/uploadimage.jpg b/maxkey-web-maxkey/src/main/resources/static/images/uploadimage.jpg similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/images/uploadimage.jpg rename to maxkey-web-maxkey/src/main/resources/static/images/uploadimage.jpg diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/README.md b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/README.md similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/README.md rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/README.md diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/artDialog.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/artDialog.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/artDialog.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/artDialog.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/artDialog.plugins.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/artDialog.plugins.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/artDialog.plugins.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/artDialog.plugins.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/index.html.txt b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/index.html.txt similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/index.html.txt rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/index.html.txt diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/jquery.artDialog.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/jquery.artDialog.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/jquery.artDialog.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/jquery.artDialog.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/license.txt b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/license.txt similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/license.txt rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/license.txt diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/aero.css b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/aero.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/aero.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/aero.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/aero/aero_s.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/aero/aero_s.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/aero/aero_s.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/aero/aero_s.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/aero/aero_s2.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/aero/aero_s2.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/aero/aero_s2.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/aero/aero_s2.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/black.css b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/black.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/black.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/black.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/black/bg.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/black/bg.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/black/bg.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/black/bg.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/black/bg2.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/black/bg2.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/black/bg2.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/black/bg2.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/black/bg_css3.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/black/bg_css3.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/black/bg_css3.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/black/bg_css3.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/black/bg_css3_2.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/black/bg_css3_2.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/black/bg_css3_2.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/black/bg_css3_2.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/blue.css b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/blue.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/blue.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/blue.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/blue/bg.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/blue/bg.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/blue/bg.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/blue/bg.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/blue/bg2.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/blue/bg2.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/blue/bg2.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/blue/bg2.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/blue/bg_css3.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/blue/bg_css3.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/blue/bg_css3.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/blue/bg_css3.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/blue/bg_css3_2.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/blue/bg_css3_2.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/blue/bg_css3_2.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/blue/bg_css3_2.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/chrome.css b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/chrome.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/chrome.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/chrome.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/chrome/border.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/chrome/border.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/chrome/border.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/chrome/border.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/chrome/chrome_s.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/chrome/chrome_s.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/chrome/chrome_s.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/chrome/chrome_s.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/default.css b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/default.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/default.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/default.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/green.css b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/green.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/green.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/green.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/green/bg.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/green/bg.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/green/bg.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/green/bg.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/green/bg2.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/green/bg2.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/green/bg2.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/green/bg2.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/green/bg_css3.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/green/bg_css3.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/green/bg_css3.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/green/bg_css3.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/green/bg_css3_2.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/green/bg_css3_2.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/green/bg_css3_2.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/green/bg_css3_2.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/green/color_bg.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/green/color_bg.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/green/color_bg.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/green/color_bg.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/idialog.css b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/idialog.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/idialog.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/idialog.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/idialog/idialog_s.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/idialog/idialog_s.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/idialog/idialog_s.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/idialog/idialog_s.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/idialog/idialog_s2.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/idialog/idialog_s2.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/idialog/idialog_s2.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/idialog/idialog_s2.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/loading.gif b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/loading.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/loading.gif rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/loading.gif diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/opera.css b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/opera.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/opera.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/opera.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/opera/s1.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/opera/s1.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/opera/s1.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/opera/s1.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/opera/s2.png b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/opera/s2.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/opera/s2.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/opera/s2.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/platform.css b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/platform.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/platform.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/platform.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/simple.css b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/simple.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/simple.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/simple.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/twitter.css b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/twitter.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/skins/twitter.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/skins/twitter.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/source/artDialog.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/source/artDialog.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/source/artDialog.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/source/artDialog.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/source/artDialog.plugins.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/source/artDialog.plugins.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/source/artDialog.plugins.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/source/artDialog.plugins.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/source/jquery.artDialog.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/source/jquery.artDialog.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-5.0.4/source/jquery.artDialog.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-5.0.4/source/jquery.artDialog.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/.gitignore b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/.gitignore similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/.gitignore rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/.gitignore diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/Gruntfile.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/Gruntfile.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/Gruntfile.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/Gruntfile.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/LICENSE.md b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/LICENSE.md similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/LICENSE.md rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/LICENSE.md diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/README.md b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/README.md similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/README.md rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/README.md diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/_config.yml b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/_config.yml similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/_config.yml rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/_config.yml diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/css/dialog.css b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/css/dialog.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/css/dialog.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/css/dialog.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/dist/dialog-plus.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/dist/dialog-plus.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/dist/dialog-plus.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/dist/dialog-plus.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/dist/dialog.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/dist/dialog.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/dist/dialog.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/dist/dialog.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/doc/build/index.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/build/index.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/doc/build/index.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/build/index.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/doc/css/doc.css b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/css/doc.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/doc/css/doc.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/css/doc.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/doc/index.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/index.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/doc/index.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/index.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/doc/index.md b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/index.md similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/doc/index.md rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/index.md diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/doc/js/doc.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/js/doc.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/doc/js/doc.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/js/doc.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/doc/template/index.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/template/index.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/doc/template/index.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/template/index.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/lib/jquery-1.10.2.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/lib/jquery-1.10.2.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/lib/jquery-1.10.2.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/lib/jquery-1.10.2.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/package.json b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/package.json similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/package.json rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/package.json diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/src/dialog-config.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/src/dialog-config.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/src/dialog-config.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/src/dialog-config.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/src/dialog-plus.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/src/dialog-plus.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/src/dialog-plus.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/src/dialog-plus.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/src/dialog.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/src/dialog.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/src/dialog.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/src/dialog.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/src/drag.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/src/drag.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/src/drag.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/src/drag.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/src/popup.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/src/popup.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/src/popup.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/src/popup.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/align-overflow.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/align-overflow.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/align-overflow.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/align-overflow.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/align.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/align.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/align.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/align.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/button.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/button.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/button.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/button.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/close.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/close.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/close.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/close.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/content-element.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/content-element.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/content-element.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/content-element.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/content.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/content.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/content.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/content.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/dialog-drag.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/dialog-drag.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/dialog-drag.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/dialog-drag.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/fixed.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/fixed.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/fixed.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/fixed.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/focus.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/focus.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/focus.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/focus.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/follow.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/follow.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/follow.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/follow.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/iframe.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/iframe.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/iframe.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/iframe.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/iframe/dialog-content.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/iframe/dialog-content.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/iframe/dialog-content.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/iframe/dialog-content.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/iframe/dialog-input.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/iframe/dialog-input.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/iframe/dialog-input.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/iframe/dialog-input.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/iframe/index.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/iframe/index.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/iframe/index.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/iframe/index.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/iframe/main.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/iframe/main.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/iframe/main.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/iframe/main.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/loading.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/loading.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/loading.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/loading.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/quickClose.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/quickClose.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/quickClose.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/quickClose.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/show-element.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/show-element.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/show-element.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/show-element.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/show-event.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/show-event.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/show-event.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/show-event.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/show.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/show.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/show.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/show.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/showModal.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/showModal.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/showModal.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/showModal.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/title.html b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/title.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/test/title.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/title.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/webpack.config.js b/maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/webpack.config.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/artDialog-v7.0/webpack.config.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/webpack.config.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/bootstrap-table-locale-all.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/bootstrap-table-locale-all.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/bootstrap-table-locale-all.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/bootstrap-table-locale-all.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/bootstrap-table-locale-all.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/bootstrap-table-locale-all.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/bootstrap-table-locale-all.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/bootstrap-table-locale-all.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/bootstrap-table.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/bootstrap-table.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/bootstrap-table.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/bootstrap-table.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/bootstrap-table.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/bootstrap-table.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/bootstrap-table.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/bootstrap-table.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/bootstrap-table.min.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/bootstrap-table.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/bootstrap-table.min.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/bootstrap-table.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/bootstrap-table.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/bootstrap-table.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/bootstrap-table.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/bootstrap-table.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/accent-neutralise/bootstrap-table-accent-neutralise.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/accent-neutralise/bootstrap-table-accent-neutralise.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/accent-neutralise/bootstrap-table-accent-neutralise.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/accent-neutralise/bootstrap-table-accent-neutralise.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/accent-neutralise/bootstrap-table-accent-neutralise.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/accent-neutralise/bootstrap-table-accent-neutralise.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/accent-neutralise/bootstrap-table-accent-neutralise.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/accent-neutralise/bootstrap-table-accent-neutralise.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/addrbar/bootstrap-table-addrbar.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/addrbar/bootstrap-table-addrbar.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/addrbar/bootstrap-table-addrbar.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/addrbar/bootstrap-table-addrbar.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/addrbar/bootstrap-table-addrbar.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/addrbar/bootstrap-table-addrbar.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/addrbar/bootstrap-table-addrbar.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/addrbar/bootstrap-table-addrbar.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/auto-refresh/bootstrap-table-auto-refresh.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/auto-refresh/bootstrap-table-auto-refresh.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/auto-refresh/bootstrap-table-auto-refresh.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/auto-refresh/bootstrap-table-auto-refresh.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/auto-refresh/bootstrap-table-auto-refresh.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/auto-refresh/bootstrap-table-auto-refresh.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/auto-refresh/bootstrap-table-auto-refresh.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/auto-refresh/bootstrap-table-auto-refresh.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/cookie/bootstrap-table-cookie.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/cookie/bootstrap-table-cookie.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/cookie/bootstrap-table-cookie.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/cookie/bootstrap-table-cookie.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/cookie/bootstrap-table-cookie.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/cookie/bootstrap-table-cookie.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/cookie/bootstrap-table-cookie.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/cookie/bootstrap-table-cookie.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/copy-rows/bootstrap-table-copy-rows.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/copy-rows/bootstrap-table-copy-rows.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/copy-rows/bootstrap-table-copy-rows.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/copy-rows/bootstrap-table-copy-rows.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/copy-rows/bootstrap-table-copy-rows.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/copy-rows/bootstrap-table-copy-rows.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/copy-rows/bootstrap-table-copy-rows.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/copy-rows/bootstrap-table-copy-rows.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/defer-url/bootstrap-table-defer-url.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/defer-url/bootstrap-table-defer-url.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/defer-url/bootstrap-table-defer-url.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/defer-url/bootstrap-table-defer-url.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/defer-url/bootstrap-table-defer-url.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/defer-url/bootstrap-table-defer-url.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/defer-url/bootstrap-table-defer-url.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/defer-url/bootstrap-table-defer-url.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/editable/bootstrap-table-editable.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/editable/bootstrap-table-editable.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/editable/bootstrap-table-editable.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/editable/bootstrap-table-editable.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/editable/bootstrap-table-editable.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/editable/bootstrap-table-editable.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/editable/bootstrap-table-editable.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/editable/bootstrap-table-editable.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/export/bootstrap-table-export.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/export/bootstrap-table-export.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/export/bootstrap-table-export.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/export/bootstrap-table-export.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/export/bootstrap-table-export.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/export/bootstrap-table-export.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/export/bootstrap-table-export.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/export/bootstrap-table-export.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/filter-control/bootstrap-table-filter-control.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/filter-control/bootstrap-table-filter-control.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/filter-control/bootstrap-table-filter-control.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/filter-control/bootstrap-table-filter-control.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/filter-control/bootstrap-table-filter-control.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/filter-control/bootstrap-table-filter-control.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/filter-control/bootstrap-table-filter-control.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/filter-control/bootstrap-table-filter-control.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/filter-control/bootstrap-table-filter-control.min.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/filter-control/bootstrap-table-filter-control.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/filter-control/bootstrap-table-filter-control.min.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/filter-control/bootstrap-table-filter-control.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/filter-control/bootstrap-table-filter-control.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/filter-control/bootstrap-table-filter-control.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/filter-control/bootstrap-table-filter-control.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/filter-control/bootstrap-table-filter-control.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/fixed-columns/bootstrap-table-fixed-columns.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/fixed-columns/bootstrap-table-fixed-columns.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/fixed-columns/bootstrap-table-fixed-columns.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/fixed-columns/bootstrap-table-fixed-columns.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/fixed-columns/bootstrap-table-fixed-columns.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/fixed-columns/bootstrap-table-fixed-columns.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/fixed-columns/bootstrap-table-fixed-columns.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/fixed-columns/bootstrap-table-fixed-columns.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/fixed-columns/bootstrap-table-fixed-columns.min.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/fixed-columns/bootstrap-table-fixed-columns.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/fixed-columns/bootstrap-table-fixed-columns.min.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/fixed-columns/bootstrap-table-fixed-columns.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/fixed-columns/bootstrap-table-fixed-columns.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/fixed-columns/bootstrap-table-fixed-columns.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/fixed-columns/bootstrap-table-fixed-columns.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/fixed-columns/bootstrap-table-fixed-columns.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/group-by-v2/bootstrap-table-group-by.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/group-by-v2/bootstrap-table-group-by.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/group-by-v2/bootstrap-table-group-by.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/group-by-v2/bootstrap-table-group-by.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/group-by-v2/bootstrap-table-group-by.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/group-by-v2/bootstrap-table-group-by.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/group-by-v2/bootstrap-table-group-by.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/group-by-v2/bootstrap-table-group-by.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/group-by-v2/bootstrap-table-group-by.min.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/group-by-v2/bootstrap-table-group-by.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/group-by-v2/bootstrap-table-group-by.min.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/group-by-v2/bootstrap-table-group-by.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/group-by-v2/bootstrap-table-group-by.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/group-by-v2/bootstrap-table-group-by.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/group-by-v2/bootstrap-table-group-by.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/group-by-v2/bootstrap-table-group-by.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/group-by/bootstrap-table-group-by.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/group-by/bootstrap-table-group-by.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/group-by/bootstrap-table-group-by.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/group-by/bootstrap-table-group-by.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/group-by/bootstrap-table-group-by.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/group-by/bootstrap-table-group-by.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/group-by/bootstrap-table-group-by.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/group-by/bootstrap-table-group-by.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/group-by/bootstrap-table-group-by.min.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/group-by/bootstrap-table-group-by.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/group-by/bootstrap-table-group-by.min.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/group-by/bootstrap-table-group-by.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/group-by/bootstrap-table-group-by.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/group-by/bootstrap-table-group-by.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/group-by/bootstrap-table-group-by.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/group-by/bootstrap-table-group-by.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/i18n-enhance/bootstrap-table-i18n-enhance.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/i18n-enhance/bootstrap-table-i18n-enhance.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/i18n-enhance/bootstrap-table-i18n-enhance.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/i18n-enhance/bootstrap-table-i18n-enhance.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/i18n-enhance/bootstrap-table-i18n-enhance.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/i18n-enhance/bootstrap-table-i18n-enhance.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/i18n-enhance/bootstrap-table-i18n-enhance.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/i18n-enhance/bootstrap-table-i18n-enhance.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/key-events/bootstrap-table-key-events.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/key-events/bootstrap-table-key-events.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/key-events/bootstrap-table-key-events.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/key-events/bootstrap-table-key-events.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/key-events/bootstrap-table-key-events.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/key-events/bootstrap-table-key-events.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/key-events/bootstrap-table-key-events.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/key-events/bootstrap-table-key-events.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/mobile/bootstrap-table-mobile.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/mobile/bootstrap-table-mobile.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/mobile/bootstrap-table-mobile.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/mobile/bootstrap-table-mobile.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/mobile/bootstrap-table-mobile.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/mobile/bootstrap-table-mobile.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/mobile/bootstrap-table-mobile.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/mobile/bootstrap-table-mobile.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multi-column-toggle/bootstrap-table-multi-toggle.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multi-column-toggle/bootstrap-table-multi-toggle.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multi-column-toggle/bootstrap-table-multi-toggle.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multi-column-toggle/bootstrap-table-multi-toggle.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multi-column-toggle/bootstrap-table-multi-toggle.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multi-column-toggle/bootstrap-table-multi-toggle.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multi-column-toggle/bootstrap-table-multi-toggle.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multi-column-toggle/bootstrap-table-multi-toggle.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multiple-search/bootstrap-table-multiple-search.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multiple-search/bootstrap-table-multiple-search.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multiple-search/bootstrap-table-multiple-search.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multiple-search/bootstrap-table-multiple-search.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multiple-search/bootstrap-table-multiple-search.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multiple-search/bootstrap-table-multiple-search.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multiple-search/bootstrap-table-multiple-search.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multiple-search/bootstrap-table-multiple-search.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.min.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.min.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multiple-sort/bootstrap-table-multiple-sort.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multiple-sort/bootstrap-table-multiple-sort.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multiple-sort/bootstrap-table-multiple-sort.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multiple-sort/bootstrap-table-multiple-sort.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/natural-sorting/bootstrap-table-natural-sorting.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/natural-sorting/bootstrap-table-natural-sorting.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/natural-sorting/bootstrap-table-natural-sorting.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/natural-sorting/bootstrap-table-natural-sorting.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/natural-sorting/bootstrap-table-natural-sorting.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/natural-sorting/bootstrap-table-natural-sorting.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/natural-sorting/bootstrap-table-natural-sorting.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/natural-sorting/bootstrap-table-natural-sorting.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/page-jump-to/bootstrap-table-page-jump-to.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/page-jump-to/bootstrap-table-page-jump-to.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/page-jump-to/bootstrap-table-page-jump-to.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/page-jump-to/bootstrap-table-page-jump-to.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/page-jump-to/bootstrap-table-page-jump-to.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/page-jump-to/bootstrap-table-page-jump-to.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/page-jump-to/bootstrap-table-page-jump-to.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/page-jump-to/bootstrap-table-page-jump-to.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/pipeline/bootstrap-table-pipeline.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/pipeline/bootstrap-table-pipeline.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/pipeline/bootstrap-table-pipeline.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/pipeline/bootstrap-table-pipeline.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/pipeline/bootstrap-table-pipeline.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/pipeline/bootstrap-table-pipeline.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/pipeline/bootstrap-table-pipeline.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/pipeline/bootstrap-table-pipeline.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/print/bootstrap-table-print.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/print/bootstrap-table-print.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/print/bootstrap-table-print.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/print/bootstrap-table-print.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/print/bootstrap-table-print.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/print/bootstrap-table-print.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/print/bootstrap-table-print.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/print/bootstrap-table-print.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/reorder-columns/bootstrap-table-reorder-columns.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/reorder-columns/bootstrap-table-reorder-columns.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/reorder-columns/bootstrap-table-reorder-columns.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/reorder-columns/bootstrap-table-reorder-columns.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/reorder-columns/bootstrap-table-reorder-columns.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/reorder-columns/bootstrap-table-reorder-columns.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/reorder-columns/bootstrap-table-reorder-columns.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/reorder-columns/bootstrap-table-reorder-columns.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/reorder-rows/bootstrap-table-reorder-rows.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/reorder-rows/bootstrap-table-reorder-rows.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/reorder-rows/bootstrap-table-reorder-rows.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/reorder-rows/bootstrap-table-reorder-rows.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/reorder-rows/bootstrap-table-reorder-rows.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/reorder-rows/bootstrap-table-reorder-rows.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/reorder-rows/bootstrap-table-reorder-rows.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/reorder-rows/bootstrap-table-reorder-rows.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/reorder-rows/bootstrap-table-reorder-rows.min.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/reorder-rows/bootstrap-table-reorder-rows.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/reorder-rows/bootstrap-table-reorder-rows.min.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/reorder-rows/bootstrap-table-reorder-rows.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/reorder-rows/bootstrap-table-reorder-rows.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/reorder-rows/bootstrap-table-reorder-rows.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/reorder-rows/bootstrap-table-reorder-rows.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/reorder-rows/bootstrap-table-reorder-rows.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/resizable/bootstrap-table-resizable.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/resizable/bootstrap-table-resizable.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/resizable/bootstrap-table-resizable.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/resizable/bootstrap-table-resizable.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/resizable/bootstrap-table-resizable.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/resizable/bootstrap-table-resizable.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/resizable/bootstrap-table-resizable.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/resizable/bootstrap-table-resizable.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/select2-filter/bootstrap-table-select2-filter.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/select2-filter/bootstrap-table-select2-filter.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/select2-filter/bootstrap-table-select2-filter.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/select2-filter/bootstrap-table-select2-filter.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/select2-filter/bootstrap-table-select2-filter.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/select2-filter/bootstrap-table-select2-filter.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/select2-filter/bootstrap-table-select2-filter.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/select2-filter/bootstrap-table-select2-filter.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/sticky-header/bootstrap-table-sticky-header.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/sticky-header/bootstrap-table-sticky-header.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/sticky-header/bootstrap-table-sticky-header.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/sticky-header/bootstrap-table-sticky-header.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/sticky-header/bootstrap-table-sticky-header.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/sticky-header/bootstrap-table-sticky-header.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/sticky-header/bootstrap-table-sticky-header.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/sticky-header/bootstrap-table-sticky-header.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/sticky-header/bootstrap-table-sticky-header.min.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/sticky-header/bootstrap-table-sticky-header.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/sticky-header/bootstrap-table-sticky-header.min.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/sticky-header/bootstrap-table-sticky-header.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/sticky-header/bootstrap-table-sticky-header.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/sticky-header/bootstrap-table-sticky-header.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/sticky-header/bootstrap-table-sticky-header.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/sticky-header/bootstrap-table-sticky-header.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/toolbar/bootstrap-table-toolbar.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/toolbar/bootstrap-table-toolbar.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/toolbar/bootstrap-table-toolbar.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/toolbar/bootstrap-table-toolbar.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/toolbar/bootstrap-table-toolbar.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/toolbar/bootstrap-table-toolbar.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/toolbar/bootstrap-table-toolbar.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/toolbar/bootstrap-table-toolbar.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/tree-column/bootstrap-table-tree-column.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/tree-column/bootstrap-table-tree-column.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/tree-column/bootstrap-table-tree-column.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/tree-column/bootstrap-table-tree-column.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/tree-column/bootstrap-table-tree-column.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/tree-column/bootstrap-table-tree-column.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/tree-column/bootstrap-table-tree-column.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/tree-column/bootstrap-table-tree-column.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/tree-column/bootstrap-table-tree-column.min.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/tree-column/bootstrap-table-tree-column.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/tree-column/bootstrap-table-tree-column.min.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/tree-column/bootstrap-table-tree-column.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/tree-column/bootstrap-table-tree-column.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/tree-column/bootstrap-table-tree-column.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/tree-column/bootstrap-table-tree-column.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/tree-column/bootstrap-table-tree-column.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/treegrid/bootstrap-table-treegrid.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/treegrid/bootstrap-table-treegrid.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/treegrid/bootstrap-table-treegrid.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/treegrid/bootstrap-table-treegrid.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/treegrid/bootstrap-table-treegrid.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/treegrid/bootstrap-table-treegrid.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/extensions/treegrid/bootstrap-table-treegrid.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/extensions/treegrid/bootstrap-table-treegrid.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-af-ZA.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-af-ZA.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-af-ZA.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-af-ZA.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-af-ZA.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-af-ZA.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-af-ZA.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-af-ZA.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ar-SA.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ar-SA.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ar-SA.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ar-SA.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ar-SA.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ar-SA.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ar-SA.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ar-SA.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ca-ES.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ca-ES.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ca-ES.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ca-ES.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ca-ES.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ca-ES.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ca-ES.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ca-ES.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-cs-CZ.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-cs-CZ.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-cs-CZ.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-cs-CZ.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-cs-CZ.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-cs-CZ.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-cs-CZ.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-cs-CZ.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-da-DK.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-da-DK.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-da-DK.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-da-DK.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-da-DK.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-da-DK.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-da-DK.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-da-DK.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-de-DE.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-de-DE.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-de-DE.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-de-DE.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-de-DE.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-de-DE.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-de-DE.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-de-DE.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-el-GR.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-el-GR.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-el-GR.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-el-GR.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-el-GR.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-el-GR.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-el-GR.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-el-GR.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-en-US.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-en-US.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-en-US.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-en-US.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-en-US.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-en-US.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-en-US.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-en-US.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-AR.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-AR.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-AR.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-AR.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-AR.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-AR.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-AR.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-AR.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-CL.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-CL.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-CL.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-CL.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-CL.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-CL.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-CL.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-CL.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-CR.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-CR.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-CR.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-CR.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-CR.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-CR.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-CR.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-CR.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-ES.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-ES.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-ES.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-ES.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-ES.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-ES.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-ES.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-ES.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-MX.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-MX.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-MX.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-MX.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-MX.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-MX.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-MX.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-MX.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-NI.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-NI.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-NI.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-NI.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-NI.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-NI.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-NI.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-NI.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-SP.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-SP.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-SP.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-SP.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-SP.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-SP.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-SP.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-es-SP.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-et-EE.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-et-EE.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-et-EE.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-et-EE.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-et-EE.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-et-EE.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-et-EE.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-et-EE.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-eu-EU.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-eu-EU.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-eu-EU.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-eu-EU.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-eu-EU.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-eu-EU.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-eu-EU.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-eu-EU.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fa-IR.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fa-IR.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fa-IR.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fa-IR.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fa-IR.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fa-IR.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fa-IR.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fa-IR.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fi-FI.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fi-FI.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fi-FI.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fi-FI.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fi-FI.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fi-FI.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fi-FI.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fi-FI.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fr-BE.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fr-BE.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fr-BE.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fr-BE.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fr-BE.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fr-BE.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fr-BE.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fr-BE.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fr-FR.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fr-FR.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fr-FR.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fr-FR.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fr-FR.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fr-FR.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fr-FR.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-fr-FR.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-he-IL.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-he-IL.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-he-IL.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-he-IL.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-he-IL.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-he-IL.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-he-IL.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-he-IL.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-hr-HR.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-hr-HR.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-hr-HR.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-hr-HR.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-hr-HR.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-hr-HR.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-hr-HR.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-hr-HR.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-hu-HU.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-hu-HU.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-hu-HU.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-hu-HU.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-hu-HU.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-hu-HU.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-hu-HU.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-hu-HU.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-id-ID.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-id-ID.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-id-ID.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-id-ID.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-id-ID.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-id-ID.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-id-ID.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-id-ID.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-it-IT.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-it-IT.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-it-IT.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-it-IT.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-it-IT.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-it-IT.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-it-IT.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-it-IT.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ja-JP.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ja-JP.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ja-JP.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ja-JP.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ja-JP.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ja-JP.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ja-JP.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ja-JP.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ka-GE.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ka-GE.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ka-GE.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ka-GE.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ka-GE.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ka-GE.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ka-GE.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ka-GE.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ko-KR.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ko-KR.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ko-KR.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ko-KR.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ko-KR.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ko-KR.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ko-KR.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ko-KR.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ms-MY.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ms-MY.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ms-MY.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ms-MY.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ms-MY.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ms-MY.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ms-MY.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ms-MY.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-nb-NO.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-nb-NO.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-nb-NO.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-nb-NO.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-nb-NO.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-nb-NO.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-nb-NO.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-nb-NO.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-nl-NL.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-nl-NL.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-nl-NL.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-nl-NL.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-nl-NL.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-nl-NL.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-nl-NL.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-nl-NL.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pl-PL.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pl-PL.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pl-PL.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pl-PL.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pl-PL.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pl-PL.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pl-PL.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pl-PL.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pt-BR.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pt-BR.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pt-BR.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pt-BR.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pt-BR.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pt-BR.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pt-BR.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pt-BR.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pt-PT.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pt-PT.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pt-PT.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pt-PT.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pt-PT.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pt-PT.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pt-PT.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-pt-PT.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ro-RO.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ro-RO.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ro-RO.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ro-RO.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ro-RO.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ro-RO.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ro-RO.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ro-RO.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ru-RU.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ru-RU.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ru-RU.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ru-RU.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ru-RU.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ru-RU.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ru-RU.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ru-RU.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-sk-SK.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-sk-SK.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-sk-SK.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-sk-SK.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-sk-SK.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-sk-SK.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-sk-SK.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-sk-SK.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-sv-SE.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-sv-SE.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-sv-SE.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-sv-SE.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-sv-SE.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-sv-SE.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-sv-SE.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-sv-SE.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-th-TH.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-th-TH.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-th-TH.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-th-TH.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-th-TH.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-th-TH.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-th-TH.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-th-TH.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-tr-TR.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-tr-TR.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-tr-TR.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-tr-TR.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-tr-TR.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-tr-TR.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-tr-TR.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-tr-TR.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-uk-UA.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-uk-UA.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-uk-UA.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-uk-UA.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-uk-UA.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-uk-UA.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-uk-UA.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-uk-UA.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ur-PK.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ur-PK.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ur-PK.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ur-PK.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ur-PK.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ur-PK.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ur-PK.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-ur-PK.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-uz-Latn-UZ.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-uz-Latn-UZ.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-uz-Latn-UZ.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-uz-Latn-UZ.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-uz-Latn-UZ.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-uz-Latn-UZ.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-uz-Latn-UZ.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-uz-Latn-UZ.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-vi-VN.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-vi-VN.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-vi-VN.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-vi-VN.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-vi-VN.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-vi-VN.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-vi-VN.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-vi-VN.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh-CN.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh-CN.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh-CN.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh-CN.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh-CN.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh-CN.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh-CN.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh-CN.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh-TW.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh-TW.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh-TW.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh-TW.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh-TW.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh-TW.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh-TW.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh-TW.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh_CN.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh_CN.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh_CN.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/locale/bootstrap-table-zh_CN.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/bulma/bootstrap-table-bulma.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/bulma/bootstrap-table-bulma.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/bulma/bootstrap-table-bulma.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/bulma/bootstrap-table-bulma.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/bulma/bootstrap-table-bulma.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/bulma/bootstrap-table-bulma.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/bulma/bootstrap-table-bulma.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/bulma/bootstrap-table-bulma.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/bulma/bootstrap-table-bulma.min.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/bulma/bootstrap-table-bulma.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/bulma/bootstrap-table-bulma.min.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/bulma/bootstrap-table-bulma.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/bulma/bootstrap-table-bulma.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/bulma/bootstrap-table-bulma.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/bulma/bootstrap-table-bulma.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/bulma/bootstrap-table-bulma.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/foundation/bootstrap-table-foundation.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/foundation/bootstrap-table-foundation.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/foundation/bootstrap-table-foundation.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/foundation/bootstrap-table-foundation.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/foundation/bootstrap-table-foundation.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/foundation/bootstrap-table-foundation.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/foundation/bootstrap-table-foundation.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/foundation/bootstrap-table-foundation.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/foundation/bootstrap-table-foundation.min.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/foundation/bootstrap-table-foundation.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/foundation/bootstrap-table-foundation.min.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/foundation/bootstrap-table-foundation.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/foundation/bootstrap-table-foundation.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/foundation/bootstrap-table-foundation.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/foundation/bootstrap-table-foundation.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/foundation/bootstrap-table-foundation.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/materialize/bootstrap-table-materialize.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/materialize/bootstrap-table-materialize.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/materialize/bootstrap-table-materialize.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/materialize/bootstrap-table-materialize.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/materialize/bootstrap-table-materialize.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/materialize/bootstrap-table-materialize.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/materialize/bootstrap-table-materialize.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/materialize/bootstrap-table-materialize.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/materialize/bootstrap-table-materialize.min.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/materialize/bootstrap-table-materialize.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/materialize/bootstrap-table-materialize.min.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/materialize/bootstrap-table-materialize.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/materialize/bootstrap-table-materialize.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/materialize/bootstrap-table-materialize.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/materialize/bootstrap-table-materialize.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/materialize/bootstrap-table-materialize.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/semantic/bootstrap-table-semantic.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/semantic/bootstrap-table-semantic.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/semantic/bootstrap-table-semantic.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/semantic/bootstrap-table-semantic.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/semantic/bootstrap-table-semantic.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/semantic/bootstrap-table-semantic.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/semantic/bootstrap-table-semantic.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/semantic/bootstrap-table-semantic.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/semantic/bootstrap-table-semantic.min.css b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/semantic/bootstrap-table-semantic.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/semantic/bootstrap-table-semantic.min.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/semantic/bootstrap-table-semantic.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/semantic/bootstrap-table-semantic.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/semantic/bootstrap-table-semantic.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/bootstrap-table-1.14.2/themes/semantic/bootstrap-table-semantic.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/bootstrap-table-1.14.2/themes/semantic/bootstrap-table-semantic.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/.gitignore b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/.gitignore similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/.gitignore rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/.gitignore diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/.travis.yml b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/.travis.yml similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/.travis.yml rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/.travis.yml diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/MIT-LICENSE.txt b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/MIT-LICENSE.txt similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/MIT-LICENSE.txt rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/MIT-LICENSE.txt diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/README.md b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/README.md similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/README.md rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/README.md diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/bower.json b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/bower.json similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/bower.json rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/bower.json diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/build/jquery.datetimepicker.full.js b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/build/jquery.datetimepicker.full.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/build/jquery.datetimepicker.full.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/build/jquery.datetimepicker.full.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/build/jquery.datetimepicker.full.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/build/jquery.datetimepicker.full.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/build/jquery.datetimepicker.full.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/build/jquery.datetimepicker.full.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/build/jquery.datetimepicker.min.css b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/build/jquery.datetimepicker.min.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/build/jquery.datetimepicker.min.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/build/jquery.datetimepicker.min.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/build/jquery.datetimepicker.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/build/jquery.datetimepicker.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/build/jquery.datetimepicker.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/build/jquery.datetimepicker.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/datetimepicker.jquery.json b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/datetimepicker.jquery.json similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/datetimepicker.jquery.json rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/datetimepicker.jquery.json diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/doc.tpl b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/doc.tpl similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/doc.tpl rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/doc.tpl diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/index.html b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/index.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/index.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/index.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/jquery.datetimepicker.css b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/jquery.datetimepicker.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/jquery.datetimepicker.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/jquery.datetimepicker.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/jquery.datetimepicker.js b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/jquery.datetimepicker.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/jquery.datetimepicker.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/jquery.datetimepicker.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/jquery.js b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/jquery.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/jquery.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/jquery.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/karma.conf.js b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/karma.conf.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/karma.conf.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/karma.conf.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/package-lock.json b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/package-lock.json similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/package-lock.json rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/package-lock.json diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/package.json b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/package.json similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/package.json rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/package.json diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/pull_request_template.md b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/pull_request_template.md similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/pull_request_template.md rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/pull_request_template.md diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/screen/1.png b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/screen/1.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/screen/1.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/screen/1.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/screen/2.png b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/screen/2.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/screen/2.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/screen/2.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/screen/3.1.png b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/screen/3.1.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/screen/3.1.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/screen/3.1.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/screen/3.png b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/screen/3.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/screen/3.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/screen/3.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/screen/4.png b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/screen/4.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/screen/4.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/screen/4.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/screen/5.png b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/screen/5.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/screen/5.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/screen/5.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/screen/6.png b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/screen/6.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/screen/6.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/screen/6.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/app.css b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/app.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/app.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/app.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/index.html b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/index.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/index.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/index.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/input_in_container_fixed_to_bottom_of_viewport.html b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/input_in_container_fixed_to_bottom_of_viewport.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/input_in_container_fixed_to_bottom_of_viewport.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/input_in_container_fixed_to_bottom_of_viewport.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/input_in_container_fixed_to_top_of_viewport.html b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/input_in_container_fixed_to_top_of_viewport.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/input_in_container_fixed_to_top_of_viewport.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/input_in_container_fixed_to_top_of_viewport.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/tests/bootstrap.js b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/tests/bootstrap.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/tests/bootstrap.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/tests/bootstrap.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/tests/destroy.js b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/tests/destroy.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/tests/destroy.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/tests/destroy.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/tests/events.js b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/tests/events.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/tests/events.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/tests/events.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/tests/init.js b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/tests/init.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/tests/init.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/tests/init.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/tests/methods.js b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/tests/methods.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/tests/methods.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/tests/methods.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/tests/options.js b/maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/tests/options.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/datetimepicker-2.5.20/tests/tests/options.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/datetimepicker-2.5.20/tests/tests/options.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/encrypt/base64.js b/maxkey-web-maxkey/src/main/resources/static/jquery/encrypt/base64.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/encrypt/base64.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/encrypt/base64.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/encrypt/jquery.md5.js b/maxkey-web-maxkey/src/main/resources/static/jquery/encrypt/jquery.md5.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/encrypt/jquery.md5.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/encrypt/jquery.md5.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/encrypt/jsbn.js b/maxkey-web-maxkey/src/main/resources/static/jquery/encrypt/jsbn.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/encrypt/jsbn.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/encrypt/jsbn.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/encrypt/prng4.js b/maxkey-web-maxkey/src/main/resources/static/jquery/encrypt/prng4.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/encrypt/prng4.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/encrypt/prng4.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/encrypt/rng.js b/maxkey-web-maxkey/src/main/resources/static/jquery/encrypt/rng.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/encrypt/rng.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/encrypt/rng.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/encrypt/rsa.js b/maxkey-web-maxkey/src/main/resources/static/jquery/encrypt/rsa.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/encrypt/rsa.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/encrypt/rsa.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-1.11.2.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-1.11.2.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-1.11.2.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-1.11.2.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-1.11.2.min.map b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-1.11.2.min.map similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-1.11.2.min.map rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-1.11.2.min.map diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-3.4.1.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-3.4.1.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-3.4.1.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-3.4.1.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-3.4.1.min.map b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-3.4.1.min.map similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-3.4.1.min.map rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-3.4.1.min.map diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-ui-1.10.3.custom.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-ui-1.10.3.custom.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-ui-1.10.3.custom.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-ui-1.10.3.custom.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/README.md b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/README.md similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/README.md rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/README.md diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/additional-methods.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/additional-methods.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/additional-methods.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/additional-methods.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/additional-methods.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/additional-methods.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/additional-methods.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/additional-methods.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/changelog.txt b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/changelog.txt similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/changelog.txt rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/changelog.txt diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/jquery.validate.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/jquery.validate.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/jquery.validate.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/jquery.validate.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/jquery.validate.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/jquery.validate.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/jquery.validate.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/jquery.validate.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_ar.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_ar.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_ar.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_ar.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_bg.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_bg.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_bg.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_bg.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_ca.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_ca.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_ca.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_ca.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_cs.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_cs.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_cs.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_cs.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_da.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_da.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_da.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_da.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_de.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_de.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_de.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_de.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_el.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_el.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_el.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_el.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_es.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_es.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_es.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_es.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_et.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_et.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_et.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_et.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_eu.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_eu.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_eu.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_eu.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_fa.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_fa.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_fa.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_fa.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_fi.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_fi.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_fi.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_fi.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_fr.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_fr.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_fr.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_fr.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_he.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_he.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_he.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_he.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_hr.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_hr.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_hr.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_hr.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_hu.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_hu.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_hu.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_hu.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_it.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_it.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_it.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_it.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_ja.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_ja.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_ja.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_ja.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_ka.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_ka.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_ka.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_ka.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_kk.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_kk.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_kk.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_kk.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_ko.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_ko.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_ko.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_ko.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_lt.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_lt.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_lt.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_lt.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_lv.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_lv.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_lv.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_lv.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_my.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_my.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_my.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_my.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_nl.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_nl.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_nl.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_nl.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_no.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_no.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_no.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_no.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_pl.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_pl.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_pl.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_pl.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_pt_BR.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_pt_BR.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_pt_BR.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_pt_BR.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_pt_PT.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_pt_PT.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_pt_PT.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_pt_PT.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_ro.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_ro.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_ro.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_ro.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_ru.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_ru.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_ru.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_ru.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_si.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_si.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_si.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_si.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_sk.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_sk.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_sk.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_sk.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_sl.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_sl.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_sl.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_sl.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_sr.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_sr.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_sr.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_sr.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_sv.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_sv.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_sv.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_sv.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_th.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_th.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_th.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_th.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_tr.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_tr.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_tr.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_tr.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_uk.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_uk.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_uk.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_uk.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_vi.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_vi.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_vi.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_vi.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_zh.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_zh.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_zh.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_zh.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_zh_TW.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_zh_TW.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/messages_zh_TW.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/messages_zh_TW.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/methods_de.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/methods_de.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/methods_de.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/methods_de.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/methods_nl.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/methods_nl.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/methods_nl.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/methods_nl.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/methods_pt.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/methods_pt.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery-validation-1.11.1/localization/methods_pt.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery-validation-1.11.1/localization/methods_pt.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery.blockUI.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery.blockUI.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery.blockUI.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery.blockUI.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery.cookie.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery.cookie.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery.cookie.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery.cookie.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery.form.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery.form.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery.form.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery.form.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery.metadata.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery.metadata.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery.metadata.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery.metadata.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery.rest.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery.rest.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery.rest.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery.rest.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jquery.serialize-object.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jquery.serialize-object.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jquery.serialize-object.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jquery.serialize-object.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/json2form/json2form.js b/maxkey-web-maxkey/src/main/resources/static/jquery/json2form/json2form.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/json2form/json2form.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/json2form/json2form.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/json2form/json2formDemo.htm b/maxkey-web-maxkey/src/main/resources/static/jquery/json2form/json2formDemo.htm similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/json2form/json2formDemo.htm rename to maxkey-web-maxkey/src/main/resources/static/jquery/json2form/json2formDemo.htm diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/json2form/new 4.txt b/maxkey-web-maxkey/src/main/resources/static/jquery/json2form/new 4.txt similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/json2form/new 4.txt rename to maxkey-web-maxkey/src/main/resources/static/jquery/json2form/new 4.txt diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/jsonformatter.js b/maxkey-web-maxkey/src/main/resources/static/jquery/jsonformatter.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/jsonformatter.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/jsonformatter.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/passwordStrength/demo.htm b/maxkey-web-maxkey/src/main/resources/static/jquery/passwordStrength/demo.htm similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/passwordStrength/demo.htm rename to maxkey-web-maxkey/src/main/resources/static/jquery/passwordStrength/demo.htm diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/passwordStrength/images/progressfiveimg.png b/maxkey-web-maxkey/src/main/resources/static/jquery/passwordStrength/images/progressfiveimg.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/passwordStrength/images/progressfiveimg.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/passwordStrength/images/progressfiveimg.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/passwordStrength/images/progresstenimg.png b/maxkey-web-maxkey/src/main/resources/static/jquery/passwordStrength/images/progresstenimg.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/passwordStrength/images/progresstenimg.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/passwordStrength/images/progresstenimg.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/passwordStrength/images/progresstree.png b/maxkey-web-maxkey/src/main/resources/static/jquery/passwordStrength/images/progresstree.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/passwordStrength/images/progresstree.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/passwordStrength/images/progresstree.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/passwordStrength/jquery-1.4.4.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/passwordStrength/jquery-1.4.4.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/passwordStrength/jquery-1.4.4.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/passwordStrength/jquery-1.4.4.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/passwordStrength/passwordStrength.css b/maxkey-web-maxkey/src/main/resources/static/jquery/passwordStrength/passwordStrength.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/passwordStrength/passwordStrength.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/passwordStrength/passwordStrength.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/passwordStrength/passwordStrength.js b/maxkey-web-maxkey/src/main/resources/static/jquery/passwordStrength/passwordStrength.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/passwordStrength/passwordStrength.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/passwordStrength/passwordStrength.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/platform.common.js b/maxkey-web-maxkey/src/main/resources/static/jquery/platform.common.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/platform.common.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/platform.common.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/popper.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/popper.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/popper.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/popper.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/selecter-3.2.3/README.md b/maxkey-web-maxkey/src/main/resources/static/jquery/selecter-3.2.3/README.md similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/selecter-3.2.3/README.md rename to maxkey-web-maxkey/src/main/resources/static/jquery/selecter-3.2.3/README.md diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/selecter-3.2.3/fs-selecter-arrow.png b/maxkey-web-maxkey/src/main/resources/static/jquery/selecter-3.2.3/fs-selecter-arrow.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/selecter-3.2.3/fs-selecter-arrow.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/selecter-3.2.3/fs-selecter-arrow.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/selecter-3.2.3/jquery.fs.selecter.css b/maxkey-web-maxkey/src/main/resources/static/jquery/selecter-3.2.3/jquery.fs.selecter.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/selecter-3.2.3/jquery.fs.selecter.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/selecter-3.2.3/jquery.fs.selecter.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/selecter-3.2.3/jquery.fs.selecter.js b/maxkey-web-maxkey/src/main/resources/static/jquery/selecter-3.2.3/jquery.fs.selecter.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/selecter-3.2.3/jquery.fs.selecter.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/selecter-3.2.3/jquery.fs.selecter.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/selecter-3.2.3/jquery.fs.selecter.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/selecter-3.2.3/jquery.fs.selecter.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/selecter-3.2.3/jquery.fs.selecter.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/selecter-3.2.3/jquery.fs.selecter.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/selecter-3.2.3/new 4.txt b/maxkey-web-maxkey/src/main/resources/static/jquery/selecter-3.2.3/new 4.txt similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/selecter-3.2.3/new 4.txt rename to maxkey-web-maxkey/src/main/resources/static/jquery/selecter-3.2.3/new 4.txt diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/selecter-3.2.3/selecter .htm b/maxkey-web-maxkey/src/main/resources/static/jquery/selecter-3.2.3/selecter .htm similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/selecter-3.2.3/selecter .htm rename to maxkey-web-maxkey/src/main/resources/static/jquery/selecter-3.2.3/selecter .htm diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/selecter-3.2.3/selecter-all.htm b/maxkey-web-maxkey/src/main/resources/static/jquery/selecter-3.2.3/selecter-all.htm similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/selecter-3.2.3/selecter-all.htm rename to maxkey-web-maxkey/src/main/resources/static/jquery/selecter-3.2.3/selecter-all.htm diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/switchtab/switchtab.css b/maxkey-web-maxkey/src/main/resources/static/jquery/switchtab/switchtab.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/switchtab/switchtab.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/switchtab/switchtab.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/switchtab/switchtab.js b/maxkey-web-maxkey/src/main/resources/static/jquery/switchtab/switchtab.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/switchtab/switchtab.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/switchtab/switchtab.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/.gitattributes b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/.gitattributes similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/.gitattributes rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/.gitattributes diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/.gitignore b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/.gitignore similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/.gitignore rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/.gitignore diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/README.md b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/README.md similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/README.md rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/README.md diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/API_cn.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/API_cn.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/API_cn.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/API_cn.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/API_en.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/API_en.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/API_en.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/API_en.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/api.js b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/api.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/api.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/api.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/common.css b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/common.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/common.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/common.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/common_ie6.css b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/common_ie6.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/common_ie6.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/common_ie6.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/apiMenu.gif b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/apiMenu.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/apiMenu.gif rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/apiMenu.gif diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/apiMenu.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/apiMenu.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/apiMenu.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/apiMenu.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/background.jpg b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/background.jpg similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/background.jpg rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/background.jpg diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/chinese.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/chinese.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/chinese.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/chinese.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/close.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/close.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/close.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/close.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/contact-bg.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/contact-bg.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/contact-bg.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/contact-bg.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/english.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/english.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/english.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/english.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/header-bg.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/header-bg.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/header-bg.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/header-bg.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/lightbulb.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/lightbulb.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/lightbulb.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/lightbulb.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/overlay_arrow.gif b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/overlay_arrow.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/overlay_arrow.gif rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/overlay_arrow.gif diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/overlay_arrow.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/overlay_arrow.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/overlay_arrow.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/overlay_arrow.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/overlay_bg.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/overlay_bg.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/overlay_bg.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/overlay_bg.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/overlay_close_IE6.gif b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/overlay_close_IE6.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/overlay_close_IE6.gif rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/overlay_close_IE6.gif diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/zTreeStandard.gif b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/zTreeStandard.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/zTreeStandard.gif rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/zTreeStandard.gif diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/zTreeStandard.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/zTreeStandard.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/img/zTreeStandard.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/img/zTreeStandard.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/jquery-1.6.2.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/jquery-1.6.2.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/jquery-1.6.2.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/jquery-1.6.2.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/jquery.ztree.core.js b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/jquery.ztree.core.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/jquery.ztree.core.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/jquery.ztree.core.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/zTreeStyleForApi.css b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/zTreeStyleForApi.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/apiCss/zTreeStyleForApi.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/apiCss/zTreeStyleForApi.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/fn.zTree._z.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/fn.zTree._z.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/fn.zTree._z.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/fn.zTree._z.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/fn.zTree.destroy.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/fn.zTree.destroy.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/fn.zTree.destroy.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/fn.zTree.destroy.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/fn.zTree.getZTreeObj.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/fn.zTree.getZTreeObj.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/fn.zTree.getZTreeObj.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/fn.zTree.getZTreeObj.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/fn.zTree.init.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/fn.zTree.init.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/fn.zTree.init.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/fn.zTree.init.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.autoParam.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.autoParam.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.autoParam.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.autoParam.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.contentType.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.contentType.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.contentType.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.contentType.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.dataFilter.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.dataFilter.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.dataFilter.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.dataFilter.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.dataType.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.dataType.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.dataType.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.dataType.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.enable.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.enable.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.enable.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.enable.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.headers.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.headers.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.headers.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.headers.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.otherParam.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.otherParam.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.otherParam.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.otherParam.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.type.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.type.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.type.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.type.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.url.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.url.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.url.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.url.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.xhrFields.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.xhrFields.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.async.xhrFields.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.async.xhrFields.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeAsync.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeAsync.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeAsync.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeAsync.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeCheck.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeCheck.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeCheck.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeCheck.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeClick.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeClick.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeClick.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeClick.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeCollapse.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeCollapse.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeCollapse.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeCollapse.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeDblClick.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeDblClick.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeDblClick.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeDblClick.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeDrag.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeDrag.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeDrag.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeDrag.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeDragOpen.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeDragOpen.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeDragOpen.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeDragOpen.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeDrop.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeDrop.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeDrop.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeDrop.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeEditName.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeEditName.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeEditName.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeEditName.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeExpand.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeExpand.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeExpand.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeExpand.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeMouseDown.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeMouseDown.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeMouseDown.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeMouseDown.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeMouseUp.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeMouseUp.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeMouseUp.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeMouseUp.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeRemove.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeRemove.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeRemove.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeRemove.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeRename.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeRename.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeRename.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeRename.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeRightClick.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeRightClick.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeRightClick.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.beforeRightClick.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onAsyncError.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onAsyncError.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onAsyncError.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onAsyncError.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onAsyncSuccess.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onAsyncSuccess.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onAsyncSuccess.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onAsyncSuccess.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onCheck.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onCheck.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onCheck.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onCheck.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onClick.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onClick.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onClick.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onClick.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onCollapse.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onCollapse.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onCollapse.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onCollapse.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onDblClick.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onDblClick.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onDblClick.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onDblClick.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onDrag.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onDrag.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onDrag.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onDrag.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onDragMove.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onDragMove.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onDragMove.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onDragMove.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onDrop.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onDrop.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onDrop.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onDrop.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onExpand.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onExpand.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onExpand.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onExpand.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onMouseDown.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onMouseDown.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onMouseDown.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onMouseDown.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onMouseUp.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onMouseUp.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onMouseUp.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onMouseUp.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onNodeCreated.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onNodeCreated.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onNodeCreated.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onNodeCreated.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onRemove.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onRemove.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onRemove.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onRemove.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onRename.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onRename.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onRename.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onRename.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onRightClick.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onRightClick.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.callback.onRightClick.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.callback.onRightClick.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.check.autoCheckTrigger.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.check.autoCheckTrigger.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.check.autoCheckTrigger.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.check.autoCheckTrigger.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.check.chkDisabledInherit.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.check.chkDisabledInherit.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.check.chkDisabledInherit.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.check.chkDisabledInherit.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.check.chkStyle.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.check.chkStyle.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.check.chkStyle.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.check.chkStyle.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.check.chkboxType.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.check.chkboxType.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.check.chkboxType.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.check.chkboxType.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.check.enable.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.check.enable.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.check.enable.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.check.enable.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.check.nocheckInherit.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.check.nocheckInherit.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.check.nocheckInherit.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.check.nocheckInherit.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.check.radioType.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.check.radioType.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.check.radioType.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.check.radioType.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.keep.leaf.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.keep.leaf.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.keep.leaf.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.keep.leaf.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.keep.parent.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.keep.parent.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.keep.parent.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.keep.parent.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.key.checked.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.key.checked.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.key.checked.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.key.checked.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.key.children.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.key.children.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.key.children.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.key.children.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.key.isHidden.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.key.isHidden.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.key.isHidden.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.key.isHidden.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.key.isParent.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.key.isParent.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.key.isParent.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.key.isParent.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.key.name.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.key.name.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.key.name.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.key.name.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.key.title.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.key.title.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.key.title.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.key.title.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.key.url.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.key.url.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.key.url.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.key.url.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.simpleData.enable.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.simpleData.enable.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.simpleData.enable.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.simpleData.enable.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.simpleData.idKey.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.simpleData.idKey.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.simpleData.idKey.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.simpleData.idKey.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.simpleData.pIdKey.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.simpleData.pIdKey.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.simpleData.pIdKey.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.simpleData.pIdKey.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.simpleData.rootPId.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.simpleData.rootPId.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.data.simpleData.rootPId.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.data.simpleData.rootPId.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.autoExpandTrigger.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.autoExpandTrigger.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.autoExpandTrigger.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.autoExpandTrigger.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.autoOpenTime.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.autoOpenTime.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.autoOpenTime.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.autoOpenTime.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.borderMax.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.borderMax.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.borderMax.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.borderMax.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.borderMin.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.borderMin.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.borderMin.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.borderMin.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.inner.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.inner.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.inner.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.inner.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.isCopy.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.isCopy.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.isCopy.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.isCopy.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.isMove.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.isMove.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.isMove.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.isMove.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.maxShowNodeNum.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.maxShowNodeNum.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.maxShowNodeNum.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.maxShowNodeNum.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.minMoveSize.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.minMoveSize.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.minMoveSize.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.minMoveSize.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.next.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.next.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.next.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.next.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.prev.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.prev.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.prev.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.drag.prev.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.editNameSelectAll.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.editNameSelectAll.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.editNameSelectAll.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.editNameSelectAll.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.enable.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.enable.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.enable.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.enable.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.removeTitle.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.removeTitle.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.removeTitle.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.removeTitle.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.renameTitle.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.renameTitle.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.renameTitle.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.renameTitle.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.showRemoveBtn.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.showRemoveBtn.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.showRemoveBtn.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.showRemoveBtn.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.showRenameBtn.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.showRenameBtn.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.edit.showRenameBtn.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.edit.showRenameBtn.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.treeId.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.treeId.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.treeId.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.treeId.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.treeObj.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.treeObj.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.treeObj.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.treeObj.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.addDiyDom.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.addDiyDom.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.addDiyDom.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.addDiyDom.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.addHoverDom.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.addHoverDom.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.addHoverDom.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.addHoverDom.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.autoCancelSelected.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.autoCancelSelected.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.autoCancelSelected.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.autoCancelSelected.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.dblClickExpand.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.dblClickExpand.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.dblClickExpand.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.dblClickExpand.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.expandSpeed.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.expandSpeed.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.expandSpeed.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.expandSpeed.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.fontCss.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.fontCss.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.fontCss.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.fontCss.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.nameIsHTML.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.nameIsHTML.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.nameIsHTML.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.nameIsHTML.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.removeHoverDom.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.removeHoverDom.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.removeHoverDom.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.removeHoverDom.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.selectedMulti.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.selectedMulti.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.selectedMulti.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.selectedMulti.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.showIcon.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.showIcon.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.showIcon.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.showIcon.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.showLine.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.showLine.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.showLine.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.showLine.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.showTitle.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.showTitle.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.showTitle.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.showTitle.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.txtSelectedEnable.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.txtSelectedEnable.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/setting.view.txtSelectedEnable.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/setting.view.txtSelectedEnable.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.check_Child_State.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.check_Child_State.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.check_Child_State.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.check_Child_State.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.check_Focus.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.check_Focus.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.check_Focus.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.check_Focus.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.checked.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.checked.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.checked.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.checked.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.checkedOld.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.checkedOld.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.checkedOld.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.checkedOld.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.children.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.children.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.children.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.children.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.chkDisabled.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.chkDisabled.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.chkDisabled.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.chkDisabled.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.click.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.click.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.click.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.click.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.diy.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.diy.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.diy.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.diy.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.editNameFlag.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.editNameFlag.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.editNameFlag.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.editNameFlag.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.getCheckStatus.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.getCheckStatus.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.getCheckStatus.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.getCheckStatus.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.getIndex.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.getIndex.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.getIndex.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.getIndex.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.getNextNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.getNextNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.getNextNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.getNextNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.getParentNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.getParentNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.getParentNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.getParentNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.getPath.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.getPath.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.getPath.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.getPath.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.getPreNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.getPreNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.getPreNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.getPreNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.halfCheck.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.halfCheck.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.halfCheck.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.halfCheck.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.icon.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.icon.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.icon.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.icon.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.iconClose.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.iconClose.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.iconClose.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.iconClose.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.iconOpen.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.iconOpen.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.iconOpen.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.iconOpen.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.iconSkin.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.iconSkin.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.iconSkin.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.iconSkin.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.isAjaxing.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.isAjaxing.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.isAjaxing.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.isAjaxing.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.isFirstNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.isFirstNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.isFirstNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.isFirstNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.isHidden.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.isHidden.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.isHidden.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.isHidden.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.isHover.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.isHover.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.isHover.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.isHover.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.isLastNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.isLastNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.isLastNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.isLastNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.isParent.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.isParent.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.isParent.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.isParent.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.level.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.level.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.level.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.level.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.name.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.name.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.name.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.name.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.nocheck.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.nocheck.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.nocheck.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.nocheck.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.open.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.open.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.open.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.open.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.parentTId.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.parentTId.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.parentTId.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.parentTId.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.tId.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.tId.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.tId.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.tId.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.target.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.target.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.target.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.target.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.url.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.url.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.url.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.url.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.zAsync.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.zAsync.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/treeNode.zAsync.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/treeNode.zAsync.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.addNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.addNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.addNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.addNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.cancelEditName.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.cancelEditName.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.cancelEditName.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.cancelEditName.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.cancelSelectedNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.cancelSelectedNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.cancelSelectedNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.cancelSelectedNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.checkAllNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.checkAllNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.checkAllNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.checkAllNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.checkNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.checkNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.checkNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.checkNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.copyNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.copyNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.copyNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.copyNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.destroy.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.destroy.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.destroy.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.destroy.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.editName.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.editName.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.editName.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.editName.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.expandAll.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.expandAll.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.expandAll.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.expandAll.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.expandNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.expandNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.expandNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.expandNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getChangeCheckedNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getChangeCheckedNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getChangeCheckedNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getChangeCheckedNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getCheckedNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getCheckedNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getCheckedNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getCheckedNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodeByParam.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodeByParam.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodeByParam.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodeByParam.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodeByTId.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodeByTId.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodeByTId.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodeByTId.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodeIndex.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodeIndex.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodeIndex.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodeIndex.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodesByFilter.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodesByFilter.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodesByFilter.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodesByFilter.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodesByParam.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodesByParam.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodesByParam.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodesByParam.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodesByParamFuzzy.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodesByParamFuzzy.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodesByParamFuzzy.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getNodesByParamFuzzy.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getSelectedNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getSelectedNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.getSelectedNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.getSelectedNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.hideNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.hideNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.hideNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.hideNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.hideNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.hideNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.hideNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.hideNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.moveNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.moveNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.moveNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.moveNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.reAsyncChildNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.reAsyncChildNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.reAsyncChildNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.reAsyncChildNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.reAsyncChildNodesPromise.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.reAsyncChildNodesPromise.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.reAsyncChildNodesPromise.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.reAsyncChildNodesPromise.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.refresh.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.refresh.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.refresh.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.refresh.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.removeChildNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.removeChildNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.removeChildNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.removeChildNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.removeNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.removeNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.removeNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.removeNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.selectNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.selectNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.selectNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.selectNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.setChkDisabled.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.setChkDisabled.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.setChkDisabled.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.setChkDisabled.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.setEditable.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.setEditable.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.setEditable.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.setEditable.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.setting.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.setting.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.setting.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.setting.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.showNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.showNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.showNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.showNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.showNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.showNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.showNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.showNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.transformToArray.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.transformToArray.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.transformToArray.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.transformToArray.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.transformTozTreeNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.transformTozTreeNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.transformTozTreeNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.transformTozTreeNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.updateNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.updateNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/cn/zTreeObj.updateNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/cn/zTreeObj.updateNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/fn.zTree._z.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/fn.zTree._z.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/fn.zTree._z.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/fn.zTree._z.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/fn.zTree.destroy.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/fn.zTree.destroy.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/fn.zTree.destroy.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/fn.zTree.destroy.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/fn.zTree.getZTreeObj.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/fn.zTree.getZTreeObj.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/fn.zTree.getZTreeObj.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/fn.zTree.getZTreeObj.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/fn.zTree.init.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/fn.zTree.init.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/fn.zTree.init.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/fn.zTree.init.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.autoParam.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.autoParam.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.autoParam.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.autoParam.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.contentType.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.contentType.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.contentType.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.contentType.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.dataFilter.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.dataFilter.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.dataFilter.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.dataFilter.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.dataType.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.dataType.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.dataType.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.dataType.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.enable.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.enable.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.enable.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.enable.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.headers.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.headers.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.headers.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.headers.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.otherParam.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.otherParam.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.otherParam.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.otherParam.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.type.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.type.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.type.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.type.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.url.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.url.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.url.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.url.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.xhrFields.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.xhrFields.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.async.xhrFields.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.async.xhrFields.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeAsync.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeAsync.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeAsync.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeAsync.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeCheck.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeCheck.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeCheck.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeCheck.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeClick.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeClick.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeClick.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeClick.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeCollapse.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeCollapse.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeCollapse.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeCollapse.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeDblClick.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeDblClick.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeDblClick.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeDblClick.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeDrag.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeDrag.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeDrag.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeDrag.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeDragOpen.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeDragOpen.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeDragOpen.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeDragOpen.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeDrop.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeDrop.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeDrop.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeDrop.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeEditName.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeEditName.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeEditName.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeEditName.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeExpand.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeExpand.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeExpand.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeExpand.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeMouseDown.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeMouseDown.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeMouseDown.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeMouseDown.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeMouseUp.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeMouseUp.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeMouseUp.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeMouseUp.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeRemove.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeRemove.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeRemove.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeRemove.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeRename.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeRename.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeRename.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeRename.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeRightClick.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeRightClick.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.beforeRightClick.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.beforeRightClick.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onAsyncError.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onAsyncError.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onAsyncError.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onAsyncError.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onAsyncSuccess.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onAsyncSuccess.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onAsyncSuccess.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onAsyncSuccess.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onCheck.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onCheck.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onCheck.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onCheck.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onClick.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onClick.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onClick.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onClick.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onCollapse.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onCollapse.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onCollapse.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onCollapse.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onDblClick.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onDblClick.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onDblClick.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onDblClick.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onDrag.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onDrag.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onDrag.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onDrag.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onDragMove.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onDragMove.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onDragMove.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onDragMove.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onDrop.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onDrop.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onDrop.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onDrop.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onExpand.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onExpand.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onExpand.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onExpand.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onMouseDown.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onMouseDown.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onMouseDown.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onMouseDown.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onMouseUp.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onMouseUp.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onMouseUp.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onMouseUp.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onNodeCreated.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onNodeCreated.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onNodeCreated.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onNodeCreated.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onRemove.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onRemove.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onRemove.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onRemove.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onRename.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onRename.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onRename.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onRename.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onRightClick.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onRightClick.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.callback.onRightClick.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.callback.onRightClick.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.check.autoCheckTrigger.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.check.autoCheckTrigger.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.check.autoCheckTrigger.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.check.autoCheckTrigger.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.check.chkDisabledInherit.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.check.chkDisabledInherit.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.check.chkDisabledInherit.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.check.chkDisabledInherit.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.check.chkStyle.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.check.chkStyle.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.check.chkStyle.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.check.chkStyle.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.check.chkboxType.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.check.chkboxType.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.check.chkboxType.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.check.chkboxType.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.check.enable.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.check.enable.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.check.enable.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.check.enable.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.check.nocheckInherit.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.check.nocheckInherit.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.check.nocheckInherit.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.check.nocheckInherit.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.check.radioType.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.check.radioType.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.check.radioType.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.check.radioType.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.keep.leaf.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.keep.leaf.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.keep.leaf.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.keep.leaf.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.keep.parent.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.keep.parent.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.keep.parent.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.keep.parent.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.key.checked.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.key.checked.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.key.checked.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.key.checked.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.key.children.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.key.children.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.key.children.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.key.children.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.key.isHidden.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.key.isHidden.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.key.isHidden.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.key.isHidden.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.key.isParent.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.key.isParent.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.key.isParent.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.key.isParent.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.key.name.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.key.name.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.key.name.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.key.name.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.key.title.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.key.title.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.key.title.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.key.title.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.key.url.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.key.url.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.key.url.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.key.url.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.simpleData.enable.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.simpleData.enable.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.simpleData.enable.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.simpleData.enable.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.simpleData.idKey.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.simpleData.idKey.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.simpleData.idKey.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.simpleData.idKey.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.simpleData.pIdKey.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.simpleData.pIdKey.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.simpleData.pIdKey.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.simpleData.pIdKey.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.simpleData.rootPId.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.simpleData.rootPId.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.data.simpleData.rootPId.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.data.simpleData.rootPId.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.autoExpandTrigger.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.autoExpandTrigger.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.autoExpandTrigger.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.autoExpandTrigger.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.autoOpenTime.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.autoOpenTime.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.autoOpenTime.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.autoOpenTime.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.borderMax.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.borderMax.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.borderMax.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.borderMax.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.borderMin.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.borderMin.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.borderMin.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.borderMin.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.inner.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.inner.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.inner.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.inner.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.isCopy.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.isCopy.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.isCopy.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.isCopy.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.isMove.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.isMove.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.isMove.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.isMove.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.maxShowNodeNum.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.maxShowNodeNum.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.maxShowNodeNum.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.maxShowNodeNum.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.minMoveSize.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.minMoveSize.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.minMoveSize.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.minMoveSize.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.next.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.next.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.next.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.next.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.prev.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.prev.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.drag.prev.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.drag.prev.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.editNameSelectAll.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.editNameSelectAll.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.editNameSelectAll.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.editNameSelectAll.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.enable.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.enable.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.enable.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.enable.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.removeTitle.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.removeTitle.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.removeTitle.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.removeTitle.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.renameTitle.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.renameTitle.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.renameTitle.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.renameTitle.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.showRemoveBtn.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.showRemoveBtn.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.showRemoveBtn.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.showRemoveBtn.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.showRenameBtn.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.showRenameBtn.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.edit.showRenameBtn.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.edit.showRenameBtn.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.treeId.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.treeId.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.treeId.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.treeId.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.treeObj.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.treeObj.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.treeObj.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.treeObj.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.addDiyDom.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.addDiyDom.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.addDiyDom.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.addDiyDom.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.addHoverDom.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.addHoverDom.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.addHoverDom.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.addHoverDom.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.autoCancelSelected.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.autoCancelSelected.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.autoCancelSelected.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.autoCancelSelected.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.dblClickExpand.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.dblClickExpand.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.dblClickExpand.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.dblClickExpand.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.expandSpeed.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.expandSpeed.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.expandSpeed.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.expandSpeed.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.fontCss.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.fontCss.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.fontCss.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.fontCss.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.nameIsHTML.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.nameIsHTML.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.nameIsHTML.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.nameIsHTML.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.removeHoverDom.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.removeHoverDom.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.removeHoverDom.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.removeHoverDom.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.selectedMulti.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.selectedMulti.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.selectedMulti.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.selectedMulti.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.showIcon.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.showIcon.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.showIcon.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.showIcon.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.showLine.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.showLine.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.showLine.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.showLine.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.showTitle.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.showTitle.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.showTitle.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.showTitle.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.txtSelectedEnable.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.txtSelectedEnable.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/setting.view.txtSelectedEnable.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/setting.view.txtSelectedEnable.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.check_Child_State.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.check_Child_State.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.check_Child_State.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.check_Child_State.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.check_Focus.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.check_Focus.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.check_Focus.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.check_Focus.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.checked.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.checked.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.checked.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.checked.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.checkedOld.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.checkedOld.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.checkedOld.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.checkedOld.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.children.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.children.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.children.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.children.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.chkDisabled.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.chkDisabled.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.chkDisabled.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.chkDisabled.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.click.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.click.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.click.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.click.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.diy.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.diy.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.diy.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.diy.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.editNameFlag.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.editNameFlag.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.editNameFlag.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.editNameFlag.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.getCheckStatus.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.getCheckStatus.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.getCheckStatus.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.getCheckStatus.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.getIndex.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.getIndex.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.getIndex.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.getIndex.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.getNextNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.getNextNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.getNextNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.getNextNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.getParentNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.getParentNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.getParentNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.getParentNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.getPath.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.getPath.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.getPath.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.getPath.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.getPreNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.getPreNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.getPreNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.getPreNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.halfCheck.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.halfCheck.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.halfCheck.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.halfCheck.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.icon.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.icon.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.icon.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.icon.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.iconClose.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.iconClose.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.iconClose.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.iconClose.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.iconOpen.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.iconOpen.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.iconOpen.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.iconOpen.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.iconSkin.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.iconSkin.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.iconSkin.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.iconSkin.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.isAjaxing.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.isAjaxing.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.isAjaxing.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.isAjaxing.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.isFirstNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.isFirstNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.isFirstNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.isFirstNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.isHidden.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.isHidden.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.isHidden.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.isHidden.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.isHover.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.isHover.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.isHover.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.isHover.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.isLastNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.isLastNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.isLastNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.isLastNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.isParent.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.isParent.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.isParent.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.isParent.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.level.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.level.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.level.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.level.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.name.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.name.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.name.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.name.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.nocheck.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.nocheck.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.nocheck.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.nocheck.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.open.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.open.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.open.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.open.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.parentTId.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.parentTId.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.parentTId.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.parentTId.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.tId.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.tId.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.tId.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.tId.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.target.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.target.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.target.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.target.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.url.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.url.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.url.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.url.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.zAsync.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.zAsync.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/treeNode.zAsync.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/treeNode.zAsync.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.addNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.addNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.addNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.addNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.cancelEditName.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.cancelEditName.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.cancelEditName.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.cancelEditName.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.cancelSelectedNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.cancelSelectedNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.cancelSelectedNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.cancelSelectedNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.checkAllNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.checkAllNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.checkAllNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.checkAllNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.checkNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.checkNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.checkNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.checkNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.copyNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.copyNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.copyNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.copyNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.destroy.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.destroy.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.destroy.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.destroy.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.editName.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.editName.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.editName.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.editName.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.expandAll.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.expandAll.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.expandAll.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.expandAll.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.expandNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.expandNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.expandNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.expandNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getChangeCheckedNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getChangeCheckedNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getChangeCheckedNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getChangeCheckedNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getCheckedNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getCheckedNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getCheckedNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getCheckedNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodeByParam.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodeByParam.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodeByParam.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodeByParam.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodeByTId.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodeByTId.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodeByTId.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodeByTId.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodeIndex.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodeIndex.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodeIndex.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodeIndex.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodesByFilter.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodesByFilter.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodesByFilter.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodesByFilter.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodesByParam.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodesByParam.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodesByParam.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodesByParam.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodesByParamFuzzy.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodesByParamFuzzy.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodesByParamFuzzy.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getNodesByParamFuzzy.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getSelectedNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getSelectedNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.getSelectedNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.getSelectedNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.hideNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.hideNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.hideNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.hideNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.hideNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.hideNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.hideNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.hideNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.moveNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.moveNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.moveNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.moveNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.reAsyncChildNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.reAsyncChildNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.reAsyncChildNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.reAsyncChildNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.reAsyncChildNodesPromise.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.reAsyncChildNodesPromise.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.reAsyncChildNodesPromise.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.reAsyncChildNodesPromise.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.refresh.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.refresh.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.refresh.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.refresh.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.removeChildNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.removeChildNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.removeChildNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.removeChildNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.removeNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.removeNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.removeNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.removeNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.selectNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.selectNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.selectNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.selectNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.setChkDisabled.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.setChkDisabled.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.setChkDisabled.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.setChkDisabled.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.setEditable.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.setEditable.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.setEditable.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.setEditable.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.setting.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.setting.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.setting.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.setting.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.showNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.showNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.showNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.showNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.showNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.showNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.showNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.showNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.transformToArray.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.transformToArray.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.transformToArray.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.transformToArray.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.transformTozTreeNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.transformTozTreeNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.transformTozTreeNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.transformTozTreeNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.updateNode.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.updateNode.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/api/en/zTreeObj.updateNode.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/api/en/zTreeObj.updateNode.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/awesomeStyle/awesome.css b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/awesomeStyle/awesome.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/awesomeStyle/awesome.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/awesomeStyle/awesome.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/awesomeStyle/awesome.less b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/awesomeStyle/awesome.less similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/awesomeStyle/awesome.less rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/awesomeStyle/awesome.less diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/awesomeStyle/fa.less b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/awesomeStyle/fa.less similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/awesomeStyle/fa.less rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/awesomeStyle/fa.less diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/awesomeStyle/img/loading.gif b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/awesomeStyle/img/loading.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/awesomeStyle/img/loading.gif rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/awesomeStyle/img/loading.gif diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/demo.css b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/demo.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/demo.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/demo.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/metroStyle/img/line_conn.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/metroStyle/img/line_conn.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/metroStyle/img/line_conn.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/metroStyle/img/line_conn.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/metroStyle/img/loading.gif b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/metroStyle/img/loading.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/metroStyle/img/loading.gif rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/metroStyle/img/loading.gif diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/metroStyle/img/metro.gif b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/metroStyle/img/metro.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/metroStyle/img/metro.gif rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/metroStyle/img/metro.gif diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/metroStyle/img/metro.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/metroStyle/img/metro.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/metroStyle/img/metro.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/metroStyle/img/metro.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/metroStyle/metroStyle.css b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/metroStyle/metroStyle.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/metroStyle/metroStyle.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/metroStyle/metroStyle.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/1_close.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/1_close.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/1_close.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/1_close.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/1_open.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/1_open.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/1_open.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/1_open.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/2.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/2.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/2.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/2.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/3.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/3.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/3.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/3.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/4.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/4.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/4.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/4.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/5.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/5.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/5.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/5.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/6.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/6.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/6.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/6.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/7.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/7.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/7.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/7.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/8.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/8.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/8.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/8.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/9.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/9.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/9.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/diy/9.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/line_conn.gif b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/line_conn.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/line_conn.gif rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/line_conn.gif diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/loading.gif b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/loading.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/loading.gif rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/loading.gif diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/zTreeStandard.gif b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/zTreeStandard.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/zTreeStandard.gif rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/zTreeStandard.gif diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/zTreeStandard.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/zTreeStandard.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/img/zTreeStandard.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/img/zTreeStandard.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/zTreeStyle.css b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/zTreeStyle.css similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/css/zTreeStyle/zTreeStyle.css rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/css/zTreeStyle/zTreeStyle.css diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/asyncData/getNodes.php b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/asyncData/getNodes.php similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/asyncData/getNodes.php rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/asyncData/getNodes.php diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/asyncData/getNodesForBigData.php b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/asyncData/getNodesForBigData.php similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/asyncData/getNodesForBigData.php rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/asyncData/getNodesForBigData.php diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/bigdata/common.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/bigdata/common.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/bigdata/common.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/bigdata/common.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/bigdata/diy_async.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/bigdata/diy_async.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/bigdata/diy_async.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/bigdata/diy_async.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/bigdata/page.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/bigdata/page.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/bigdata/page.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/bigdata/page.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/async.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/async.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/async.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/async.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/async_fun.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/async_fun.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/async_fun.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/async_fun.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/click.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/click.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/click.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/click.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/custom_font.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/custom_font.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/custom_font.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/custom_font.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/custom_icon.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/custom_icon.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/custom_icon.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/custom_icon.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/custom_iconSkin.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/custom_iconSkin.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/custom_iconSkin.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/custom_iconSkin.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/expand.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/expand.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/expand.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/expand.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/noicon.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/noicon.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/noicon.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/noicon.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/noline.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/noline.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/noline.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/noline.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/otherMouse.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/otherMouse.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/otherMouse.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/otherMouse.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/searchNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/searchNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/searchNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/searchNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/simpleData.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/simpleData.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/simpleData.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/simpleData.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/standardData.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/standardData.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/standardData.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/standardData.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/update_fun.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/update_fun.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/update_fun.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/update_fun.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/url.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/url.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/core/url.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/core/url.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_chkDisabled.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_chkDisabled.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_chkDisabled.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_chkDisabled.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_count.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_count.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_count.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_count.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_fun.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_fun.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_fun.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_fun.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_halfCheck.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_halfCheck.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_halfCheck.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_halfCheck.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_nocheck.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_nocheck.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_nocheck.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/checkbox_nocheck.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/radio.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/radio.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/radio.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/radio.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/radio_chkDisabled.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/radio_chkDisabled.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/radio_chkDisabled.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/radio_chkDisabled.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/radio_fun.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/radio_fun.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/radio_fun.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/radio_fun.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/radio_halfCheck.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/radio_halfCheck.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/radio_halfCheck.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/radio_halfCheck.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/radio_nocheck.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/radio_nocheck.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/excheck/radio_nocheck.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/excheck/radio_nocheck.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exedit/async_edit.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exedit/async_edit.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exedit/async_edit.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exedit/async_edit.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exedit/drag.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exedit/drag.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exedit/drag.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exedit/drag.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exedit/drag_fun.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exedit/drag_fun.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exedit/drag_fun.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exedit/drag_fun.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exedit/drag_super.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exedit/drag_super.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exedit/drag_super.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exedit/drag_super.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exedit/edit.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exedit/edit.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exedit/edit.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exedit/edit.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exedit/edit_fun.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exedit/edit_fun.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exedit/edit_fun.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exedit/edit_fun.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exedit/edit_super.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exedit/edit_super.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exedit/edit_super.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exedit/edit_super.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exedit/multiTree.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exedit/multiTree.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exedit/multiTree.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exedit/multiTree.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exhide/checkbox.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exhide/checkbox.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exhide/checkbox.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exhide/checkbox.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exhide/common.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exhide/common.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exhide/common.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exhide/common.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exhide/radio.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exhide/radio.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/exhide/radio.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/exhide/radio.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/index.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/index.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/index.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/index.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/asyncForAll.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/asyncForAll.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/asyncForAll.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/asyncForAll.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/awesome.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/awesome.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/awesome.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/awesome.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/checkbox_radio.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/checkbox_radio.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/checkbox_radio.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/checkbox_radio.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/diydom.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/diydom.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/diydom.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/diydom.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/dragWithOther.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/dragWithOther.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/dragWithOther.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/dragWithOther.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/fuzzySearch.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/fuzzySearch.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/fuzzySearch.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/fuzzySearch.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/left_menu.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/left_menu.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/left_menu.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/left_menu.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/left_menuForOutLook.gif b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/left_menuForOutLook.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/left_menuForOutLook.gif rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/left_menuForOutLook.gif diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/left_menuForOutLook.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/left_menuForOutLook.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/left_menuForOutLook.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/left_menuForOutLook.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/left_menuForOutLook.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/left_menuForOutLook.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/left_menuForOutLook.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/left_menuForOutLook.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/metro.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/metro.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/metro.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/metro.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/oneclick.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/oneclick.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/oneclick.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/oneclick.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/oneroot.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/oneroot.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/oneroot.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/oneroot.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/rightClickMenu.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/rightClickMenu.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/rightClickMenu.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/rightClickMenu.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/select_menu.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/select_menu.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/select_menu.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/select_menu.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/select_menu_checkbox.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/select_menu_checkbox.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/select_menu_checkbox.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/select_menu_checkbox.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/select_menu_radio.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/select_menu_radio.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/select_menu_radio.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/select_menu_radio.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/singlepath.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/singlepath.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/cn/super/singlepath.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/cn/super/singlepath.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/asyncData/getNodes.php b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/asyncData/getNodes.php similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/asyncData/getNodes.php rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/asyncData/getNodes.php diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/asyncData/getNodesForBigData.php b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/asyncData/getNodesForBigData.php similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/asyncData/getNodesForBigData.php rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/asyncData/getNodesForBigData.php diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/bigdata/common.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/bigdata/common.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/bigdata/common.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/bigdata/common.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/bigdata/diy_async.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/bigdata/diy_async.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/bigdata/diy_async.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/bigdata/diy_async.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/bigdata/page.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/bigdata/page.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/bigdata/page.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/bigdata/page.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/async.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/async.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/async.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/async.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/async_fun.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/async_fun.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/async_fun.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/async_fun.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/click.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/click.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/click.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/click.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/custom_font.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/custom_font.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/custom_font.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/custom_font.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/custom_icon.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/custom_icon.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/custom_icon.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/custom_icon.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/custom_iconSkin.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/custom_iconSkin.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/custom_iconSkin.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/custom_iconSkin.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/expand.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/expand.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/expand.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/expand.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/noicon.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/noicon.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/noicon.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/noicon.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/noline.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/noline.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/noline.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/noline.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/otherMouse.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/otherMouse.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/otherMouse.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/otherMouse.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/searchNodes.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/searchNodes.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/searchNodes.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/searchNodes.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/simpleData.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/simpleData.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/simpleData.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/simpleData.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/standardData.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/standardData.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/standardData.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/standardData.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/update_fun.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/update_fun.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/update_fun.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/update_fun.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/url.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/url.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/core/url.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/core/url.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/checkbox.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/checkbox.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/checkbox.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/checkbox.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_chkDisabled.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_chkDisabled.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_chkDisabled.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_chkDisabled.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_count.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_count.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_count.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_count.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_fun.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_fun.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_fun.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_fun.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_halfCheck.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_halfCheck.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_halfCheck.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_halfCheck.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_nocheck.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_nocheck.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_nocheck.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/checkbox_nocheck.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/radio.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/radio.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/radio.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/radio.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/radio_chkDisabled.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/radio_chkDisabled.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/radio_chkDisabled.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/radio_chkDisabled.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/radio_fun.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/radio_fun.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/radio_fun.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/radio_fun.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/radio_halfCheck.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/radio_halfCheck.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/radio_halfCheck.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/radio_halfCheck.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/radio_nocheck.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/radio_nocheck.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/excheck/radio_nocheck.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/excheck/radio_nocheck.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exedit/async_edit.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exedit/async_edit.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exedit/async_edit.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exedit/async_edit.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exedit/drag.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exedit/drag.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exedit/drag.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exedit/drag.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exedit/drag_fun.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exedit/drag_fun.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exedit/drag_fun.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exedit/drag_fun.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exedit/drag_super.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exedit/drag_super.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exedit/drag_super.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exedit/drag_super.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exedit/edit.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exedit/edit.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exedit/edit.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exedit/edit.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exedit/edit_fun.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exedit/edit_fun.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exedit/edit_fun.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exedit/edit_fun.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exedit/edit_super.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exedit/edit_super.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exedit/edit_super.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exedit/edit_super.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exedit/multiTree.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exedit/multiTree.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exedit/multiTree.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exedit/multiTree.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exhide/checkbox.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exhide/checkbox.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exhide/checkbox.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exhide/checkbox.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exhide/common.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exhide/common.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exhide/common.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exhide/common.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exhide/radio.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exhide/radio.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/exhide/radio.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/exhide/radio.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/fuzzySearch/fuzzySearch.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/fuzzySearch/fuzzySearch.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/fuzzySearch/fuzzySearch.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/fuzzySearch/fuzzySearch.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/index.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/index.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/index.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/index.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/asyncForAll.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/asyncForAll.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/asyncForAll.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/asyncForAll.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/awesome.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/awesome.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/awesome.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/awesome.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/checkbox_radio.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/checkbox_radio.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/checkbox_radio.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/checkbox_radio.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/diydom.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/diydom.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/diydom.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/diydom.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/dragWithOther.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/dragWithOther.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/dragWithOther.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/dragWithOther.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/fuzzySearch.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/fuzzySearch.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/fuzzySearch.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/fuzzySearch.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/left_menu.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/left_menu.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/left_menu.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/left_menu.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/left_menuForOutLook.gif b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/left_menuForOutLook.gif similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/left_menuForOutLook.gif rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/left_menuForOutLook.gif diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/left_menuForOutLook.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/left_menuForOutLook.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/left_menuForOutLook.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/left_menuForOutLook.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/left_menuForOutLook.png b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/left_menuForOutLook.png similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/left_menuForOutLook.png rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/left_menuForOutLook.png diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/metro.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/metro.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/metro.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/metro.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/oneclick.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/oneclick.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/oneclick.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/oneclick.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/oneroot.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/oneroot.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/oneroot.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/oneroot.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/rightClickMenu.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/rightClickMenu.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/rightClickMenu.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/rightClickMenu.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/select_menu.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/select_menu.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/select_menu.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/select_menu.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/select_menu_checkbox.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/select_menu_checkbox.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/select_menu_checkbox.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/select_menu_checkbox.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/select_menu_radio.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/select_menu_radio.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/select_menu_radio.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/select_menu_radio.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/singlepath.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/singlepath.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/singlepath.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/singlepath.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/ztree.html b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/ztree.html similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/en/super/ztree.html rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/en/super/ztree.html diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/js/fuzzysearch.js b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/js/fuzzysearch.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/demo/js/fuzzysearch.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/demo/js/fuzzysearch.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery-1.4.4.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery-1.4.4.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery-1.4.4.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery-1.4.4.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.all.js b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.all.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.all.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.all.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.all.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.all.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.all.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.all.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.core.js b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.core.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.core.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.core.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.core.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.core.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.core.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.core.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.excheck.js b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.excheck.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.excheck.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.excheck.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.excheck.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.excheck.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.excheck.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.excheck.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.exedit.js b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.exedit.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.exedit.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.exedit.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.exedit.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.exedit.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.exedit.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.exedit.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.exhide.js b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.exhide.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.exhide.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.exhide.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.exhide.min.js b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.exhide.min.js similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/js/jquery.ztree.exhide.min.js rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/js/jquery.ztree.exhide.min.js diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/log v3.x.txt b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/log v3.x.txt similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/log v3.x.txt rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/log v3.x.txt diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/package.json b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/package.json similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/package.json rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/package.json diff --git a/maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/zTree.v3.jquery.json b/maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/zTree.v3.jquery.json similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/jquery/zTree-v3.5.40/zTree.v3.jquery.json rename to maxkey-web-maxkey/src/main/resources/static/jquery/zTree-v3.5.40/zTree.v3.jquery.json diff --git a/maxkey-web-maxkey/src/main/webapp/trusts/connsec.cer b/maxkey-web-maxkey/src/main/resources/static/trusts/connsec.cer similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/trusts/connsec.cer rename to maxkey-web-maxkey/src/main/resources/static/trusts/connsec.cer diff --git a/maxkey-web-maxkey/src/main/webapp/trusts/jwk.jwks b/maxkey-web-maxkey/src/main/resources/static/trusts/jwk.jwks similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/trusts/jwk.jwks rename to maxkey-web-maxkey/src/main/resources/static/trusts/jwk.jwks diff --git a/maxkey-web-maxkey/src/main/webapp/trusts/jwk.xml b/maxkey-web-maxkey/src/main/resources/static/trusts/jwk.xml similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/trusts/jwk.xml rename to maxkey-web-maxkey/src/main/resources/static/trusts/jwk.xml diff --git a/maxkey-web-maxkey/src/main/webapp/trusts/openid-configuration b/maxkey-web-maxkey/src/main/resources/static/trusts/openid-configuration similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/trusts/openid-configuration rename to maxkey-web-maxkey/src/main/resources/static/trusts/openid-configuration diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/app_password_protected.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/authorize/app_password_protected.ftl similarity index 62% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/app_password_protected.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/authorize/app_password_protected.ftl index bd659b8ec..5293069a9 100644 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/app_password_protected.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/authorize/app_password_protected.ftl @@ -1,16 +1,13 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> Second Protected - - + + - + @@ -18,7 +15,7 @@
- + diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/desktop_qq_sso_execute.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/authorize/desktop_qq_sso_execute.ftl similarity index 89% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/desktop_qq_sso_execute.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/authorize/desktop_qq_sso_execute.ftl index 6bf30ff46..d081bfc1b 100644 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/desktop_qq_sso_execute.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/authorize/desktop_qq_sso_execute.ftl @@ -1,13 +1,10 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> QQ SSO Execute - - + + + + - - - - - + + + + + + + + <#-- bootstrap-4.3.1 --> + + + <#-- metadata --> + + <#--bootstrap-table-1.14.2--> + + + + <#-- zTreev 3.5--> + + + + <#-- artDialog-5.0.4 --> + + + + <#-- datetimepicker-2.5.20 --> + + + + <#-- form --> + + + <#-- blockUI --> + + <#-- serializeObject --> + + <#-- validation --> + + + + + + <#-- common script start --> + + <#-- common script end --> + <#-- platform common script --> + + <#-- common js end --> + <#-- common css begin --> + <#-- if browser is not msie 6.0,follow styles over ie 6.0 style --> + + + + <#-- common css end --> \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/footer.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/layout/footer.ftl similarity index 58% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/footer.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/layout/footer.ftl index ec4a7b7f1..1722e400d 100644 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/footer.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/layout/footer.ftl @@ -1,13 +1,10 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - - <%-- footer --%> + <#-- footer -->
<@locale code="userinfo.appLoginPassword" />
diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/header.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/layout/header.ftl similarity index 56% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/header.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/layout/header.ftl index d54062b1d..51a926deb 100644 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/header.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/layout/header.ftl @@ -1,11 +1,10 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - <s:Locale code="global.application"/> + <@locale code="global.application"/> - - \ No newline at end of file + + + \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/layout/left.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/layout/left.ftl new file mode 100644 index 000000000..139597f9c --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/layout/left.ftl @@ -0,0 +1,2 @@ + + diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/main.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/layout/main.ftl similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/main.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/layout/main.ftl diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/nav_primary.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/layout/nav_primary.ftl similarity index 59% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/nav_primary.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/layout/nav_primary.ftl index e4cb0c14e..7f38f2706 100644 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/nav_primary.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/layout/nav_primary.ftl @@ -1,74 +1,66 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ page language="java" import="org.maxkey.web.*" %> -<%@ page language="java" import="org.maxkey.domain.*"%> -<%@ page language="java" import="org.maxkey.domain.userinfo.*"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> @@ -82,6 +74,8 @@ $("#nav_second").html(""); } } + + displaySecondNavs('${Request["mnid"]!"nav_primay_15"}'); $(".menuprimary ul li").mouseover(function(){ displaySecondNavs(this.id); }); diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/nav_second.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/layout/nav_second.ftl similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/nav_second.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/layout/nav_second.ftl diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/nav_third.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/layout/nav_third.ftl similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/nav_third.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/layout/nav_third.ftl diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/layout/nologintop.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/layout/nologintop.ftl new file mode 100644 index 000000000..96bfea465 --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/layout/nologintop.ftl @@ -0,0 +1,11 @@ +
+
+
+
+
<@locale code="global.application"/>
+
+
+ +
+
+
diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/layout/top.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/layout/top.ftl new file mode 100644 index 000000000..9450ac154 --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/layout/top.ftl @@ -0,0 +1,53 @@ +
+
+
+
+
<@locale code="global.application"/>
+ +
+
+
- ©
+ <@locale code="global.text.copyright"/> © <@locale code="global.text.copyright.content"/>
https://github.com/shimingxy/MaxKey/
+ + + <#if Session["current_user"].gridList==0 > + + + <#else> + + + + + + + + +
+ <@locale code="global.text.welcome"/>： + <#if Session["current_user"]?exists> + ${Session["current_user"].displayName} ${Session["current_user"].username} + +    + + + + + + + + + + +
  <@locale code="login.password.changepassword"/>  
+ + 		+ +
  <@locale code="global.text.manage"/>  
+ + 		+ +
  <@locale code="global.text.logout"/>  
+ +
+ + + \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/loggedout.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/loggedout.ftl new file mode 100644 index 000000000..d00919876 --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/loggedout.ftl @@ -0,0 +1,32 @@ + + + + <#include "layout/header.ftl"/> + <#include "layout/common.cssjs.ftl"/> + <@locale code="global.logout.tip"/> + + + + +
+ <#include "layout/nologintop.ftl"/> +
+
+

<@locale code="global.logout.tip"/>

+ +

+ <@locale code="global.logout.text.prefix"/> + + <@locale code="global.logout.text.suffix"/> + +

+
+ + + diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/login.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl similarity index 59% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/login.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/login.ftl index b8ae81adb..43cbceb99 100644 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/login.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/login.ftl @@ -1,19 +1,11 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> -<%@ page import="org.maxkey.web.WebContext"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> -<%if(WebContext.getUserInfo() != null) {%> - - - + + + + +<#include "../layout/top.ftl"/> +<#include "../layout/nav_primary.ftl"/> + +
+
+ + + + + + +
+ <@locale code="apps.name"/>: + + + + "> + " expandValue="<@locale code="button.text.expandsearch"/>" collapseValue="<@locale code="button.text.collapsesearch"/>"> + + + +
+ + +
+ + + +
+ + + + + + + + + + + + + +
<@locale code="log.loginappshistory.id" /><@locale code="log.loginappshistory.sessionId" /><@locale code="log.loginappshistory.uid" /><@locale code="log.loginappshistory.username" /><@locale code="log.loginappshistory.displayName" /><@locale code="log.loginappshistory.appId" /><@locale code="log.loginappshistory.appName" /><@locale code="log.loginappshistory.loginTime" />
+
+ +
+ + + \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/logs/loginHistoryList.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/logs/loginHistoryList.ftl similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/logs/loginHistoryList.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/logs/loginHistoryList.ftl diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/logs/logsList.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/logs/logsList.ftl similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/logs/logsList.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/logs/logsList.ftl diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/main/appConfigList.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.jsp similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/main/appConfigList.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.jsp diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/main/appList.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/main/appList.ftl new file mode 100644 index 000000000..85441c7eb --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/main/appList.ftl @@ -0,0 +1,95 @@ + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + +<#include "../layout/top.ftl"/> +<#include "../layout/nav_primary.ftl"/> +
+<#if Session["current_user"].gridList==0 > + + <#list appList as app> + <#if (app_index)%4==0> + + + + <#if (app_index +1)%4==0> + + + + <#if (appList?size)%4!=0> + + +
+ + + +
+ <#if "Desktop"==app.protocol> + + + + + <#if "Desktop"!=app.protocol> + + + + +
${app.name}
+
+<#else> + + + + + + + + + + <#list appList as app> + + + + + + + + +
+ <@locale code="apps.icon"/> + <@locale code="apps.name"/><@locale code="apps.protocol"/><@locale code="apps.category"/> + <@locale code="button.text.action"/> +
+ <#if app.protocol?contains("Desktop")> + + + + <#else> + + + + + ${app.name}${app.protocol}${app.category} + <#if app.protocol ?contains("Desktop")> + + <@locale code="button.text.visit"/> + + <#else> + + <@locale code="button.text.visit"/> + + +
+ +
+ + + \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/main/appProtectedConfig.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/main/appProtectedConfig.jsp similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/main/appProtectedConfig.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/main/appProtectedConfig.jsp diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/main/appUserConfig.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/main/appUserConfig.jsp similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/main/appUserConfig.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/main/appUserConfig.jsp diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/passwordExpired.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/passwordExpired.ftl similarity index 60% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/passwordExpired.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/passwordExpired.ftl index bf028d3c9..723631144 100644 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/passwordExpired.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/passwordExpired.ftl @@ -1,17 +1,14 @@ -<%@page session="false" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - - + <#include "layout/header.ftl"/> + <#include "layout/common.cssjs.ftl"/> - <s:Locale code="login.password.expired" /> + <@locale code="login.password.expired" />
- + <#include "layout/nologintop.ftl"/>
@@ -19,29 +16,29 @@
-
+ - + - + - + - + - + @@ -73,7 +70,7 @@ diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/passwordInitial.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/passwordInitial.ftl similarity index 59% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/passwordInitial.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/passwordInitial.ftl index bce4f7ee5..c8daba057 100644 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/passwordInitial.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/passwordInitial.ftl @@ -1,17 +1,14 @@ -<%@page session="false" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - - + <#include "layout/header.ftl"/> + <#include "layout/common.cssjs.ftl"/> - <s:Locale code="login.password.initial.change.tip" /> + <@locale code="login.password.initial.change.tip" />
- + <#include "layout/nologintop.ftl"/>
@@ -19,29 +16,29 @@
<@locale code="login.password.expired.tip" />
:<@locale code="userinfo.displayName" /> :
:<@locale code="userinfo.username" /> :
:<@locale code="login.password.newPassword" />: * @@ -49,7 +46,7 @@
:<@locale code="login.password.confirmPassword" />: * @@ -59,7 +56,7 @@
- "/> + "/>
- + - + - + - + - + - + @@ -72,7 +69,7 @@ diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/profile/myProfile.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/profile/myProfile.ftl new file mode 100644 index 000000000..d35ef1149 --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/profile/myProfile.ftl @@ -0,0 +1,1030 @@ + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + + +<#include "../layout/top.ftl"/> +<#include "../layout/nav_primary.ftl"/> +
+ +
+
+
+ + +
<@locale code="login.password.initial.change.tip" />
:<@locale code="userinfo.displayName" /> :
:<@locale code="userinfo.username" /> :
:<@locale code="login.password.newPassword" />: * @@ -49,7 +46,7 @@
:<@locale code="login.password.confirmPassword" />: * @@ -59,7 +56,7 @@
- "/> + "/>
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
<@locale code="userinfo.username" />： + + + + <@locale code="userinfo.userType" />： + +
  +
<@locale code="userinfo.displayName" />： + + + <@locale code="userinfo.picture" />： + <#if null == model.picture > + + <#else> + + + + * +
<@locale code="userinfo.familyName" />： + + * +
<@locale code="userinfo.givenName" />： + + * +
<@locale code="userinfo.middleName" />： + + +
<@locale code="userinfo.nickName" />： + + + <@locale code="userinfo.gender" />： + + + +
<@locale code="userinfo.married" />： + + <@locale code="userinfo.website" />： + + + +
<@locale code="userinfo.idtype" />： + + <@locale code="userinfo.idCardNo" />： + + +
  +
<@locale code="userinfo.startWorkDate" />： + + + <@locale code="userinfo.preferredLanguage" />： + +
<@locale code="userinfo.timeZone" />： + + + <@locale code="userinfo.locale" />： + +
  +
<@locale code="userinfo.employeeNumber" />： + + + <@locale code="userinfo.windowsAccount" />： + + +
<@locale code="userinfo.organization" />： + + + <@locale code="userinfo.division" />： + + +
<@locale code="userinfo.department" />： + + + + <@locale code="userinfo.costCenter" />： + + +
<@locale code="userinfo.jobTitle" />： + + + <@locale code="userinfo.jobLevel" />： + + +
<@locale code="userinfo.manager" />： + + + + <@locale code="userinfo.assistant" />： + + + +
<@locale code="userinfo.entryDate" />： + + + <@locale code="userinfo.quitDate" />： + + +
  +
<@locale code="userinfo.workCountry" />： + + + <@locale code="userinfo.workRegion" />： + + +
<@locale code="userinfo.workLocality" />： + + + <@locale code="userinfo.workStreetAddress" />： + + +
<@locale code="userinfo.workPostalCode" />： + + + <@locale code="userinfo.workFax" />： + + +
<@locale code="userinfo.workPhoneNumber" />： + + + <@locale code="userinfo.workEmail" />： + + +
  +
<@locale code="userinfo.homeCountry" />： + + + <@locale code="userinfo.homeRegion" />： + + +
<@locale code="userinfo.homeLocality" />： + + + <@locale code="userinfo.homeStreetAddress" />： + + +
<@locale code="userinfo.homePostalCode" />： + + + <@locale code="userinfo.homeFax" />： + + +
<@locale code="userinfo.homePhoneNumber" />： + + + <@locale code="userinfo.homeEmail" />： + + +
  +
+
+ + +
+
+ + "/> +
+
+ + + + + + \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/registration/activated.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/registration/activated.jsp similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/registration/activated.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/registration/activated.jsp diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/registration/initPassword.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/registration/initPassword.jsp similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/registration/initPassword.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/registration/initPassword.jsp diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/registration/register.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/registration/register.jsp similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/registration/register.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/registration/register.jsp diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/registration/registered.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/registration/registered.jsp similarity index 100% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/registration/registered.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/registration/registered.jsp diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/safe/changePassword.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/safe/changeAppLoginPasswod.ftl similarity index 60% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/safe/changePassword.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/safe/changeAppLoginPasswod.ftl index 5db61d3d5..a9ca4189e 100644 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/safe/changePassword.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/safe/changeAppLoginPasswod.ftl @@ -1,44 +1,40 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - - + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> - - +<#include "../layout/top.ftl"/> +<#include "../layout/nav_primary.ftl"/>
-
+ - + - + - + - + - + - + @@ -76,7 +72,7 @@
<@locale code="login.password.applogin.changepassword" />
:<@locale code="userinfo.displayName" /> :
:<@locale code="userinfo.username" /> :
:<@locale code="login.password.oldPassword" /> : * @@ -46,7 +42,7 @@
:<@locale code="login.password.newPassword" />: * @@ -54,7 +50,7 @@
:<@locale code="login.password.confirmPassword" />: * @@ -64,7 +60,7 @@
- "/> + "/>
\ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/safe/changeAppLoginPasswod.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/safe/changePassword.ftl similarity index 60% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/safe/changeAppLoginPasswod.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/safe/changePassword.ftl index 3a4d26406..c25f465ad 100644 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/safe/changeAppLoginPasswod.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/safe/changePassword.ftl @@ -1,44 +1,40 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - - + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> - - +<#include "../layout/top.ftl"/> +<#include "../layout/nav_primary.ftl"/>
- + - + - + - + - + - + - + @@ -76,7 +72,7 @@
<@locale code="login.password.changepassword" />
:<@locale code="userinfo.displayName" /> :
:<@locale code="userinfo.username" /> :
:<@locale code="login.password.oldPassword" /> : * @@ -46,7 +42,7 @@
:<@locale code="login.password.newPassword" />: * @@ -54,7 +50,7 @@
:<@locale code="login.password.confirmPassword" />: * @@ -64,7 +60,7 @@
- "/> + "/>
\ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/safe/setting.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/safe/setting.ftl new file mode 100644 index 000000000..146219c22 --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/safe/setting.ftl @@ -0,0 +1,105 @@ + + + + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> + + +<#include "../layout/top.ftl"/> +<#include "../layout/nav_primary.ftl"/> +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
authnSetting
<@locale code="userinfo.displayName" /> : + + +
<@locale code="userinfo.username" /> : + + +
<@locale code="userinfo.authnType" />: + +
<@locale code="userinfo.mobile" /> : + + +
Verify Code : + + +
<@locale code="userinfo.email" /> : + + +
Verify Code : + + +
+ + "/> + +
+ +
+
+ + + \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/otp/timeBased.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/safe/timeBased.ftl similarity index 53% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/otp/timeBased.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/safe/timeBased.ftl index 00737b3a4..0c88edc95 100644 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/otp/timeBased.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/safe/timeBased.ftl @@ -1,66 +1,61 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> - - +<#include "../layout/top.ftl"/> +<#include "../layout/nav_primary.ftl"/>
- + - +
<@locale code="login.totp.title" />
" /> - + - + - + - + - + - + - + @@ -68,7 +63,7 @@
:<@locale code="userinfo.displayName" /> :
:<@locale code="userinfo.username" /> :
(BASE32) :<@locale code="login.totp.sharedSecret" />(BASE32) :
(HEX) :<@locale code="login.totp.sharedSecret" />(HEX) :
:<@locale code="login.totp.period" />:
:<@locale code="login.totp.digits" />:
:<@locale code="login.totp.crypto" />:
- " type="button" id="forward" value=""/> + "/>
@@ -77,7 +72,7 @@
\ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/social/socialSignOnProvider.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/social/socialSignOnProvider.ftl similarity index 76% rename from maxkey-web-maxkey/src/main/webapp/WEB-INF/views/social/socialSignOnProvider.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/social/socialSignOnProvider.ftl index 62c811f2c..86b9fff8c 100644 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/social/socialSignOnProvider.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/social/socialSignOnProvider.ftl @@ -1,20 +1,12 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ page import="org.maxkey.domain.*"%> -<%@ page import="org.maxkey.web.*"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> - - + <#include "../layout/header.ftl"/> + <#include "../layout/common.cssjs.ftl"/> - - +<#include "../layout/top.ftl"/> +<#include "../layout/nav_primary.ftl"/>
<%if(WebContext.getUserInfo().getGridList()==0) {%> @@ -74,7 +66,7 @@ <%} %> \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/timeout.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/timeout.ftl new file mode 100644 index 000000000..17827f8ae --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/timeout.ftl @@ -0,0 +1,27 @@ + + + + <#include "layout/header.ftl"/> + <#include "layout/common.cssjs.ftl"/> + + <@locale code="login.session.timeout.tip"/> + + +
+ <#include "layout/nologintop.ftl"/> +
+
+

<@locale code="login.session.timeout.tip"/>

+ +

+ <@locale code="login.session.timeout.prefix"/> + + <@locale code="login.session.timeout.suffix"/> + . +

+
+ + + diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/trusts/saml_v20_metadata.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/trusts/saml_v20_metadata.ftl new file mode 100644 index 000000000..3f6df167e --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/trusts/saml_v20_metadata.ftl @@ -0,0 +1 @@ +${metadata} \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-cas.xml b/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-cas.xml deleted file mode 100644 index 6e9a9e42b..000000000 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/spring/maxkey-support-cas.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/desktop_sso_execute.jsp b/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/desktop_sso_execute.jsp deleted file mode 100644 index 45d3e67cd..000000000 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/desktop_sso_execute.jsp +++ /dev/null @@ -1,24 +0,0 @@ - -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - - - - Desktop SSO Execute - - - - - - - - - - - diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/oauth_access_confirmation.jsp b/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/oauth_access_confirmation.jsp deleted file mode 100644 index c5caedf7f..000000000 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/authorize/oauth_access_confirmation.jsp +++ /dev/null @@ -1,60 +0,0 @@ - -<%@ page import="org.springframework.security.core.AuthenticationException" %> -<%@ page import="org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter" %> -<%@ page import="org.maxkey.authz.oauth2.common.exceptions.UnapprovedClientAuthenticationException" %> -<%@ page import="org.springframework.security.web.WebAttributes" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - - - - - - - - -
- -
-
- - - <% if (session.getAttribute(WebAttributes.AUTHENTICATION_EXCEPTION) != null && !(session.getAttribute(WebAttributes.AUTHENTICATION_EXCEPTION) instanceof UnapprovedClientAuthenticationException)) { %> -
-

Woops!

- -

Access could not be granted. (<%= ((AuthenticationException) session.getAttribute(WebAttributes.AUTHENTICATION_EXCEPTION)).getMessage() %>)

-
- <% } %> - - -

Please Confirm OAuth 2.0

- -

You hereby authorize "${client.clientId}" to access your protected resources.

-
- - -
    - - - checked - - - checked - -
  • - ${scope.key}: - Approve - Deny -
    • -     -
- - - -
- - - diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/common.cssjs.jsp b/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/common.cssjs.jsp deleted file mode 100644 index 4520e7a24..000000000 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/common.cssjs.jsp +++ /dev/null @@ -1,88 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - <%-- javascript js begin --%> - <%-- jquery base --%> - - - <%-- bootstrap-4.3.1 --%> - - - <%-- metadata --%> - - <%--bootstrap-table-1.14.2--%> - - - - <%-- zTreev 3.5--%> - - - - <%-- artDialog-5.0.4 --%> - - - - <%-- datetimepicker-2.5.20 --%> - - - - <%-- form --%> - - - <%-- blockUI --%> - - <%-- serializeObject --%> - - <%-- validation --%> - - - - - - <%-- common script start --%> - - <%-- common script end --%> - <%-- platform common script --%> - - <%-- common js end --%> - <%-- common css begin --%> - <%-- if browser is not msie 6.0,follow styles over ie 6.0 style --%> - - - - <%-- common css end --%> \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/left.jsp b/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/left.jsp deleted file mode 100644 index 5fe988bd9..000000000 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/left.jsp +++ /dev/null @@ -1,6 +0,0 @@ - -<%@ page contentType="text/html; charset=UTF-8" language="java" %> -<%@ page import="java.util.*"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/nologintop.jsp b/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/nologintop.jsp deleted file mode 100644 index 800965426..000000000 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/nologintop.jsp +++ /dev/null @@ -1,18 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" language="java" %> -<%@ page import="org.maxkey.domain.*"%> -<%@ page import="org.maxkey.web.*"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - -
-
-
-
-
-
-
- -
-
-
- diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/top.jsp b/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/top.jsp deleted file mode 100644 index 51206ab29..000000000 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/layout/top.jsp +++ /dev/null @@ -1,55 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" language="java" %> -<%@ page import="org.maxkey.domain.*"%> -<%@ page import="org.maxkey.web.*"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - -
-
-
-
-
- -
-
-
- - - <%if(WebContext.getUserInfo().getGridList()==0) {%> - - - <%}else{%> - - - <%} %> - - - - - -
<%System.out.println(WebContext.getUserInfo()); %> - ：<%=WebContext.getUserInfo()==null?"":WebContext.getUserInfo().getDisplayName()%>(<%=WebContext.getUserInfo()==null?"":WebContext.getUserInfo().getUsername()%>)   - - - - - - - - - - -
    
- - 		- -
    
- - 		- -
    
- -
-
-
- \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/loggedout.jsp b/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/loggedout.jsp deleted file mode 100644 index a978bb00b..000000000 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/loggedout.jsp +++ /dev/null @@ -1,38 +0,0 @@ -<%@page session="false" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - - - - - - - - <s:Locale code="global.logout.tip"/> - - - - -
- -
-
-

- -

- - - - -

-
- - - diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/logs/loginAppHistoryList.jsp b/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/logs/loginAppHistoryList.jsp deleted file mode 100644 index 20ebbe693..000000000 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/logs/loginAppHistoryList.jsp +++ /dev/null @@ -1,91 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8"%> -<%@ page import="org.maxkey.domain.*"%> -<%@ page import="java.util.Map,java.util.LinkedHashMap"%> -<%@ page import="org.maxkey.web.*"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - - - - - - - -
-
- - - - - - -
- : - -
- - "> - " expandValue="" collapseValue=""> - -
- -
- - -
- - - -
- - - - - - - - - - - - - -
-
- -
- - - \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/main/appList.jsp b/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/main/appList.jsp deleted file mode 100644 index 7fab6d081..000000000 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/main/appList.jsp +++ /dev/null @@ -1,105 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ page import="org.maxkey.domain.*"%> -<%@ page import="org.maxkey.web.*"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> - - - - - - - - - -
-<%if(WebContext.getUserInfo().getGridList()==0) {%> - - - - - - - - -
- - - - -
- - - - - - - - - - -
${app.name}
- -
-<%}else{%> - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - ${app.name}${app.protocol}${app.category} - - - - - - - - - - -
-<%} %> -
- - - \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/otp/counterBased.jsp b/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/otp/counterBased.jsp deleted file mode 100644 index 17d5a2689..000000000 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/otp/counterBased.jsp +++ /dev/null @@ -1,82 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - -
- - - - - - - - - - - -
CounterBased One Time Password
" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
: - - -
: - -
(BASE32) : - -
(HEX) : - -
: - -
: - -
: - -
: - -
- " type="button" id="forward" value=""/> - -
-
-
\ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/otp/hotp.jsp b/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/otp/hotp.jsp deleted file mode 100644 index 8458212fc..000000000 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/otp/hotp.jsp +++ /dev/null @@ -1,82 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - -
- - - - - - - - - - -
HOTP One Time Password
" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
: - - -
: - -
(BASE32) : - -
(HEX) : - -
: - -
: - -
: - -
: - -
- " type="button" id="forward" value=""/> - -
-
-
\ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/profile/myProfile.jsp b/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/profile/myProfile.jsp deleted file mode 100644 index 79e649ce1..000000000 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/profile/myProfile.jsp +++ /dev/null @@ -1,1039 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ page import="org.maxkey.web.*"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - - - - - - -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
： - - - - ： - - - -
  -
： - - - ： - - " /> - - - " /> - - - * -
： - - * -
： - - * -
： - - -
： - - - ： - - - -
： - - ： - - - -
： - - ： - - -
  -
： - - - ： - -
： - - - ： - -
  -
： - - - ： - - -
： - - - ： - - -
： - - - - ： - - -
： - - - ： - - -
： - - - - ： - - - -
： - - - ： - - -
  -
： - - - ： - - -
： - - - ： - - -
： - - - ： - - -
： - - - ： - - -
  -
： - - - ： - - -
： - - - ： - - -
： - - - ： - - -
： - - - ： - - -
  -
-
-
-
-
-
- - "/> -
-
-
-
-
- - - \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/safe/setting.jsp b/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/safe/setting.jsp deleted file mode 100644 index baa5a32da..000000000 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/safe/setting.jsp +++ /dev/null @@ -1,110 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - - - - - -
- - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
authnSetting
: - - -
: - - -
: - -
: - - -
Verify Code : - - -
: - - -
Verify Code : - - -
- - "/> - -
-
-
-
- - - \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/timeout.jsp b/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/timeout.jsp deleted file mode 100644 index 1599bbdb8..000000000 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/timeout.jsp +++ /dev/null @@ -1,30 +0,0 @@ -<%@page session="false" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - - - - - - - <s:Locale code="login.session.timeout.tip"/> - - -
- -
-
-

- -

- - - - . -

-
- - - diff --git a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/trusts/saml_v20_metadata.jsp b/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/trusts/saml_v20_metadata.jsp deleted file mode 100644 index 86a8737bb..000000000 --- a/maxkey-web-maxkey/src/main/webapp/WEB-INF/views/trusts/saml_v20_metadata.jsp +++ /dev/null @@ -1 +0,0 @@ -<%@page contentType="text/xml; charset=UTF-8" %>${metadata} \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/webapp/index.jsp b/maxkey-web-maxkey/src/main/webapp/index.jsp deleted file mode 100644 index 37bb9fac4..000000000 --- a/maxkey-web-maxkey/src/main/webapp/index.jsp +++ /dev/null @@ -1,13 +0,0 @@ -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="s" uri="http://sso.maxkey.org/tags"%> - - - - - MaxKey - " /> - - - - - \ No newline at end of file