diff --git a/maxkey-webs/maxkey-web-maxkey-static/build.gradle b/maxkey-webs/maxkey-web-maxkey-static/build.gradle deleted file mode 100644 index a8a2dda35..000000000 --- a/maxkey-webs/maxkey-web-maxkey-static/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -description = "maxkey-web-maxkey-static" - -//add support for Java -apply plugin: 'java' - -dependencies { - -} diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/trusts/openid-configuration b/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/trusts/openid-configuration deleted file mode 100644 index c2e690ae7..000000000 --- a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/trusts/openid-configuration +++ /dev/null @@ -1,35 +0,0 @@ -{ - "issuer": "http://sso.maxkey.top", - "authorization_endpoint": "http://sso.maxkey.top/maxkey/authz/oauth/v20/authorize", - "token_endpoint": "http://sso.maxkey.top/maxkey/authz/oauth/v20/token", - "userinfo_endpoint": "http://sso.maxkey.top/maxkey/api/connect/v10/userinfo", - "revocation_endpoint": "", - "jwks_uri": "http://sso.maxkey.top/maxkey/key/jwk", - "display_values_supported": [ - "page", - "popup", - "touch" - ], - "id_token_signing_alg_values_supported": [ - "RS256" - ], - "response_types_supported": [ - "code", - "token", - "token id_token" - ], - "scopes_supported": [ - "api", - "full", - "refresh_token", - "openid", - "profile", - "email", - "address", - "phone", - "offline_access" - ], - "subject_types_supported": [ - "public" - ] -} \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-maxkey/build.gradle b/maxkey-webs/maxkey-web-maxkey/build.gradle index 79430a0fb..77f7b34fe 100644 --- a/maxkey-webs/maxkey-web-maxkey/build.gradle +++ b/maxkey-webs/maxkey-web-maxkey/build.gradle @@ -23,6 +23,5 @@ dependencies { implementation project(":maxkey-protocols:maxkey-protocol-jwt") implementation project(":maxkey-webs:maxkey-web-static") - implementation project(":maxkey-webs::maxkey-web-maxkey-static") } diff --git a/maxkey-webs/maxkey-web-mgt-static/build.gradle b/maxkey-webs/maxkey-web-mgt-static/build.gradle deleted file mode 100644 index e8c919b0b..000000000 --- a/maxkey-webs/maxkey-web-mgt-static/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -description = "maxkey-web-mgt-static" - -//add support for Java -apply plugin: 'java' - -dependencies { - -} \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/checkbox.png b/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/checkbox.png deleted file mode 100644 index e92135b10..000000000 Binary files a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/checkbox.png and /dev/null differ diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/favicon.ico b/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/favicon.ico deleted file mode 100644 index 51f280f3f..000000000 Binary files a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/favicon.ico and /dev/null differ diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/grid.png b/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/grid.png deleted file mode 100644 index ed4c62d55..000000000 Binary files a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/grid.png and /dev/null differ diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/loading_img.gif b/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/loading_img.gif deleted file mode 100644 index dee9cf85c..000000000 Binary files a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/loading_img.gif and /dev/null differ diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/logo.jpg b/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/logo.jpg deleted file mode 100644 index cf28fcfe7..000000000 Binary files a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/logo.jpg and /dev/null differ diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/social/facebook.png b/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/social/facebook.png deleted file mode 100644 index 24d7f41d5..000000000 Binary files a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/social/facebook.png and /dev/null differ diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/social/google.png b/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/social/google.png deleted file mode 100644 index 5b5395ce4..000000000 Binary files a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/social/google.png and /dev/null differ diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/social/live.png b/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/social/live.png deleted file mode 100644 index 28d96ea17..000000000 Binary files a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/social/live.png and /dev/null differ diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/social/qq.png b/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/social/qq.png deleted file mode 100644 index 536bc8895..000000000 Binary files a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/social/qq.png and /dev/null differ diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/social/sinaweibo.png b/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/social/sinaweibo.png deleted file mode 100644 index 5015fc5b5..000000000 Binary files a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/social/sinaweibo.png and /dev/null differ diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/uploadimage.jpg b/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/uploadimage.jpg deleted file mode 100644 index bf2c6ceab..000000000 Binary files a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/uploadimage.jpg and /dev/null differ diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/trusts/connsec.cer b/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/trusts/connsec.cer deleted file mode 100644 index 1f7d9694c..000000000 --- a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/trusts/connsec.cer +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDGjCCAgKgAwIBAgIEUYu4+zANBgkqhkiG9w0BAQUFADBPMQswCQYDVQQGEwJD -TjELMAkGA1UECBMCU0gxCzAJBgNVBAcTAlNIMRAwDgYDVQQKEwdjb25uc2VjMRQw -EgYDVQQDEwtjb25uc2VjLmNvbTAeFw0xMzA1MDkxNDU1NTVaFw00MDA5MjQxNDU1 -NTVaME8xCzAJBgNVBAYTAkNOMQswCQYDVQQIEwJTSDELMAkGA1UEBxMCU0gxEDAO -BgNVBAoTB2Nvbm5zZWMxFDASBgNVBAMTC2Nvbm5zZWMuY29tMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm3OPfhAO7P/mZzlox33yBUCzCIf256umph9e -itva2Guyr+Q66mntJoEbXulX/PYrYn9yh9Wakf88FUtQ33Wu2hV4qDeb5c9pz/ui -yNctLohCH8gTMaIYi2y0XkTNfi7X+/iNj4RqrPTzqObC80bwUSn3I1kjGqAVq+Kb -WDBgn9i32v2vqYIaQ+r3845+wDzGyZQjFpZQax10D0oFso6aJHXNr51FuOeKDptm -oHiC3fbkhL+xEfy64zr59sQA3gZ0Nkyp2rMvOBLG1B6Iw0ZRTeG8ehcMgXwsifPc -70o5DHV1WD/qoI6iy0SZcZYn+4xu4wK10MRrwmEFJu2NJHNxxQIDAQABMA0GCSqG -SIb3DQEBBQUAA4IBAQCapBwNxY6ymjj3eFWwx9DowCIZvfznTodLVKDZRp7YgNR3 -XhVV8186towhQ3y1n0Vo6y7+UnTqdavsHw9k/gXE8Umsd2N6f8yKLug97mXLWgCR -48UK15/pvRTGT0ctmrIjcWxCEOePVZN9RUIKal6fDAybatE34tH++rB4WzPDJc9z -ujIISImF2YhFr7D9BqXakXC0eoqUb+paquI65u44cBJTuZYCU3KAUqspkQH4+x30 -6CtoXpYRqqtZpwxSwV7YVxxEmHJPowN1IPaxc6hZWm+T/o8+viP6Eu6i4U77egR4 -nPTpsAEpWYN8uryNd4wQLX3jbu8fl9RtUn0o4R9H ------END CERTIFICATE----- diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/trusts/jwk.jwks b/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/trusts/jwk.jwks deleted file mode 100644 index d78d95ca9..000000000 --- a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/trusts/jwk.jwks +++ /dev/null @@ -1,12 +0,0 @@ -{ - "keys": [ - { - "e": "AQAB", - "n": "h5xtDWLssoj5-WLCKPYPUDJlM5pnL4pS8-wMt9sVA57QVRVFdpWHi1dbDCugCApjvmD-giO5yjF5mQSTAF6a14FvktozVw_dDTEzrjG5FgT6WpMzMZd6JpiwQLOtEbV7oBkKYWm1vh1C67-xTlhKgQUNLVNDg4RqRcKFxZd5JPc", - "kty": "RSA", - "use": "sig", - "alg": "RS256", - "kid": "connsec_rsa" - } - ] -} \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/trusts/jwk.xml b/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/trusts/jwk.xml deleted file mode 100644 index 8f864c30e..000000000 --- a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/trusts/jwk.xml +++ /dev/null @@ -1 +0,0 @@ -h5xtDWLssoj5+WLCKPYPUDJlM5pnL4pS8+wMt9sVA57QVRVFdpWHi1dbDCugCApjvmD+giO5yjF5mQSTAF6a14FvktozVw/dDTEzrjG5FgT6WpMzMZd6JpiwQLOtEbV7oBkKYWm1vh1C67+xTlhKgQUNLVNDg4RqRcKFxZd5JPc=AQAB \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/build.gradle b/maxkey-webs/maxkey-web-mgt/build.gradle index d003432fd..6d5b6f16d 100644 --- a/maxkey-webs/maxkey-web-mgt/build.gradle +++ b/maxkey-webs/maxkey-web-mgt/build.gradle @@ -25,6 +25,5 @@ dependencies { implementation project(":maxkey-identitys:maxkey-synchronizers-dingding") implementation project(":maxkey-webs:maxkey-web-static") - implementation project(":maxkey-webs:maxkey-web-mgt-static") } \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/layout/common.cssjs.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/layout/common.cssjs.ftl index cb07dd8b2..6c899211d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/layout/common.cssjs.ftl +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/layout/common.cssjs.ftl @@ -50,6 +50,6 @@ <#-- if browser is not msie 6.0,follow styles over ie 6.0 style --> - + \ No newline at end of file diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/css/base.css b/maxkey-webs/maxkey-web-static/src/main/resources/static/css/base.css similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/css/base.css rename to maxkey-webs/maxkey-web-static/src/main/resources/static/css/base.css diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/css/menu.css b/maxkey-webs/maxkey-web-static/src/main/resources/static/css/menu.css similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/css/menu.css rename to maxkey-webs/maxkey-web-static/src/main/resources/static/css/menu.css diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/css/menu_default.css b/maxkey-webs/maxkey-web-static/src/main/resources/static/css/menu_default.css similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/css/menu_default.css rename to maxkey-webs/maxkey-web-static/src/main/resources/static/css/menu_default.css diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/css/menu_minty.css b/maxkey-webs/maxkey-web-static/src/main/resources/static/css/menu_minty.css similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/css/menu_minty.css rename to maxkey-webs/maxkey-web-static/src/main/resources/static/css/menu_minty.css diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/css/menu_pulse.css b/maxkey-webs/maxkey-web-static/src/main/resources/static/css/menu_pulse.css similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/css/menu_pulse.css rename to maxkey-webs/maxkey-web-static/src/main/resources/static/css/menu_pulse.css diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/css/base.css b/maxkey-webs/maxkey-web-static/src/main/resources/static/css_mgt/base.css similarity index 100% rename from maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/css/base.css rename to maxkey-webs/maxkey-web-static/src/main/resources/static/css_mgt/base.css diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/css/menu.css b/maxkey-webs/maxkey-web-static/src/main/resources/static/css_mgt/menu.css similarity index 100% rename from maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/css/menu.css rename to maxkey-webs/maxkey-web-static/src/main/resources/static/css_mgt/menu.css diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/cert.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/cert.png similarity index 100% rename from maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/cert.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/cert.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/checkbox.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/checkbox.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/checkbox.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/checkbox.png diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/exit.jpg b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/exit.jpg similarity index 100% rename from maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/exit.jpg rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/exit.jpg diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/exit1.jpg b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/exit1.jpg similarity index 100% rename from maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/exit1.jpg rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/exit1.jpg diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/exit2.jpg b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/exit2.jpg similarity index 100% rename from maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/exit2.jpg rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/exit2.jpg diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/exit4.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/exit4.png similarity index 100% rename from maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/exit4.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/exit4.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/favicon.ico b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/favicon.ico similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/favicon.ico rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/favicon.ico diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/grid.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/grid.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/grid.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/grid.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/grid_sel.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/grid_sel.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/grid_sel.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/grid_sel.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/list.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/list.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/list.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/list.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/list_sel.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/list_sel.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/list_sel.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/list_sel.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/loading_img.gif b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/loading_img.gif similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/loading_img.gif rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/loading_img.gif diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/logo.jpg b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/logo.jpg similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/logo.jpg rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/logo.jpg diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/menu-left.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/menu-left.png similarity index 100% rename from maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/menu-left.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/menu-left.png diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/menu.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/menu.png similarity index 100% rename from maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/menu.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/menu.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/progress_bar.gif b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/progress_bar.gif similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/progress_bar.gif rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/progress_bar.gif diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/side-nav.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/side-nav.png similarity index 100% rename from maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/images/side-nav.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/side-nav.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/LICENSE b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/LICENSE similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/LICENSE rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/LICENSE diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/README.md b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/README.md similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/README.md rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/README.md diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/alipay.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/alipay.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/alipay.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/alipay.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/aliyun.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/aliyun.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/aliyun.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/aliyun.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/amazon.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/amazon.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/amazon.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/amazon.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/baidu.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/baidu.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/baidu.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/baidu.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/coding.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/coding.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/coding.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/coding.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/csdn.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/csdn.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/csdn.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/csdn.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/dingtalk.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/dingtalk.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/dingtalk.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/dingtalk.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/douyin.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/douyin.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/douyin.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/douyin.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/eleme.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/eleme.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/eleme.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/eleme.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/facebook.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/facebook.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/facebook.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/facebook.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/feishu.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/feishu.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/feishu.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/feishu.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/gitee.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/gitee.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/gitee.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/gitee.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/github.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/github.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/github.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/github.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/gitlab.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/gitlab.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/gitlab.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/gitlab.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/google.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/google.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/google.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/google.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/huawei.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/huawei.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/huawei.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/huawei.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/jd.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/jd.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/jd.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/jd.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/kujiale.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/kujiale.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/kujiale.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/kujiale.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/linkedin.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/linkedin.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/linkedin.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/linkedin.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/meituan.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/meituan.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/meituan.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/meituan.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/mi.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/mi.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/mi.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/mi.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/microsoft.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/microsoft.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/microsoft.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/microsoft.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/oschina.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/oschina.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/oschina.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/oschina.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/pinterest.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/pinterest.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/pinterest.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/pinterest.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/qq.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/qq.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/qq.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/qq.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/renren.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/renren.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/renren.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/renren.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/stack_overflow.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/stack_overflow.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/stack_overflow.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/stack_overflow.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/taobao.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/taobao.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/taobao.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/taobao.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/teambition.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/teambition.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/teambition.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/teambition.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/tencentCloud.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/tencentCloud.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/tencentCloud.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/tencentCloud.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/toutiao.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/toutiao.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/toutiao.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/toutiao.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/twitter.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/twitter.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/twitter.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/twitter.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/wechat-enterprise.svg b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/wechat-enterprise.svg similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/wechat-enterprise.svg rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/wechat-enterprise.svg diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/wechat.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/wechat.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/wechat.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/wechat.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/wechat_enterprise.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/wechat_enterprise.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/wechat_enterprise.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/wechat_enterprise.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/wechat_mp.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/wechat_mp.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/wechat_mp.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/wechat_mp.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/wechat_open.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/wechat_open.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/wechat_open.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/wechat_open.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/weibo.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/weibo.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/weibo.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/weibo.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/welink.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/welink.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/welink.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/welink.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/xmly.png b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/xmly.png similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/social/xmly.png rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/social/xmly.png diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/uploadimage.jpg b/maxkey-webs/maxkey-web-static/src/main/resources/static/images/uploadimage.jpg similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/images/uploadimage.jpg rename to maxkey-webs/maxkey-web-static/src/main/resources/static/images/uploadimage.jpg diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/template/excel/Orgs_Import_Template.xlsx b/maxkey-webs/maxkey-web-static/src/main/resources/static/template/excel/Orgs_Import_Template.xlsx similarity index 100% rename from maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/template/excel/Orgs_Import_Template.xlsx rename to maxkey-webs/maxkey-web-static/src/main/resources/static/template/excel/Orgs_Import_Template.xlsx diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/template/excel/Users_Import_Template.xlsx b/maxkey-webs/maxkey-web-static/src/main/resources/static/template/excel/Users_Import_Template.xlsx similarity index 100% rename from maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/template/excel/Users_Import_Template.xlsx rename to maxkey-webs/maxkey-web-static/src/main/resources/static/template/excel/Users_Import_Template.xlsx diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/trusts/connsec.cer b/maxkey-webs/maxkey-web-static/src/main/resources/static/trusts/connsec.cer similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/trusts/connsec.cer rename to maxkey-webs/maxkey-web-static/src/main/resources/static/trusts/connsec.cer diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/trusts/jwk.jwks b/maxkey-webs/maxkey-web-static/src/main/resources/static/trusts/jwk.jwks similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/trusts/jwk.jwks rename to maxkey-webs/maxkey-web-static/src/main/resources/static/trusts/jwk.jwks diff --git a/maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/trusts/jwk.xml b/maxkey-webs/maxkey-web-static/src/main/resources/static/trusts/jwk.xml similarity index 100% rename from maxkey-webs/maxkey-web-maxkey-static/src/main/resources/static/trusts/jwk.xml rename to maxkey-webs/maxkey-web-static/src/main/resources/static/trusts/jwk.xml diff --git a/maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/trusts/openid-configuration b/maxkey-webs/maxkey-web-static/src/main/resources/static/trusts/openid-configuration similarity index 100% rename from maxkey-webs/maxkey-web-mgt-static/src/main/resources/static/trusts/openid-configuration rename to maxkey-webs/maxkey-web-static/src/main/resources/static/trusts/openid-configuration diff --git a/settings.gradle b/settings.gradle index d234aa94b..9aff43c4c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -40,7 +40,5 @@ include 'maxkey-protocols:maxkey-protocol-extendapi' include 'maxkey-webs:maxkey-web-static' //maxkey include 'maxkey-webs:maxkey-web-maxkey' -include 'maxkey-webs:maxkey-web-maxkey-static' //maxkey-mgt management include 'maxkey-webs:maxkey-web-mgt' -include 'maxkey-webs:maxkey-web-mgt-static'