From 6bc09f4d524fc66f5649deda04c7609b0e633802 Mon Sep 17 00:00:00 2001 From: shimingxy Date: Mon, 23 Mar 2020 15:11:17 +0800 Subject: [PATCH] update jars versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit remove unused，update jars versions --- build.gradle | 69 +- gradle.properties | 18 +- .../java/org/maxkey/util/StringUtils.java | 10 +- .../web/contorller/UserInfoController.java | 8 +- .../static/jquery/artDialog-v7.0/.gitignore | 3 - .../static/jquery/artDialog-v7.0/Gruntfile.js | 44 - .../static/jquery/artDialog-v7.0/LICENSE.md | 56 - .../static/jquery/artDialog-v7.0/README.md | 66 - .../static/jquery/artDialog-v7.0/_config.yml | 1 - .../jquery/artDialog-v7.0/css/dialog.css | 461 ------- .../jquery/artDialog-v7.0/dist/dialog-plus.js | 8 - .../jquery/artDialog-v7.0/dist/dialog.js | 8 - .../jquery/artDialog-v7.0/doc/build/index.js | 21 - .../jquery/artDialog-v7.0/doc/css/doc.css | 512 -------- .../jquery/artDialog-v7.0/doc/index.html | 1128 ----------------- .../static/jquery/artDialog-v7.0/doc/index.md | 1062 ---------------- .../jquery/artDialog-v7.0/doc/js/doc.js | 64 - .../artDialog-v7.0/doc/template/index.html | 329 ----- .../artDialog-v7.0/lib/jquery-1.10.2.js | 4 - .../static/jquery/artDialog-v7.0/package.json | 28 - .../artDialog-v7.0/src/dialog-config.js | 88 -- .../jquery/artDialog-v7.0/src/dialog-plus.js | 130 -- .../jquery/artDialog-v7.0/src/dialog.js | 470 ------- .../static/jquery/artDialog-v7.0/src/drag.js | 212 ---- .../static/jquery/artDialog-v7.0/src/popup.js | 625 --------- .../artDialog-v7.0/test/align-overflow.html | 33 - .../jquery/artDialog-v7.0/test/align.html | 148 --- .../jquery/artDialog-v7.0/test/button.html | 43 - .../jquery/artDialog-v7.0/test/close.html | 38 - .../artDialog-v7.0/test/content-element.html | 55 - .../jquery/artDialog-v7.0/test/content.html | 35 - .../artDialog-v7.0/test/dialog-drag.html | 42 - .../jquery/artDialog-v7.0/test/fixed.html | 27 - .../jquery/artDialog-v7.0/test/focus.html | 63 - .../jquery/artDialog-v7.0/test/follow.html | 37 - .../jquery/artDialog-v7.0/test/iframe.html | 42 - .../test/iframe/dialog-content.html | 70 - .../test/iframe/dialog-input.html | 32 - .../artDialog-v7.0/test/iframe/index.html | 37 - .../artDialog-v7.0/test/iframe/main.html | 52 - .../jquery/artDialog-v7.0/test/loading.html | 42 - .../artDialog-v7.0/test/quickClose.html | 38 - .../artDialog-v7.0/test/show-element.html | 92 -- .../artDialog-v7.0/test/show-event.html | 26 - .../jquery/artDialog-v7.0/test/show.html | 38 - .../jquery/artDialog-v7.0/test/showModal.html | 45 - .../jquery/artDialog-v7.0/test/title.html | 39 - .../jquery/artDialog-v7.0/webpack.config.js | 26 - .../web/contorller/ProfileController.java | 3 - .../static/jquery/artDialog-v7.0/.gitignore | 3 - .../static/jquery/artDialog-v7.0/Gruntfile.js | 44 - .../static/jquery/artDialog-v7.0/LICENSE.md | 56 - .../static/jquery/artDialog-v7.0/README.md | 66 - .../static/jquery/artDialog-v7.0/_config.yml | 1 - .../jquery/artDialog-v7.0/css/dialog.css | 461 ------- .../jquery/artDialog-v7.0/dist/dialog-plus.js | 8 - .../jquery/artDialog-v7.0/dist/dialog.js | 8 - .../jquery/artDialog-v7.0/doc/build/index.js | 21 - .../jquery/artDialog-v7.0/doc/css/doc.css | 512 -------- .../jquery/artDialog-v7.0/doc/index.html | 1128 ----------------- .../static/jquery/artDialog-v7.0/doc/index.md | 1062 ---------------- .../jquery/artDialog-v7.0/doc/js/doc.js | 64 - .../artDialog-v7.0/doc/template/index.html | 329 ----- .../artDialog-v7.0/lib/jquery-1.10.2.js | 4 - .../static/jquery/artDialog-v7.0/package.json | 28 - .../artDialog-v7.0/src/dialog-config.js | 88 -- .../jquery/artDialog-v7.0/src/dialog-plus.js | 130 -- .../jquery/artDialog-v7.0/src/dialog.js | 470 ------- .../static/jquery/artDialog-v7.0/src/drag.js | 212 ---- .../static/jquery/artDialog-v7.0/src/popup.js | 625 --------- .../artDialog-v7.0/test/align-overflow.html | 33 - .../jquery/artDialog-v7.0/test/align.html | 148 --- .../jquery/artDialog-v7.0/test/button.html | 43 - .../jquery/artDialog-v7.0/test/close.html | 38 - .../artDialog-v7.0/test/content-element.html | 55 - .../jquery/artDialog-v7.0/test/content.html | 35 - .../artDialog-v7.0/test/dialog-drag.html | 42 - .../jquery/artDialog-v7.0/test/fixed.html | 27 - .../jquery/artDialog-v7.0/test/focus.html | 63 - .../jquery/artDialog-v7.0/test/follow.html | 37 - .../jquery/artDialog-v7.0/test/iframe.html | 42 - .../test/iframe/dialog-content.html | 70 - .../test/iframe/dialog-input.html | 32 - .../artDialog-v7.0/test/iframe/index.html | 37 - .../artDialog-v7.0/test/iframe/main.html | 52 - .../jquery/artDialog-v7.0/test/loading.html | 42 - .../artDialog-v7.0/test/quickClose.html | 38 - .../artDialog-v7.0/test/show-element.html | 92 -- .../artDialog-v7.0/test/show-event.html | 26 - .../jquery/artDialog-v7.0/test/show.html | 38 - .../jquery/artDialog-v7.0/test/showModal.html | 45 - .../jquery/artDialog-v7.0/test/title.html | 39 - .../jquery/artDialog-v7.0/webpack.config.js | 26 - 93 files changed, 50 insertions(+), 12898 deletions(-) delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/.gitignore delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/Gruntfile.js delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/LICENSE.md delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/README.md delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/_config.yml delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/css/dialog.css delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/dist/dialog-plus.js delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/dist/dialog.js delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/doc/build/index.js delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/doc/css/doc.css delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/doc/index.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/doc/index.md delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/doc/js/doc.js delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/doc/template/index.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/lib/jquery-1.10.2.js delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/package.json delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/src/dialog-config.js delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/src/dialog-plus.js delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/src/dialog.js delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/src/drag.js delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/src/popup.js delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/align-overflow.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/align.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/button.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/close.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/content-element.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/content.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/dialog-drag.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/fixed.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/focus.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/follow.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/iframe.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/iframe/dialog-content.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/iframe/dialog-input.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/iframe/index.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/iframe/main.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/loading.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/quickClose.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/show-element.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/show-event.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/show.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/showModal.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/test/title.html delete mode 100644 maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/webpack.config.js delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/.gitignore delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/Gruntfile.js delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/LICENSE.md delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/README.md delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/_config.yml delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/css/dialog.css delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/dist/dialog-plus.js delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/dist/dialog.js delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/build/index.js delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/css/doc.css delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/index.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/index.md delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/js/doc.js delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/doc/template/index.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/lib/jquery-1.10.2.js delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/package.json delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/src/dialog-config.js delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/src/dialog-plus.js delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/src/dialog.js delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/src/drag.js delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/src/popup.js delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/align-overflow.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/align.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/button.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/close.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/content-element.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/content.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/dialog-drag.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/fixed.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/focus.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/follow.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/iframe.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/iframe/dialog-content.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/iframe/dialog-input.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/iframe/index.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/iframe/main.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/loading.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/quickClose.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/show-element.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/show-event.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/show.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/showModal.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/test/title.html delete mode 100644 maxkey-web-maxkey/src/main/resources/static/jquery/artDialog-v7.0/webpack.config.js diff --git a/build.gradle b/build.gradle index bef44d836..fb9ef4be4 100644 --- a/build.gradle +++ b/build.gradle @@ -125,9 +125,9 @@ subprojects { compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1' //apache compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.3' - compile group: 'commons-codec', name: 'commons-codec', version: '1.12' + compile group: 'commons-codec', name: 'commons-codec', version: '1.14' compile group: 'commons-collections', name: 'commons-collections', version: '3.2.2' - compile group: 'org.apache.commons', name: 'commons-csv', version: '1.7' + //compile group: 'org.apache.commons', name: 'commons-csv', version: '1.7' compile group: 'org.apache.commons', name: 'commons-dbcp2', version: '2.6.0' compile group: 'commons-dbutils', name: 'commons-dbutils', version: '1.7' compile group: 'org.apache.commons', name: 'commons-digester3', version: '3.2' @@ -144,10 +144,10 @@ subprojects { compile group: 'org.apache.httpcomponents', name: 'fluent-hc', version: "${httpcomponentsVersion}" compile group: 'org.apache.httpcomponents', name: 'httpclient-cache', version: "${httpcomponentsVersion}" compile group: 'org.apache.httpcomponents', name: 'httpmime', version: "${httpcomponentsVersion}" - compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.10' + compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.13' compile group: 'org.apache.velocity', name: 'velocity', version: '1.7' compile group: 'velocity', name: 'velocity-dep', version: '1.4' - compile group: 'org.freemarker', name: 'freemarker', version: '2.3.29' + compile group: 'org.freemarker', name: 'freemarker', version: '2.3.30' compile group: 'org.apache.commons', name: 'not-yet-commons-ssl', version: '0.3.9' //logs compile group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: "${log4jVersion}" @@ -159,7 +159,7 @@ subprojects { compile group: 'org.apache.logging.log4j', name: 'log4j-web', version: "${log4jVersion}" compile group: 'org.slf4j', name: 'slf4j-api', version: "${slf4jVersion}" - compile group: 'org.jboss.logging', name: 'jboss-logging', version: '3.4.0.Final' + compile group: 'org.jboss.logging', name: 'jboss-logging', version: '3.4.1.Final' //spring compile group: 'org.springframework', name: 'spring-aop', version: "${springVersion}" @@ -170,19 +170,19 @@ subprojects { 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}" + //compile group: 'org.springframework', name: 'spring-instrument', version: "${springVersion}" + //compile group: 'org.springframework', name: 'spring-jcl', version: "${springVersion}" compile group: 'org.springframework', name: 'spring-jdbc', version: "${springVersion}" - compile group: 'org.springframework', name: 'spring-jms', version: "${springVersion}" - compile group: 'org.springframework', name: 'spring-messaging', version: "${springVersion}" - compile group: 'org.springframework', name: 'spring-orm', version: "${springVersion}" + //compile group: 'org.springframework', name: 'spring-jms', version: "${springVersion}" + //compile group: 'org.springframework', name: 'spring-messaging', version: "${springVersion}" + //compile group: 'org.springframework', name: 'spring-orm', version: "${springVersion}" compile group: 'org.springframework', name: 'spring-oxm', version: "${springVersion}" - compile group: 'org.springframework', name: 'spring-test', version: "${springVersion}" 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-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', name: 'spring-websocket', version: "${springVersion}" + testCompile group: 'org.springframework', name: 'spring-test', version: "${springVersion}" //spring-security compile group: 'org.springframework.security', name: 'spring-security-core', version: "${springSecurityVersion}" compile group: 'org.springframework.security', name: 'spring-security-web', version: "${springSecurityVersion}" @@ -202,13 +202,14 @@ subprojects { compile group: 'org.opensaml', name: 'openws', version: '1.5.4' compile group: 'org.opensaml', name: 'xmltooling', version: '1.4.4' - compile group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '8.8' + //jose-jwt + compile group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '8.10' compile group: 'net.jcip', name: 'jcip-annotations', version: '1.0' compile group: 'net.minidev', name: 'json-smart', version: '2.3' compile group: 'net.minidev', name: 'asm', version: '1.0.2' - - compile group: 'cn.hutool', name: 'hutool-core', version: '5.1.2' - compile group: 'cn.hutool', name: 'hutool-http', version: '5.1.2' + //oauth third party + compile group: 'cn.hutool', name: 'hutool-core', version: '5.2.2' + compile group: 'cn.hutool', name: 'hutool-http', version: '5.2.2' compile group: 'me.zhyd.oauth', name: 'JustAuth', version: '1.13.2' compile group: 'org.javassist', name: 'javassist', version: '3.23.0-GA' @@ -226,51 +227,51 @@ subprojects { compile group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0.1' compile group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.2' compile group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: '2.3.2' - + //crypto compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: "${bouncycastleVersion}" compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: "${bouncycastleVersion}" compile group: 'org.bouncycastle', name: 'bcprov-ext-jdk15on', version: "${bouncycastleVersion}" compile group: 'com.google.crypto.tink', name: 'tink', version: '1.2.2' - + //kaptcha compile group: 'com.jhlabs', name: 'filters', version: '2.0.235-1' compile group: 'com.github.penggle', name: 'kaptcha', version: '2.3.2' //json - compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5' + compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6' compile group: 'org.codehaus.jackson', name: 'jackson-all', version: '1.8.5' compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jacksonVersion}" compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jacksonVersion}" compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: "${jacksonVersion}" compile group: 'com.fasterxml', name: 'classmate', version: '1.5.0' - compile group: 'com.alibaba', name: 'fastjson', version: '1.2.62' + compile group: 'com.alibaba', name: 'fastjson', version: '1.2.66' compile group: 'org.reactivestreams', name: 'reactive-streams', version: '1.0.2' compile group: 'io.projectreactor', name: 'reactor-core', version: '3.2.10.RELEASE' compile group: 'eu.tekul', name: 'szxcvbn_2.9.2', version: '0.2' - - compile group: 'org.quartz-scheduler', name: 'quartz', version: '2.2.3' + //quartz + compile group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.2' //database compile group: 'mysql', name: 'mysql-connector-java', version: '5.1.48' compile group: 'com.alibaba', name: 'druid', version: '1.1.21' - compile group: 'redis.clients', name: 'jedis', version: '3.0.1' - compile group: 'org.ehcache', name: 'ehcache', version: '3.5.3' + compile group: 'redis.clients', name: 'jedis', version: '3.2.0' + compile group: 'org.ehcache', name: 'ehcache', version: '3.8.1' //mybatis - compile group: 'org.mybatis', name: 'mybatis', version: '3.5.3' - compile group: 'org.mybatis', name: 'mybatis-spring', version: '2.0.3' + compile group: 'org.mybatis', name: 'mybatis', version: '3.5.4' + compile group: 'org.mybatis', name: 'mybatis-spring', version: '2.0.4' //hibernate compile group: 'org.hibernate.validator', name: 'hibernate-validator', version: "${hibernateVersion}" compile group: 'org.hibernate', name: 'hibernate-validator-cdi', version: "${hibernateVersion}" compile group: 'org.hibernate.validator', name: 'hibernate-validator-annotation-processor', version: "${hibernateVersion}" - compile group: 'joda-time', name: 'joda-time', version: '2.10' - compile group: 'org.yaml', name: 'snakeyaml', version: '1.24' + compile group: 'joda-time', name: 'joda-time', version: '2.10.5' + compile group: 'org.yaml', name: 'snakeyaml', version: '1.26' compile group: 'net.sourceforge.nekohtml', name: 'nekohtml', version: '1.9.22' compile group: 'org.jdom', name: 'jdom', version: '2.0.2' compile group: 'com.google.zxing', name: 'core', version: '3.4.0' - compile group: 'com.google.guava', name: 'guava', version: '27.1-jre' - compile group: 'ognl', name: 'ognl', version: '3.2.9' - compile group: 'cglib', name: 'cglib', version: '3.2.12' - compile group: 'org.ow2.asm', name: 'asm', version: '7.0' + compile group: 'com.google.guava', name: 'guava', version: '28.2-jre' + compile group: 'ognl', name: 'ognl', version: '3.2.14' + compile group: 'cglib', name: 'cglib', version: '3.3.0' + compile group: 'org.ow2.asm', name: 'asm', version: '7.3.1' 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' @@ -281,7 +282,7 @@ subprojects { 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: 'com.belerweb', name: 'pinyin4j', version: '2.5.1' testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19' diff --git a/gradle.properties b/gradle.properties index 5e4768a04..89bf47bb6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,12 +5,12 @@ author =shimingxy #Version For use jar jackson2Version =2.9.8 -log4jVersion =2.12.0 -springVersion =5.2.2.RELEASE -springBootVersion =2.2.1.RELEASE -springSecurityVersion =5.2.1.RELEASE -hibernateVersion =6.0.17.Final -slf4jVersion =1.7.26 -jacksonVersion =2.9.9 -bouncycastleVersion =1.60 -httpcomponentsVersion =4.5.6 +log4jVersion =2.13.1 +springVersion =5.2.4.RELEASE +springBootVersion =2.2.5.RELEASE +springSecurityVersion =5.3.0.RELEASE +hibernateVersion =6.1.2.Final +slf4jVersion =1.7.30 +jacksonVersion =2.10.3 +bouncycastleVersion =1.64 +httpcomponentsVersion =4.5.12 diff --git a/maxkey-core/src/main/java/org/maxkey/util/StringUtils.java b/maxkey-core/src/main/java/org/maxkey/util/StringUtils.java index 63112ac87..b9d5a1d41 100644 --- a/maxkey-core/src/main/java/org/maxkey/util/StringUtils.java +++ b/maxkey-core/src/main/java/org/maxkey/util/StringUtils.java @@ -9,12 +9,6 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; -import net.sourceforge.pinyin4j.PinyinHelper; -import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType; -import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat; -import net.sourceforge.pinyin4j.format.HanyuPinyinToneType; -import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination; - public final class StringUtils { /** @@ -413,7 +407,7 @@ public final class StringUtils { * @param first true is Convert first,else all * @return 拼音 */ - public static String hanYu2Pinyin(String hanYu,boolean first){ + /* public static String hanYu2Pinyin(String hanYu,boolean first){ String pinyin = ""; char[] nameChar = hanYu.toCharArray(); HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat(); @@ -436,7 +430,7 @@ public final class StringUtils { } return pinyin; } - + */ public static Map aduserName2Map(String aduserName) { if(isNullOrBlank(aduserName)) { return null; diff --git a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserInfoController.java b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserInfoController.java index f6df2f4d5..85734ed57 100644 --- a/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserInfoController.java +++ b/maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserInfoController.java @@ -105,8 +105,8 @@ public class UserInfoController { } userInfo.setId(userInfo.generateId()); - userInfo.setNameZHShortSpell(StringUtils.hanYu2Pinyin(userInfo.getDisplayName(), true)); - userInfo.setNameZHSpell(StringUtils.hanYu2Pinyin(userInfo.getDisplayName(), false)); + //userInfo.setNameZHShortSpell(StringUtils.hanYu2Pinyin(userInfo.getDisplayName(), true)); + //userInfo.setNameZHSpell(StringUtils.hanYu2Pinyin(userInfo.getDisplayName(), false)); if( userInfoService.insert(userInfo)) { new Message(WebContext.getI18nValue(OPERATEMESSAGE.INSERT_SUCCESS),userInfo,MessageType.success,OperateType.add,MessageScope.DB); } @@ -162,8 +162,8 @@ public class UserInfoController { } _logger.info(userInfo.getExtraAttributeName()); _logger.info(userInfo.getExtraAttributeValue()); - userInfo.setNameZHShortSpell(StringUtils.hanYu2Pinyin(userInfo.getDisplayName(), true)); - userInfo.setNameZHSpell(StringUtils.hanYu2Pinyin(userInfo.getDisplayName(), false)); + //userInfo.setNameZHShortSpell(StringUtils.hanYu2Pinyin(userInfo.getDisplayName(), true)); + //userInfo.setNameZHSpell(StringUtils.hanYu2Pinyin(userInfo.getDisplayName(), false)); convertExtraAttribute(userInfo) ; _logger.info(userInfo.getExtraAttribute()); if(userInfoService.update(userInfo)) { diff --git a/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/.gitignore b/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/.gitignore deleted file mode 100644 index 0bc7c7177..000000000 --- a/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.DS_Store -node_modules -bower_components diff --git a/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/Gruntfile.js b/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/Gruntfile.js deleted file mode 100644 index c8889fb9c..000000000 --- a/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/Gruntfile.js +++ /dev/null @@ -1,44 +0,0 @@ -module.exports = function (grunt) { - - grunt.initConfig({ - pkg: grunt.file.readJSON('package.json'), - meta: { - banner: '/*! <%= pkg.name %> v<%= pkg.version %> | <%= pkg.homepage %> */\n' - }, - unwrap: { - options: { - base: './src', - globalBase: './src/global_modules', - name: 'dialog', - namespace: 'window', - banner: '<%= meta.banner %>' - }, - 'dialog.js': { - src: './src/dialog.js', - dest: './dist/dialog.js' - }, - 'dialog-plus.js': { - src: './src/dialog-plus.js', - dest: './dist/dialog-plus.js' - } - }, - uglify: { - options: { - banner: '<%= meta.banner %>' - }, - 'dialog.js': { - src: './dist/dialog.js', - dest: './dist/dialog-min.js' - }, - 'dialog-plus.js': { - src: './dist/dialog-plus.js', - dest: './dist/dialog-plus-min.js' - } - } - }); - - grunt.loadNpmTasks('grunt-unwrap'); - grunt.loadNpmTasks('grunt-contrib-uglify'); - grunt.registerTask('default', ['unwrap', 'uglify']); - -}; \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/LICENSE.md b/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/LICENSE.md deleted file mode 100644 index a9dc7abe8..000000000 --- a/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/LICENSE.md +++ /dev/null @@ -1,56 +0,0 @@ -GNU LESSER GENERAL PUBLIC LICENSE -Version 3, 29 June 2007 - -Copyright (C) 2007 Free Software Foundation, Inc. - -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - -0. Additional Definitions. -As used herein, “this License” refers to version 3 of the GNU Lesser General Public License, and the “GNU GPL” refers to version 3 of the GNU General Public License. - -“The Library” refers to a covered work governed by this License, other than an Application or a Combined Work as defined below. - -An “Application” is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library. - -A “Combined Work” is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the “Linked Version”. - -The “Minimal Corresponding Source” for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version. - -The “Corresponding Application Code” for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work. - -1. Exception to Section 3 of the GNU GPL. -You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL. - -2. Conveying Modified Versions. -If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version: - -a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or -b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy. -3. Object Code Incorporating Material from Library Header Files. -The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following: - -a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License. -b) Accompany the object code with a copy of the GNU GPL and this license document. -4. Combined Works. -You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following: - -a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License. -b) Accompany the Combined Work with a copy of the GNU GPL and this license document. -c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document. -d) Do one of the following: -0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source. -1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version. -e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.) -5. Combined Libraries. -You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following: - -a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License. -b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. -6. Revised Versions of the GNU Lesser General Public License. -The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation. - -If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/README.md b/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/README.md deleted file mode 100644 index f52925608..000000000 --- a/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/README.md +++ /dev/null @@ -1,66 +0,0 @@ -# artDialog - -[![CDNJS](https://img.shields.io/cdnjs/v/artDialog.svg)](https://cdnjs.com/libraries/artDialog) -[![NPM Version](https://img.shields.io/npm/v/art-dialog.svg)](https://npmjs.org/package/art-dialog) -[![NPM Downloads](https://img.shields.io/npm/dm/art-dialog.svg)](https://npmjs.org/package/art-dialog) - -artDialog——经典、优雅的网页对话框控件。 - -[文档与示例](http://aui.github.io/artDialog/doc/index.html) | [AngularJS 版本](https://github.com/aui/angular-popups) - -``` -npm install --save-dev art-dialog -``` - -## 成功案例 - -超过 40 万网站在使用 artDialog，其中不乏国内顶尖的产品： - -* [QQ空间 v8（腾讯）](http://qzone.qq.com) -* [Phpcms（盛大）](http://www.phpcms.cn) -* [极路由](http://www.hiwifi.com) -* ... - -## 更新历史 - -7.0.0 - -1. 支持 Webpack -2. 支持 Npm -2. 将 CSS 打包到 JS 中 - -6.0.4 - -1. ``content()``方法传入隐藏元素并显示，并且``remove()``的时候会将元素插入到``body``避免被销毁 [#103](https://github.com/aui/artDialog/issues/103) [#126](https://github.com/aui/artDialog/issues/126) -2. 修复``button``方法可能会多次绑定事件的问题 -3. 模态对话框可以避免 shift + tab 将焦点移出对话框 [#67](https://github.com/aui/artDialog/issues/67) - -6.0.3 - -1. 修复``button``方法直接传入 html 不显示的问题 -2. 修复版本管理导致[#78](https://github.com/aui/artDialog/issues/78)重现问题 - -6.0.2 - -1. 提供无依赖 seajs 与 requirejs 的版本 -2. 取消按钮增加``cancelDisplay``配置，保留``cancel``事件的同时也不会显示取消按钮 - -6.0.1 - -1. 进一步完善焦点管理，避免抢夺开发者自己设置的焦点[#67](https://github.com/aui/artDialog/issues/67) -2. 修复对话框内容使用 html5 data-id 属性冲突的问题[#78](https://github.com/aui/artDialog/issues/78) -3. 改善 Esc 快捷键与 cancel 的问题[#36](https://github.com/aui/artDialog/issues/36) - -6.0.0 - -1. 功能增强：支持定义左下角的区域 HTML、支持 12 个方向的气泡对话框、支持无标题栏与按钮区的对话框 -2. 更好的交互体验：更加先进的焦点管理，支持无障碍访问 -3. 面向未来：基于 HTML5 Dialog 的 API -4. 模块化：支持 AMD、CMD 规范 -5. 可选增强版：拖拽支持、简化框架页面调用 - -## 授权协议 - -免费，且开源，基于[LGPL-3.0](./LICENSE.md)协议。 - -[\[AD\] 前端招聘：在海边写代码](https://juejin.im/post/5a2651d06fb9a0451c3a40ad) diff --git a/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/_config.yml b/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/_config.yml deleted file mode 100644 index c4192631f..000000000 --- a/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/_config.yml +++ /dev/null @@ -1 +0,0 @@ -theme: jekyll-theme-cayman \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/css/dialog.css b/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/css/dialog.css deleted file mode 100644 index 62b8ebe12..000000000 --- a/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/css/dialog.css +++ /dev/null @@ -1,461 +0,0 @@ -.ui-dialog { - *zoom: 1; - _float: left; - position: relative; - background-color: #FFF; - border: 1px solid #999; - border-radius: 6px; - outline: 0; - background-clip: padding-box; - font-family: Helvetica, arial, sans-serif; - font-size: 14px; - line-height: 1.428571429; - color: #333; - opacity: 0; - -webkit-transform: scale(0); - transform: scale(0); - -webkit-transition: -webkit-transform .15s ease-in-out, opacity .15s ease-in-out; - transition: transform .15s ease-in-out, opacity .15s ease-in-out; -} - -.ui-popup-show .ui-dialog { - opacity: 1; - -webkit-transform: scale(1); - transform: scale(1); -} - -.ui-popup-focus .ui-dialog { - box-shadow: 0 0 8px rgba(0, 0, 0, 0.1); -} - -.ui-popup-modal .ui-dialog { - box-shadow: 0 0 8px rgba(0, 0, 0, 0.1), 0 0 256px rgba(255, 255, 255, .3); -} - -.ui-dialog-grid { - width: auto; - margin: 0; - border: 0 none; - border-collapse: collapse; - border-spacing: 0; - background: transparent; -} - -.ui-dialog-header, -.ui-dialog-body, -.ui-dialog-footer { - padding: 0; - border: 0 none; - text-align: left; - background: transparent; -} - -.ui-dialog-header { - white-space: nowrap; - border-bottom: 1px solid #E5E5E5; -} - -.ui-dialog-close { - position: relative; - _position: absolute; - float: right; - top: 13px; - right: 13px; - _height: 26px; - padding: 0 4px; - font-size: 21px; - font-weight: bold; - line-height: 1; - color: #000; - text-shadow: 0 1px 0 #FFF; - opacity: .2; - filter: alpha(opacity=20); - cursor: pointer; - background: transparent; - _background: #FFF; - border: 0; - -webkit-appearance: none; -} - -.ui-dialog-close:hover, -.ui-dialog-close:focus { - color: #000000; - text-decoration: none; - cursor: pointer; - outline: 0; - opacity: 0.5; - filter: alpha(opacity=50); -} - -.ui-dialog-title { - margin: 0; - line-height: 1.428571429; - min-height: 16.428571429px; - padding: 15px; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - font-weight: bold; - cursor: default; -} - -.ui-dialog-body { - padding: 20px; - text-align: center; -} - -.ui-dialog-content { - display: inline-block; - position: relative; - vertical-align: middle; - *zoom: 1; - *display: inline; - text-align: left; -} - -.ui-dialog-footer { - padding: 0 20px 20px 20px; -} - -.ui-dialog-statusbar { - float: left; - margin-right: 20px; - padding: 6px 0; - line-height: 1.428571429; - font-size: 14px; - color: #888; - white-space: nowrap; -} - -.ui-dialog-statusbar label:hover { - color: #333; -} - -.ui-dialog-statusbar input, -.ui-dialog-statusbar .label { - vertical-align: middle; -} - -.ui-dialog-button { - float: right; - white-space: nowrap; -} - -.ui-dialog-footer button+button { - margin-bottom: 0; - margin-left: 5px; -} - -.ui-dialog-footer button { - width: auto; - overflow: visible; - display: inline-block; - padding: 6px 12px; - _margin-left: 5px; - margin-bottom: 0; - font-size: 14px; - font-weight: normal; - line-height: 1.428571429; - text-align: center; - white-space: nowrap; - vertical-align: middle; - cursor: pointer; - background-image: none; - border: 1px solid transparent; - border-radius: 4px; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - -o-user-select: none; - user-select: none; -} - -.ui-dialog-footer button:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.ui-dialog-footer button:hover, -.ui-dialog-footer button:focus { - color: #333333; - text-decoration: none; -} - -.ui-dialog-footer button:active { - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); -} - -.ui-dialog-footer button[disabled] { - pointer-events: none; - cursor: not-allowed; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - box-shadow: none; -} - -.ui-dialog-footer button { - color: #333333; - background-color: #ffffff; - border-color: #cccccc; -} - -.ui-dialog-footer button:hover, -.ui-dialog-footer button:focus, -.ui-dialog-footer button:active { - color: #333333; - background-color: #ebebeb; - border-color: #adadad; -} - -.ui-dialog-footer button:active { - background-image: none; -} - -.ui-dialog-footer button[disabled], -.ui-dialog-footer button[disabled]:hover, -.ui-dialog-footer button[disabled]:focus, -.ui-dialog-footer button[disabled]:active { - background-color: #ffffff; - border-color: #cccccc; -} - -.ui-dialog-footer button.ui-dialog-autofocus { - color: #ffffff; - background-color: #428bca; - border-color: #357ebd; -} - -.ui-dialog-footer button.ui-dialog-autofocus:hover, -.ui-dialog-footer button.ui-dialog-autofocus:focus, -.ui-dialog-footer button.ui-dialog-autofocus:active { - color: #ffffff; - background-color: #3276b1; - border-color: #285e8e; -} - -.ui-dialog-footer button.ui-dialog-autofocus:active { - background-image: none; -} - -.ui-popup-top-left .ui-dialog, -.ui-popup-top .ui-dialog, -.ui-popup-top-right .ui-dialog { - top: -8px; -} - -.ui-popup-bottom-left .ui-dialog, -.ui-popup-bottom .ui-dialog, -.ui-popup-bottom-right .ui-dialog { - top: 8px; -} - -.ui-popup-left-top .ui-dialog, -.ui-popup-left .ui-dialog, -.ui-popup-left-bottom .ui-dialog { - left: -8px; -} - -.ui-popup-right-top .ui-dialog, -.ui-popup-right .ui-dialog, -.ui-popup-right-bottom .ui-dialog { - left: 8px; -} - -.ui-dialog-arrow-a, -.ui-dialog-arrow-b { - position: absolute; - display: none; - width: 0; - height: 0; - overflow: hidden; - _color: #FF3FFF; - _filter: chroma(color=#FF3FFF); - border: 8px dashed transparent; -} - -.ui-popup-follow .ui-dialog-arrow-a, -.ui-popup-follow .ui-dialog-arrow-b { - display: block; -} - -.ui-popup-top-left .ui-dialog-arrow-a, -.ui-popup-top .ui-dialog-arrow-a, -.ui-popup-top-right .ui-dialog-arrow-a { - bottom: -16px; - border-top: 8px solid #7C7C7C; -} - -.ui-popup-top-left .ui-dialog-arrow-b, -.ui-popup-top .ui-dialog-arrow-b, -.ui-popup-top-right .ui-dialog-arrow-b { - bottom: -15px; - border-top: 8px solid #fff; -} - -.ui-popup-top-left .ui-dialog-arrow-a, -.ui-popup-top-left .ui-dialog-arrow-b { - left: 15px; -} - -.ui-popup-top .ui-dialog-arrow-a, -.ui-popup-top .ui-dialog-arrow-b { - left: 50%; - margin-left: -8px; -} - -.ui-popup-top-right .ui-dialog-arrow-a, -.ui-popup-top-right .ui-dialog-arrow-b { - right: 15px; -} - -.ui-popup-bottom-left .ui-dialog-arrow-a, -.ui-popup-bottom .ui-dialog-arrow-a, -.ui-popup-bottom-right .ui-dialog-arrow-a { - top: -16px; - border-bottom: 8px solid #7C7C7C; -} - -.ui-popup-bottom-left .ui-dialog-arrow-b, -.ui-popup-bottom .ui-dialog-arrow-b, -.ui-popup-bottom-right .ui-dialog-arrow-b { - top: -15px; - border-bottom: 8px solid #fff; -} - -.ui-popup-bottom-left .ui-dialog-arrow-a, -.ui-popup-bottom-left .ui-dialog-arrow-b { - left: 15px; -} - -.ui-popup-bottom .ui-dialog-arrow-a, -.ui-popup-bottom .ui-dialog-arrow-b { - margin-left: -8px; - left: 50%; -} - -.ui-popup-bottom-right .ui-dialog-arrow-a, -.ui-popup-bottom-right .ui-dialog-arrow-b { - right: 15px; -} - -.ui-popup-left-top .ui-dialog-arrow-a, -.ui-popup-left .ui-dialog-arrow-a, -.ui-popup-left-bottom .ui-dialog-arrow-a { - right: -16px; - border-left: 8px solid #7C7C7C; -} - -.ui-popup-left-top .ui-dialog-arrow-b, -.ui-popup-left .ui-dialog-arrow-b, -.ui-popup-left-bottom .ui-dialog-arrow-b { - right: -15px; - border-left: 8px solid #fff; -} - -.ui-popup-left-top .ui-dialog-arrow-a, -.ui-popup-left-top .ui-dialog-arrow-b { - top: 15px; -} - -.ui-popup-left .ui-dialog-arrow-a, -.ui-popup-left .ui-dialog-arrow-b { - margin-top: -8px; - top: 50%; -} - -.ui-popup-left-bottom .ui-dialog-arrow-a, -.ui-popup-left-bottom .ui-dialog-arrow-b { - bottom: 15px; -} - -.ui-popup-right-top .ui-dialog-arrow-a, -.ui-popup-right .ui-dialog-arrow-a, -.ui-popup-right-bottom .ui-dialog-arrow-a { - left: -16px; - border-right: 8px solid #7C7C7C; -} - -.ui-popup-right-top .ui-dialog-arrow-b, -.ui-popup-right .ui-dialog-arrow-b, -.ui-popup-right-bottom .ui-dialog-arrow-b { - left: -15px; - border-right: 8px solid #fff; -} - -.ui-popup-right-top .ui-dialog-arrow-a, -.ui-popup-right-top .ui-dialog-arrow-b { - top: 15px; -} - -.ui-popup-right .ui-dialog-arrow-a, -.ui-popup-right .ui-dialog-arrow-b { - margin-top: -8px; - top: 50%; -} - -.ui-popup-right-bottom .ui-dialog-arrow-a, -.ui-popup-right-bottom .ui-dialog-arrow-b { - bottom: 15px; -} - -@-webkit-keyframes ui-dialog-loading { - 0% { - -webkit-transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(360deg); - } -} - -@keyframes ui-dialog-loading { - 0% { - transform: rotate(0deg); - } - 100% { - transform: rotate(360deg); - } -} - -.ui-dialog-loading { - vertical-align: middle; - position: relative; - display: block; - *zoom: 1; - *display: inline; - overflow: hidden; - width: 32px; - height: 32px; - top: 50%; - margin: -16px auto 0 auto; - font-size: 0; - text-indent: -999em; - color: #666; -} - -.ui-dialog-loading { - width: 100%\9; - text-indent: 0\9; - line-height: 32px\9; - text-align: center\9; - font-size: 12px\9; -} - -.ui-dialog-loading::after { - position: absolute; - content: ''; - width: 3px; - height: 3px; - margin: 14.5px 0 0 14.5px; - border-radius: 100%; - box-shadow: 0 -10px 0 1px #ccc, 10px 0px #ccc, 0 10px #ccc, -10px 0 #ccc, -7px -7px 0 0.5px #ccc, 7px -7px 0 1.5px #ccc, 7px 7px #ccc, -7px 7px #ccc; - -webkit-transform: rotate(360deg); - -webkit-animation: ui-dialog-loading 1.5s infinite linear; - transform: rotate(360deg); - animation: ui-dialog-loading 1.5s infinite linear; - display: none\9; -} \ No newline at end of file diff --git a/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/dist/dialog-plus.js b/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/dist/dialog-plus.js deleted file mode 100644 index fe5f0bc3f..000000000 --- a/maxkey-web-manage/src/main/resources/static/jquery/artDialog-v7.0/dist/dialog-plus.js +++ /dev/null @@ -1,8 +0,0 @@ -/*! art-dialog@7.0.0 | https://github.com/aui/artDialog */ -!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("jQuery")):"function"==typeof define&&define.amd?define(["jQuery"],e):"object"==typeof exports?exports.dialog=e(require("jQuery")):t.dialog=e(t.jQuery)}(this,function(t){return function(t){function e(r){if(o[r])return o[r].exports;var i=o[r]={i:r,l:!1,exports:{}};return t[r].call(i.exports,i,i.exports,e),i.l=!0,i.exports}var o={};return e.m=t,e.c=o,e.i=function(t){return t},e.d=function(t,o,r){e.o(t,o)||Object.defineProperty(t,o,{configurable:!1,enumerable:!0,get:r})},e.n=function(t){var o=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(o,"a",o),o},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=15)}([function(e,o){e.exports=t},function(t,e,o){var r=o(7);"string"==typeof r&&(r=[[t.i,r,""]]);o(5)(r,{});r.locals&&(t.exports=r.locals)},function(t,e){t.exports={backdropBackground:"#000",backdropOpacity:.7,content:'Loading..',title:"",statusbar:"",button:null,ok:null,cancel:null,okValue:"ok",cancelValue:"cancel",cancelDisplay:!0,width:"",height:"",padding:"",skin:"",quickClose:!1,innerHTML:'
'}},function(t,e,o){function r(){this.destroyed=!1,this.__popup=i("
").css({display:"none",position:"absolute",outline:0}).attr("tabindex","-1").html(this.innerHTML).appendTo("body"),this.__backdrop=this.__mask=i("
").css({opacity:.7,background:"#000"}),this.node=this.__popup[0],this.backdrop=this.__backdrop[0],n++}var i=o(0),n=0,a=!("minWidth"in i("html")[0].style),s=!a;i.extend(r.prototype,{node:null,backdrop:null,fixed:!1,destroyed:!0,open:!1,returnValue:"",autofocus:!0,align:"bottom left",innerHTML:"",className:"ui-popup",show:function(t){if(this.destroyed)return this;var e=this.__popup,o=this.__backdrop;if(this.__activeElement=this.__getActive(),this.open=!0,this.follow=t||this.follow,!this.__ready){if(e.addClass(this.className).attr("role",this.modal?"alertdialog":"dialog").css("position",this.fixed?"fixed":"absolute"),a||i(window).on("resize",i.proxy(this.reset,this)),this.modal){var n={position:"fixed",left:0,top:0,width:"100%",height:"100%",overflow:"hidden",userSelect:"none",zIndex:this.zIndex||r.zIndex};e.addClass(this.className+"-modal"),s||i.extend(n,{position:"absolute",width:i(window).width()+"px",height:i(document).height()+"px"}),o.css(n).attr({tabindex:"0"}).on("focus",i.proxy(this.focus,this)),this.__mask=o.clone(!0).attr("style","").insertAfter(e),o.addClass(this.className+"-backdrop").insertBefore(e),this.__ready=!0}e.html()||e.html(this.innerHTML)}return e.addClass(this.className+"-show").show(),o.show(),this.reset().focus(),this.__dispatchEvent("show"),this},showModal:function(){return this.modal=!0,this.show.apply(this,arguments)},close:function(t){return!this.destroyed&&this.open&&(void 0!==t&&(this.returnValue=t),this.__popup.hide().removeClass(this.className+"-show"),this.__backdrop.hide(),this.open=!1,this.blur(),this.__dispatchEvent("close")),this},remove:function(){if(this.destroyed)return this;this.__dispatchEvent("beforeremove"),r.current===this&&(r.current=null),this.__popup.remove(),this.__backdrop.remove(),this.__mask.remove(),a||i(window).off("resize",this.reset),this.__dispatchEvent("remove");for(var t in this)delete this[t];return this},reset:function(){var t=this.follow;return t?this.__follow(t):this.__center(),this.__dispatchEvent("reset"),this},focus:function(){var t=this.node,e=this.__popup,o=r.current,n=this.zIndex=r.zIndex++;if(o&&o!==this&&o.blur(!1),!i.contains(t,this.__getActive())){var a=e.find("[autofocus]")[0];!this._autofocus&&a?this._autofocus=!0:a=t,this.__focus(a)}return e.css("zIndex",n),r.current=this,e.addClass(this.className+"-focus"),this.__dispatchEvent("focus"),this},blur:function(){var t=this.__activeElement;return arguments[0]!==!1&&this.__focus(t),this._autofocus=!1,this.__popup.removeClass(this.className+"-focus"),this.__dispatchEvent("blur"),this},addEventListener:function(t,e){return this.__getEventListener(t).push(e),this},removeEventListener:function(t,e){for(var o=this.__getEventListener(t),r=0;rC[P[e]][1]&&(e=T[t]=U[e]),L[t][e]