From 86b40ec0691d164fd85ee18a2fffa6ec68e854bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Mon, 24 Aug 2020 22:04:35 +0800 Subject: [PATCH] :arrow_up: Upgrading dependencies. up nacos 1.3.2 https://gitee.com/log4j/pig/issues/I1Q9RG --- pigx-register/pom.xml | 6 +- .../alibaba/nacos/config/ConsoleConfig.java | 2 +- .../nacos/controller/HealthController.java | 13 +- .../nacos/controller/NamespaceController.java | 33 +- .../controller/PermissionController.java | 20 +- .../nacos/controller/RoleController.java | 25 +- .../controller/ServerStateController.java | 9 +- .../nacos/controller/UserController.java | 44 +- .../exception/ConsoleExceptionHandler.java | 7 +- .../filter/JwtAuthenticationTokenFilter.java | 11 +- .../com/alibaba/nacos/model/Namespace.java | 5 +- .../alibaba/nacos/model/NamespaceAllInfo.java | 3 +- .../nacos/CustomAuthenticationProvider.java | 7 +- .../nacos/JwtAuthenticationEntryPoint.java | 9 +- .../{ => security}/nacos/JwtTokenManager.java | 23 +- .../{ => security}/nacos/NacosAuthConfig.java | 25 +- .../nacos/NacosAuthManager.java | 11 +- .../nacos/roles/NacosRoleServiceImpl.java | 37 +- .../{ => security}/nacos/users/NacosUser.java | 4 +- .../nacos/users/NacosUserDetails.java | 7 +- .../users/NacosUserDetailsServiceImpl.java | 5 +- .../alibaba/nacos/utils/JwtTokenUtils.java | 50 +- .../nacos/utils/PasswordEncoderUtil.java | 3 +- .../main/resources/static/console-fe/.babelrc | 0 .../resources/static/console-fe/.editorconfig | 0 .../resources/static/console-fe/.eslintignore | 0 .../resources/static/console-fe/.eslintrc | 0 .../resources/static/console-fe/.gitignore | 0 .../static/console-fe/.prettierignore | 0 .../resources/static/console-fe/.prettierrc | 0 .../resources/static/console-fe/README.md | 0 .../resources/static/console-fe/package.json | 7 +- .../console-fe/public/css/bootstrap.css | 3 + .../console-fe/public/css/codemirror.css | 3 + .../console-fe/public/css/console1412.css | 0 .../console-fe/public/css/font-awesome.css | 3 + .../public/css/fonts/aliyun-console-font.eot | Bin .../public/css/fonts/aliyun-console-font.ttf | Bin .../public/css/fonts/aliyun-console-font.woff | Bin .../css/fonts/font_515771_emcns5054x3whfr.ttf | Bin .../fonts/font_515771_emcns5054x3whfr.woff | Bin .../public/css/fonts/roboto-bold.ttf | Bin .../public/css/fonts/roboto-bold.woff | Bin .../public/css/fonts/roboto-bold.woff2 | Bin .../public/css/fonts/roboto-regular.ttf | Bin .../public/css/fonts/roboto-regular.woff | Bin .../public/css/fonts/roboto-regular.woff2 | Bin .../static/console-fe/public/css/icon.css | 5 +- .../static/console-fe/public/css/merge.css | 3 + .../console-fe/public/fonts/roboto-bold.eot | Bin .../console-fe/public/fonts/roboto-bold.ttf | Bin .../console-fe/public/fonts/roboto-bold.woff | Bin .../console-fe/public/fonts/roboto-bold.woff2 | Bin .../console-fe/public/fonts/roboto-light.eot | Bin .../console-fe/public/fonts/roboto-light.ttf | Bin .../console-fe/public/fonts/roboto-light.woff | Bin .../public/fonts/roboto-light.woff2 | Bin .../console-fe/public/fonts/roboto-medium.eot | Bin .../console-fe/public/fonts/roboto-medium.ttf | Bin .../public/fonts/roboto-medium.woff | Bin .../public/fonts/roboto-medium.woff2 | Bin .../public/fonts/roboto-regular.eot | Bin .../public/fonts/roboto-regular.ttf | Bin .../public/fonts/roboto-regular.woff | Bin .../public/fonts/roboto-regular.woff2 | Bin .../console-fe/public/fonts/roboto-thin.eot | Bin .../console-fe/public/fonts/roboto-thin.ttf | Bin .../console-fe/public/fonts/roboto-thin.woff | Bin .../console-fe/public/fonts/roboto-thin.woff2 | Bin .../console-fe/public/icons/icon-font.eot | Bin .../console-fe/public/icons/icon-font.svg | 0 .../console-fe/public/icons/icon-font.ttf | Bin .../console-fe/public/icons/icon-font.woff | Bin .../console-fe/public/img/black_dot.png | Bin .../static/console-fe/public/img/favicon.ico | Bin .../console-fe/public/img/logo-2000-390.svg | 0 .../static/console-fe/public/img/nacos.png | Bin .../static/console-fe/public/index.html | 6 +- .../public/js/codemirror.addone.fullscreen.js | 5 +- .../public/js/codemirror.addone.json-lint.js | 5 +- .../public/js/codemirror.addone.lint.js | 5 +- .../static/console-fe/public/js/codemirror.js | 3 + .../public/js/codemirror.lib.clike-lint.js | 5 +- .../public/js/codemirror.lib.json-lint.js | 9 +- .../console-fe/public/js/diff_match_patch.js | 0 .../static/console-fe/public/js/javascript.js | 3 + .../static/console-fe/public/js/jquery.js | 6 +- .../static/console-fe/public/js/loader.js | 0 .../static/console-fe/public/js/merge.js | 3 + .../public/js/vs/base/worker/workerMain.js | 0 .../public/js/vs/basic-languages/src/bat.js | 0 .../js/vs/basic-languages/src/coffee.js | 0 .../public/js/vs/basic-languages/src/cpp.js | 0 .../js/vs/basic-languages/src/csharp.js | 0 .../public/js/vs/basic-languages/src/css.js | 0 .../js/vs/basic-languages/src/dockerfile.js | 0 .../js/vs/basic-languages/src/fsharp.js | 0 .../public/js/vs/basic-languages/src/go.js | 0 .../js/vs/basic-languages/src/handlebars.js | 0 .../public/js/vs/basic-languages/src/html.js | 0 .../public/js/vs/basic-languages/src/ini.js | 0 .../public/js/vs/basic-languages/src/java.js | 0 .../public/js/vs/basic-languages/src/less.js | 0 .../public/js/vs/basic-languages/src/lua.js | 0 .../js/vs/basic-languages/src/markdown.js | 0 .../public/js/vs/basic-languages/src/msdax.js | 0 .../js/vs/basic-languages/src/objective-c.js | 0 .../public/js/vs/basic-languages/src/php.js | 0 .../js/vs/basic-languages/src/postiats.js | 0 .../js/vs/basic-languages/src/powershell.js | 0 .../public/js/vs/basic-languages/src/pug.js | 0 .../js/vs/basic-languages/src/python.js | 0 .../public/js/vs/basic-languages/src/r.js | 0 .../public/js/vs/basic-languages/src/razor.js | 0 .../public/js/vs/basic-languages/src/ruby.js | 0 .../public/js/vs/basic-languages/src/sb.js | 0 .../public/js/vs/basic-languages/src/scss.js | 0 .../js/vs/basic-languages/src/solidity.js | 0 .../public/js/vs/basic-languages/src/sql.js | 0 .../public/js/vs/basic-languages/src/swift.js | 0 .../public/js/vs/basic-languages/src/vb.js | 0 .../public/js/vs/basic-languages/src/xml.js | 0 .../public/js/vs/basic-languages/src/yaml.js | 0 .../suggest/browser/media/String_16x.svg | 0 .../browser/media/String_inverse_16x.svg | 0 .../public/js/vs/editor/editor.main.css | 0 .../public/js/vs/editor/editor.main.js | 2 +- .../public/js/vs/editor/editor.main.nls.de.js | 5 +- .../public/js/vs/editor/editor.main.nls.es.js | 5 +- .../public/js/vs/editor/editor.main.nls.fr.js | 5 +- .../public/js/vs/editor/editor.main.nls.hu.js | 5 +- .../public/js/vs/editor/editor.main.nls.it.js | 5 +- .../public/js/vs/editor/editor.main.nls.ja.js | 5 +- .../public/js/vs/editor/editor.main.nls.js | 5 +- .../public/js/vs/editor/editor.main.nls.ko.js | 5 +- .../js/vs/editor/editor.main.nls.pt-br.js | 5 +- .../public/js/vs/editor/editor.main.nls.ru.js | 5 +- .../public/js/vs/editor/editor.main.nls.tr.js | 5 +- .../js/vs/editor/editor.main.nls.zh-cn.js | 5 +- .../js/vs/editor/editor.main.nls.zh-tw.js | 5 +- .../browser/quickOpen/symbol-sprite.svg | 0 .../public/js/vs/language/css/cssMode.js | 0 .../public/js/vs/language/css/cssWorker.js | 0 .../public/js/vs/language/html/htmlMode.js | 0 .../public/js/vs/language/html/htmlWorker.js | 0 .../public/js/vs/language/json/jsonMode.js | 0 .../public/js/vs/language/json/jsonWorker.js | 0 .../typescript/lib/typescriptServices.js | 0 .../js/vs/language/typescript/src/mode.js | 0 .../js/vs/language/typescript/src/worker.js | 5 +- .../static/console-fe/public/js/vs/loader.js | 0 .../static/console-fe/public/js/xml.js | 3 + .../src/components/BatchHandle/BatchHandle.js | 3 + .../src/components/BatchHandle/index.js | 3 + .../src/components/BatchHandle/index.scss | 5 +- .../src/components/CloneDialog/CloneDialog.js | 3 + .../src/components/CloneDialog/index.js | 3 + .../src/components/CloneDialog/index.scss | 5 +- .../components/DeleteDialog/DeleteDialog.js | 3 + .../src/components/DeleteDialog/index.js | 3 + .../src/components/DeleteDialog/index.scss | 5 +- .../DiffEditorDialog/DiffEditorDialog.js | 3 + .../src/components/DiffEditorDialog/index.js | 3 + .../components/DiffEditorDialog/index.scss | 5 +- .../EditorNameSpace/EditorNameSpace.js | 3 + .../src/components/EditorNameSpace/index.js | 3 + .../src/components/EditorNameSpace/index.scss | 5 +- .../components/ExportDialog/ExportDialog.js | 7 +- .../src/components/ExportDialog/index.js | 3 + .../src/components/ExportDialog/index.scss | 5 +- .../components/ImportDialog/ImportDialog.js | 7 +- .../src/components/ImportDialog/index.js | 3 + .../src/components/ImportDialog/index.scss | 5 +- .../components/MonacoEditor/MonacoEditor.tsx | 3 + .../src/components/MonacoEditor/constant.ts | 3 + .../src/components/MonacoEditor/index.scss | 5 +- .../src/components/MonacoEditor/index.tsx | 3 + .../components/NameSpaceList/NameSpaceList.js | 3 + .../src/components/NameSpaceList/index.js | 3 + .../src/components/NameSpaceList/index.scss | 5 +- .../components/NewNameSpace/NewNameSpace.js | 3 + .../src/components/NewNameSpace/index.js | 3 + .../src/components/NewNameSpace/index.scss | 5 +- .../src/components/RegionGroup/RegionGroup.js | 3 + .../src/components/RegionGroup/index.js | 3 + .../src/components/RegionGroup/index.scss | 5 +- .../src/components/ShowCodeing/ShowCodeing.js | 9 +- .../ShowCodeing/ShowServiceCodeing.js | 16 +- .../src/components/ShowCodeing/index.js | 3 + .../src/components/ShowCodeing/index.scss | 5 +- .../components/SuccessDialog/SuccessDialog.js | 3 + .../src/components/SuccessDialog/index.js | 3 + .../src/components/SuccessDialog/index.scss | 5 +- .../resources/static/console-fe/src/config.js | 3 + .../static/console-fe/src/constants.js | 5 + .../static/console-fe/src/globalLib.js | 5 +- .../resources/static/console-fe/src/index.js | 3 + .../static/console-fe/src/index.scss | 5 +- .../static/console-fe/src/layouts/Header.js | 3 + .../console-fe/src/layouts/MainLayout.js | 3 + .../static/console-fe/src/layouts/index.scss | 5 +- .../static/console-fe/src/layouts/menu.js | 16 + .../resources/static/console-fe/src/lib.js | 11 +- .../static/console-fe/src/locales/en-US.js | 3 + .../static/console-fe/src/locales/index.js | 3 + .../static/console-fe/src/locales/zh-CN.js | 3 + .../PermissionsManagement/NewPermissions.js | 3 + .../PermissionsManagement.js | 3 + .../PermissionsManagement.scss | 7 +- .../PermissionsManagement/index.js | 3 + .../src/pages/AuthorityControl/README.md | 0 .../RolesManagement/NewRole.js | 3 + .../RolesManagement/RolesManagement.js | 3 + .../RolesManagement/RolesManagement.scss | 7 +- .../AuthorityControl/RolesManagement/index.js | 3 + .../UserManagement/NewUser.js | 3 + .../UserManagement/PasswordReset.js | 3 + .../UserManagement/UserManagement.js | 3 + .../UserManagement/UserManagement.scss | 5 +- .../AuthorityControl/UserManagement/index.js | 3 + .../src/pages/AuthorityControl/authority.scss | 5 +- .../ClusterNodeList/ClusterNodeList.js | 53 +- .../ClusterNodeList/ClusterNodeList.scss | 5 +- .../ClusterNodeList/index.js | 3 + .../ConfigDetail/ConfigDetail.js | 7 + .../ConfigDetail/index.js | 3 + .../ConfigDetail/index.scss | 5 +- .../ConfigEditor/ConfigEditor.js | 7 +- .../ConfigEditor/NewConfigEditor.js | 14 +- .../ConfigEditor/index.js | 3 + .../ConfigEditor/index.scss | 5 +- .../ConfigRollback/ConfigRollback.js | 3 + .../ConfigRollback/index.js | 3 + .../ConfigRollback/index.scss | 5 +- .../ConfigSync/ConfigSync.js | 3 + .../ConfigSync/index.js | 3 + .../ConfigSync/index.scss | 5 +- .../ConfigurationManagement.js | 25 +- .../ConfigurationManagement/DashboardCard.js | 3 + .../ConfigurationManagement/index.js | 3 + .../ConfigurationManagement/index.scss | 5 +- .../HistoryDetail/HistoryDetail.js | 3 + .../HistoryDetail/index.js | 3 + .../HistoryDetail/index.scss | 5 +- .../HistoryRollback/HistoryRollback.js | 5 +- .../HistoryRollback/index.js | 3 + .../HistoryRollback/index.scss | 5 +- .../ListeningToQuery/ListeningToQuery.js | 3 + .../ListeningToQuery/index.js | 3 + .../ListeningToQuery/index.scss | 5 +- .../NewConfig/NewConfig.js | 5 +- .../NewConfig/index.js | 3 + .../NewConfig/index.scss | 5 +- .../console-fe/src/pages/Login/Login.jsx | 16 + .../console-fe/src/pages/Login/index.jsx | 3 + .../console-fe/src/pages/Login/index.scss | 16 + .../src/pages/NameSpace/NameSpace.js | 3 + .../console-fe/src/pages/NameSpace/index.js | 3 + .../console-fe/src/pages/NameSpace/index.scss | 5 +- .../ServiceDetail/EditClusterDialog.js | 3 + .../ServiceDetail/EditInstanceDialog.js | 3 + .../ServiceDetail/EditServiceDialog.js | 3 + .../ServiceDetail/InstanceTable.js | 3 + .../ServiceDetail/ServiceDetail.js | 3 + .../ServiceDetail/ServiceDetail.scss | 7 +- .../ServiceDetail/constant.js | 3 + .../ServiceManagement/ServiceDetail/index.js | 3 + .../ServiceList/ServiceList.js | 282 ++-- .../ServiceList/ServiceList.scss | 5 +- .../ServiceManagement/ServiceList/index.js | 3 + .../SubscriberList/SubscriberList.js | 3 + .../SubscriberList/SubscriberList.scss | 16 + .../ServiceManagement/SubscriberList/index.js | 3 + .../console-fe/src/pages/Welcome/Welcome.js | 3 + .../console-fe/src/pages/Welcome/index.js | 3 + .../console-fe/src/reducers/authority.js | 3 + .../static/console-fe/src/reducers/base.js | 3 + .../console-fe/src/reducers/configuration.js | 3 + .../static/console-fe/src/reducers/index.js | 3 + .../static/console-fe/src/reducers/locale.js | 3 + .../console-fe/src/reducers/namespace.js | 3 + .../console-fe/src/reducers/subscribers.js | 3 + .../static/console-fe/src/utils/nacosutil.js | 3 + .../static/console-fe/src/utils/request.js | 18 +- .../console-fe/src/utils/validateContent.js | 193 ++- .../static/console-fe/test/.editorconfig | 0 .../static/console-fe/test/.gitignore | 0 .../static/console-fe/test/README.md | 0 .../static/console-fe/test/commons/commons.md | 0 .../static/console-fe/test/config.json | 0 .../resources/static/console-fe/test/hosts | 0 .../static/console-fe/test/package.json | 0 .../resources/static/console-fe/test/run.bat | 0 .../resources/static/console-fe/test/run.sh | 0 .../sample/configurationManagement.spec.js | 1232 ++++++++++------- .../test/uploadfiles/uploadfiles.md | 0 .../resources/static/console-fe/tsconfig.json | 0 .../src/main/resources/static/css/main.css | 496 ++++++- .../main/resources/static/img/black_dot.png | Bin .../resources/static/img/logo-2000-390.svg | 0 .../src/main/resources/static/img/nacos.png | Bin .../src/main/resources/static/index.html | 6 +- .../src/main/resources/static/js/main.js | 339 ++++- .../src/main/resources/static/login.html | 16 + .../2020-08/debug.2020-08-21.0.log.gz | Bin 0 -> 2008186 bytes 305 files changed, 2773 insertions(+), 960 deletions(-) mode change 100755 => 100644 pigx-register/src/main/java/com/alibaba/nacos/controller/HealthController.java mode change 100755 => 100644 pigx-register/src/main/java/com/alibaba/nacos/controller/NamespaceController.java mode change 100755 => 100644 pigx-register/src/main/java/com/alibaba/nacos/controller/PermissionController.java mode change 100755 => 100644 pigx-register/src/main/java/com/alibaba/nacos/controller/RoleController.java mode change 100755 => 100644 pigx-register/src/main/java/com/alibaba/nacos/controller/ServerStateController.java mode change 100755 => 100644 pigx-register/src/main/java/com/alibaba/nacos/controller/UserController.java mode change 100755 => 100644 pigx-register/src/main/java/com/alibaba/nacos/exception/ConsoleExceptionHandler.java mode change 100755 => 100644 pigx-register/src/main/java/com/alibaba/nacos/filter/JwtAuthenticationTokenFilter.java mode change 100755 => 100644 pigx-register/src/main/java/com/alibaba/nacos/model/Namespace.java mode change 100755 => 100644 pigx-register/src/main/java/com/alibaba/nacos/model/NamespaceAllInfo.java rename pigx-register/src/main/java/com/alibaba/nacos/{ => security}/nacos/CustomAuthenticationProvider.java (93%) mode change 100755 => 100644 rename pigx-register/src/main/java/com/alibaba/nacos/{ => security}/nacos/JwtAuthenticationEntryPoint.java (88%) mode change 100755 => 100644 rename pigx-register/src/main/java/com/alibaba/nacos/{ => security}/nacos/JwtTokenManager.java (91%) mode change 100755 => 100644 rename pigx-register/src/main/java/com/alibaba/nacos/{ => security}/nacos/NacosAuthConfig.java (89%) mode change 100755 => 100644 rename pigx-register/src/main/java/com/alibaba/nacos/{ => security}/nacos/NacosAuthManager.java (94%) mode change 100755 => 100644 rename pigx-register/src/main/java/com/alibaba/nacos/{ => security}/nacos/roles/NacosRoleServiceImpl.java (89%) mode change 100755 => 100644 rename pigx-register/src/main/java/com/alibaba/nacos/{ => security}/nacos/users/NacosUser.java (94%) mode change 100755 => 100644 rename pigx-register/src/main/java/com/alibaba/nacos/{ => security}/nacos/users/NacosUserDetails.java (94%) mode change 100755 => 100644 rename pigx-register/src/main/java/com/alibaba/nacos/{ => security}/nacos/users/NacosUserDetailsServiceImpl.java (97%) mode change 100755 => 100644 mode change 100755 => 100644 pigx-register/src/main/java/com/alibaba/nacos/utils/JwtTokenUtils.java mode change 100755 => 100644 pigx-register/src/main/java/com/alibaba/nacos/utils/PasswordEncoderUtil.java mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/.babelrc mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/.editorconfig mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/.eslintignore mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/.eslintrc mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/.gitignore mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/.prettierignore mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/.prettierrc mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/README.md mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/package.json mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/css/bootstrap.css mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/css/codemirror.css mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/css/console1412.css mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/css/font-awesome.css mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/css/fonts/aliyun-console-font.eot mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/css/fonts/aliyun-console-font.ttf mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/css/fonts/aliyun-console-font.woff mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/css/fonts/font_515771_emcns5054x3whfr.ttf mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/css/fonts/font_515771_emcns5054x3whfr.woff mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-bold.ttf mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-bold.woff mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-bold.woff2 mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-regular.ttf mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-regular.woff mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-regular.woff2 mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/css/icon.css mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/css/merge.css mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.eot mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.ttf mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.woff mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.woff2 mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-light.eot mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-light.ttf mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-light.woff mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-light.woff2 mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.eot mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.ttf mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.woff mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.woff2 mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.eot mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.ttf mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.woff mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.woff2 mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.eot mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.ttf mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.woff mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.woff2 mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/icons/icon-font.eot mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/icons/icon-font.svg mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/icons/icon-font.ttf mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/icons/icon-font.woff mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/img/black_dot.png mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/img/favicon.ico mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/img/logo-2000-390.svg mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/img/nacos.png mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/index.html mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/codemirror.addone.fullscreen.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/codemirror.addone.json-lint.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/codemirror.addone.lint.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/codemirror.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/codemirror.lib.clike-lint.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/codemirror.lib.json-lint.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/diff_match_patch.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/javascript.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/jquery.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/loader.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/merge.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/base/worker/workerMain.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/bat.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/coffee.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/cpp.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/csharp.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/css.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/dockerfile.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/fsharp.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/go.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/handlebars.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/html.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/ini.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/java.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/less.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/lua.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/markdown.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/msdax.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/objective-c.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/php.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/postiats.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/powershell.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/pug.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/python.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/r.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/razor.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/ruby.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/sb.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/scss.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/solidity.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/sql.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/swift.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/vb.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/xml.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/yaml.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/contrib/suggest/browser/media/String_16x.svg mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/contrib/suggest/browser/media/String_inverse_16x.svg mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.css mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.de.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.es.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.fr.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.hu.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.it.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.ja.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.ko.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.pt-br.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.ru.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.tr.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.zh-cn.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.zh-tw.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/editor/standalone/browser/quickOpen/symbol-sprite.svg mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/language/css/cssMode.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/language/css/cssWorker.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/language/html/htmlMode.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/language/html/htmlWorker.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/language/json/jsonMode.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/language/json/jsonWorker.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/language/typescript/lib/typescriptServices.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/language/typescript/src/mode.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/language/typescript/src/worker.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/vs/loader.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/public/js/xml.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/BatchHandle/BatchHandle.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/BatchHandle/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/BatchHandle/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/CloneDialog/CloneDialog.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/CloneDialog/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/CloneDialog/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/DeleteDialog/DeleteDialog.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/DeleteDialog/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/DeleteDialog/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/DiffEditorDialog/DiffEditorDialog.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/DiffEditorDialog/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/DiffEditorDialog/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/EditorNameSpace/EditorNameSpace.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/EditorNameSpace/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/EditorNameSpace/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/ExportDialog/ExportDialog.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/ExportDialog/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/ExportDialog/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/ImportDialog/ImportDialog.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/ImportDialog/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/ImportDialog/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/MonacoEditor/MonacoEditor.tsx mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/MonacoEditor/constant.ts mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/MonacoEditor/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/MonacoEditor/index.tsx mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/NameSpaceList/NameSpaceList.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/NameSpaceList/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/NameSpaceList/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/NewNameSpace/NewNameSpace.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/NewNameSpace/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/NewNameSpace/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/RegionGroup/RegionGroup.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/RegionGroup/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/RegionGroup/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/ShowCodeing/ShowCodeing.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/ShowCodeing/ShowServiceCodeing.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/ShowCodeing/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/ShowCodeing/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/SuccessDialog/SuccessDialog.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/SuccessDialog/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/components/SuccessDialog/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/config.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/constants.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/globalLib.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/layouts/Header.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/layouts/MainLayout.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/layouts/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/layouts/menu.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/lib.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/locales/en-US.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/locales/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/locales/zh-CN.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/NewPermissions.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/PermissionsManagement.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/PermissionsManagement.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/README.md mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/NewRole.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/RolesManagement.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/RolesManagement.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/NewUser.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/PasswordReset.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/UserManagement.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/UserManagement.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/authority.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ClusterManagement/ClusterNodeList/ClusterNodeList.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ClusterManagement/ClusterNodeList/ClusterNodeList.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ClusterManagement/ClusterNodeList/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigDetail/ConfigDetail.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigDetail/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigDetail/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/ConfigEditor.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/NewConfigEditor.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigRollback/ConfigRollback.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigRollback/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigRollback/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigSync/ConfigSync.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigSync/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigSync/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/DashboardCard.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryDetail/HistoryDetail.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryDetail/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryDetail/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryRollback/HistoryRollback.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryRollback/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryRollback/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ListeningToQuery/ListeningToQuery.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ListeningToQuery/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ListeningToQuery/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/NewConfig/NewConfig.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/NewConfig/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/NewConfig/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/Login/Login.jsx mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/Login/index.jsx mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/Login/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/NameSpace/NameSpace.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/NameSpace/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/NameSpace/index.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditClusterDialog.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditInstanceDialog.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditServiceDialog.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/ServiceDetail.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/ServiceDetail.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/constant.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/SubscriberList/SubscriberList.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/SubscriberList/SubscriberList.scss mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/SubscriberList/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/Welcome/Welcome.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/pages/Welcome/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/reducers/authority.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/reducers/base.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/reducers/configuration.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/reducers/index.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/reducers/locale.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/reducers/namespace.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/reducers/subscribers.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/utils/nacosutil.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/utils/request.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/src/utils/validateContent.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/test/.editorconfig mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/test/.gitignore mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/test/README.md mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/test/commons/commons.md mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/test/config.json mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/test/hosts mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/test/package.json mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/test/run.bat mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/test/run.sh mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/test/sample/configurationManagement.spec.js mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/test/uploadfiles/uploadfiles.md mode change 100755 => 100644 pigx-register/src/main/resources/static/console-fe/tsconfig.json mode change 100755 => 100644 pigx-register/src/main/resources/static/css/main.css mode change 100755 => 100644 pigx-register/src/main/resources/static/img/black_dot.png mode change 100755 => 100644 pigx-register/src/main/resources/static/img/logo-2000-390.svg mode change 100755 => 100644 pigx-register/src/main/resources/static/img/nacos.png mode change 100755 => 100644 pigx-register/src/main/resources/static/index.html mode change 100755 => 100644 pigx-register/src/main/resources/static/js/main.js mode change 100755 => 100644 pigx-register/src/main/resources/static/login.html create mode 100644 pigx-upms/pigx-upms-biz/logs/pigx-upms-biz/2020-08/debug.2020-08-21.0.log.gz diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml index 1a1b99f1f..ec425bc5b 100755 --- a/pigx-register/pom.xml +++ b/pigx-register/pom.xml @@ -30,7 +30,7 @@ com.pig4cloud.nacos nacos-config - 1.3.0 + 1.3.2 org.apache.tomcat.embed @@ -40,13 +40,13 @@ com.pig4cloud.nacos nacos-naming - 1.3.0 + 1.3.2 com.pig4cloud.nacos nacos-istio - 1.3.0 + 1.3.2 org.springframework.boot diff --git a/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java b/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java index 2fe3878f4..755523d52 100755 --- a/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java @@ -43,7 +43,7 @@ public class ConsoleConfig { @PostConstruct public void init() { methodsCache.initClassMethod("com.alibaba.nacos.naming.controllers"); - methodsCache.initClassMethod("com.alibaba.nacos.console.controller"); + methodsCache.initClassMethod("com.alibaba.nacos.controller"); methodsCache.initClassMethod("com.alibaba.nacos.config.server.controller"); } diff --git a/pigx-register/src/main/java/com/alibaba/nacos/controller/HealthController.java b/pigx-register/src/main/java/com/alibaba/nacos/controller/HealthController.java old mode 100755 new mode 100644 index 937820116..4974551a1 --- a/pigx-register/src/main/java/com/alibaba/nacos/controller/HealthController.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/controller/HealthController.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.alibaba.nacos.controller; import com.alibaba.nacos.config.server.service.repository.PersistService; @@ -28,13 +29,15 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; /** + * Health Controller. + * * @author hxy1991 */ @RestController("consoleHealth") @RequestMapping("/v1/console/health") public class HealthController { - private static final Logger logger = LoggerFactory.getLogger(HealthController.class); + private static final Logger LOGGER = LoggerFactory.getLogger(HealthController.class); private final PersistService persistService; @@ -48,7 +51,7 @@ public class HealthController { /** * Whether the Nacos is in broken states or not, and cannot recover except by being - * restarted + * restarted. * @return HTTP code equal to 200 indicates that Nacos is in right states. HTTP code * equal to 500 indicates that Nacos is in broken states. */ @@ -58,7 +61,7 @@ public class HealthController { } /** - * Ready to receive the request or not + * Ready to receive the request or not. * @return HTTP code equal to 200 indicates that Nacos is ready. HTTP code equal to * 500 indicates that Nacos is not ready. */ @@ -89,7 +92,7 @@ public class HealthController { return true; } catch (Exception e) { - logger.error("Config health check fail.", e); + LOGGER.error("Config health check fail.", e); } return false; } @@ -100,7 +103,7 @@ public class HealthController { return true; } catch (Exception e) { - logger.error("Naming health check fail.", e); + LOGGER.error("Naming health check fail.", e); } return false; } diff --git a/pigx-register/src/main/java/com/alibaba/nacos/controller/NamespaceController.java b/pigx-register/src/main/java/com/alibaba/nacos/controller/NamespaceController.java old mode 100755 new mode 100644 index dad9169e7..9109cd788 --- a/pigx-register/src/main/java/com/alibaba/nacos/controller/NamespaceController.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/controller/NamespaceController.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.alibaba.nacos.controller; import com.alibaba.nacos.common.model.RestResult; @@ -20,12 +21,18 @@ import com.alibaba.nacos.config.server.model.TenantInfo; import com.alibaba.nacos.config.server.service.repository.PersistService; import com.alibaba.nacos.model.Namespace; import com.alibaba.nacos.model.NamespaceAllInfo; -import com.alibaba.nacos.nacos.NacosAuthConfig; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; import com.alibaba.nacos.core.auth.ActionTypes; import com.alibaba.nacos.core.auth.Secured; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -35,7 +42,7 @@ import java.util.UUID; import java.util.regex.Pattern; /** - * namespace service + * namespace service. * * @author Nacos */ @@ -46,12 +53,12 @@ public class NamespaceController { @Autowired private PersistService persistService; - private Pattern namespaceIdCheckPattern = Pattern.compile("^[\\w-]+"); + private final Pattern namespaceIdCheckPattern = Pattern.compile("^[\\w-]+"); private static final int NAMESPACE_ID_MAX_LENGTH = 128; /** - * Get namespace list + * Get namespace list. * @param request request * @param response response * @return namespace list @@ -76,7 +83,7 @@ public class NamespaceController { } /** - * get namespace all info by namespace id + * get namespace all info by namespace id. * @param request request * @param response response * @param namespaceId namespaceId @@ -99,7 +106,7 @@ public class NamespaceController { } /** - * create namespace + * create namespace. * @param request request * @param response response * @param namespaceName namespace Name @@ -133,11 +140,9 @@ public class NamespaceController { } /** - * @author klw(213539@qq.com) - * @Description: check namespaceId exist - * @Date 2019/12/10 21:41 - * @param: namespaceId - * @return java.lang.Boolean + * check namespaceId exist. + * @param namespaceId namespace id + * @return true if exist, otherwise false */ @GetMapping(params = "checkNamespaceIdExist=true") public Boolean checkNamespaceIdExist(@RequestParam("customNamespaceId") String namespaceId) { @@ -148,7 +153,7 @@ public class NamespaceController { } /** - * edit namespace + * edit namespace. * @param namespace namespace * @param namespaceShowName namespace ShowName * @param namespaceDesc namespace Desc @@ -165,7 +170,7 @@ public class NamespaceController { } /** - * del namespace by id + * del namespace by id. * @param request request * @param response response * @param namespaceId namespace Id diff --git a/pigx-register/src/main/java/com/alibaba/nacos/controller/PermissionController.java b/pigx-register/src/main/java/com/alibaba/nacos/controller/PermissionController.java old mode 100755 new mode 100644 index 91ab95444..8be04956d --- a/pigx-register/src/main/java/com/alibaba/nacos/controller/PermissionController.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/controller/PermissionController.java @@ -13,19 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.alibaba.nacos.controller; import com.alibaba.nacos.common.model.RestResult; -import com.alibaba.nacos.nacos.NacosAuthConfig; -import com.alibaba.nacos.nacos.roles.NacosRoleServiceImpl; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; +import com.alibaba.nacos.security.nacos.roles.NacosRoleServiceImpl; import com.alibaba.nacos.core.auth.ActionTypes; import com.alibaba.nacos.core.auth.Secured; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** - * Permission operation controller + * Permission operation controller. * * @author nkorange * @since 1.2.0 @@ -38,7 +44,7 @@ public class PermissionController { private NacosRoleServiceImpl nacosRoleService; /** - * Query permissions of a role + * Query permissions of a role. * @param role the role * @param pageNo page index * @param pageSize page size @@ -52,7 +58,7 @@ public class PermissionController { } /** - * Add a permission to a role + * Add a permission to a role. * @param role the role * @param resource the related resource * @param action the related action @@ -66,7 +72,7 @@ public class PermissionController { } /** - * Delete a permission from a role + * Delete a permission from a role. * @param role the role * @param resource the related resource * @param action the related action diff --git a/pigx-register/src/main/java/com/alibaba/nacos/controller/RoleController.java b/pigx-register/src/main/java/com/alibaba/nacos/controller/RoleController.java old mode 100755 new mode 100644 index 326f58b7a..a3a7c33dc --- a/pigx-register/src/main/java/com/alibaba/nacos/controller/RoleController.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/controller/RoleController.java @@ -13,19 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.alibaba.nacos.controller; import com.alibaba.nacos.common.model.RestResult; -import com.alibaba.nacos.nacos.NacosAuthConfig; -import com.alibaba.nacos.nacos.roles.NacosRoleServiceImpl; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; +import com.alibaba.nacos.security.nacos.roles.NacosRoleServiceImpl; import com.alibaba.nacos.core.auth.ActionTypes; import com.alibaba.nacos.core.auth.Secured; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** - * Role operation controller + * Role operation controller. * * @author nkorange * @since 1.2.0 @@ -38,7 +44,7 @@ public class RoleController { private NacosRoleServiceImpl roleService; /** - * Get roles list + * Get roles list. * @param pageNo number index of page * @param pageSize page size * @param username optional, username of user @@ -53,12 +59,13 @@ public class RoleController { /** * Add a role to a user + * *

* This method is used for 2 functions: 1. create a role and bind it to GLOBAL_ADMIN. * 2. bind a role to an user. - * @param role - * @param username - * @return + * @param role role name + * @param username username + * @return Code 200 and message 'add role ok!' */ @PostMapping @Secured(resource = NacosAuthConfig.CONSOLE_RESOURCE_NAME_PREFIX + "roles", action = ActionTypes.WRITE) @@ -68,7 +75,7 @@ public class RoleController { } /** - * Delete a role. If no username is specified, all users under this role are deleted + * Delete a role. If no username is specified, all users under this role are deleted. * @param role role * @param username username * @return ok if succeed diff --git a/pigx-register/src/main/java/com/alibaba/nacos/controller/ServerStateController.java b/pigx-register/src/main/java/com/alibaba/nacos/controller/ServerStateController.java old mode 100755 new mode 100644 index a99fb3855..3f1ba04c8 --- a/pigx-register/src/main/java/com/alibaba/nacos/controller/ServerStateController.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/controller/ServerStateController.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.alibaba.nacos.controller; import com.alibaba.nacos.common.utils.VersionUtils; @@ -26,12 +27,18 @@ import java.util.HashMap; import java.util.Map; /** + * Server state controller. + * * @author xingxuechao on:2019/2/27 11:17 AM */ @RestController @RequestMapping("/v1/console/server") public class ServerStateController { + /** + * Get server state of current server. + * @return state json. + */ @GetMapping("/state") public ResponseEntity serverState() { Map serverState = new HashMap<>(3); @@ -39,7 +46,7 @@ public class ServerStateController { : ApplicationUtils.STANDALONE_MODE_CLUSTER); serverState.put("function_mode", ApplicationUtils.getFunctionMode()); - serverState.put("version", VersionUtils.VERSION); + serverState.put("version", VersionUtils.version); return ResponseEntity.ok().body(serverState); } diff --git a/pigx-register/src/main/java/com/alibaba/nacos/controller/UserController.java b/pigx-register/src/main/java/com/alibaba/nacos/controller/UserController.java old mode 100755 new mode 100644 index 4cbd1dab2..5e50bc310 --- a/pigx-register/src/main/java/com/alibaba/nacos/controller/UserController.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/controller/UserController.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.alibaba.nacos.controller; import com.alibaba.nacos.api.common.Constants; @@ -20,16 +21,19 @@ import com.alibaba.nacos.common.model.RestResult; import com.alibaba.nacos.common.utils.JacksonUtils; import com.alibaba.nacos.config.server.auth.RoleInfo; import com.alibaba.nacos.config.server.model.User; -import com.alibaba.nacos.nacos.NacosAuthConfig; -import com.alibaba.nacos.nacos.NacosAuthManager; -import com.alibaba.nacos.nacos.roles.NacosRoleServiceImpl; -import com.alibaba.nacos.nacos.users.NacosUser; -import com.alibaba.nacos.nacos.users.NacosUserDetailsServiceImpl; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; +import com.alibaba.nacos.security.nacos.NacosAuthManager; +import com.alibaba.nacos.security.nacos.roles.NacosRoleServiceImpl; +import com.alibaba.nacos.security.nacos.users.NacosUser; +import com.alibaba.nacos.security.nacos.users.NacosUserDetailsServiceImpl; import com.alibaba.nacos.utils.JwtTokenUtils; import com.alibaba.nacos.utils.PasswordEncoderUtil; -import com.alibaba.nacos.core.auth.*; +import com.alibaba.nacos.core.auth.AccessException; +import com.alibaba.nacos.core.auth.ActionTypes; +import com.alibaba.nacos.core.auth.AuthConfigs; +import com.alibaba.nacos.core.auth.AuthSystemTypes; +import com.alibaba.nacos.core.auth.Secured; import com.fasterxml.jackson.databind.node.ObjectNode; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.BadCredentialsException; @@ -37,14 +41,20 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; /** - * User related methods entry + * User related methods entry. * * @author wfnuser * @author nkorange @@ -72,7 +82,7 @@ public class UserController { private NacosAuthManager authManager; /** - * Create a new user + * Create a new user. * @param username username * @param password password * @return ok if create succeed @@ -92,7 +102,7 @@ public class UserController { } /** - * Delete an existed user + * Delete an existed user. * @param username username of user * @return ok if deleted succeed, keep silent if user not exist * @since 1.2.0 @@ -113,7 +123,7 @@ public class UserController { } /** - * Update an user + * Update an user. * @param username username of user * @param newPassword new password of user * @return ok if update succeed @@ -135,7 +145,7 @@ public class UserController { } /** - * Get paged users + * Get paged users. * @param pageNo number index of page * @param pageSize size of page * @return A collection of users, empty set if no user is found @@ -149,6 +159,7 @@ public class UserController { /** * Login to Nacos + * *

* This methods uses username and password to require a new token. * @param username username of user @@ -201,6 +212,13 @@ public class UserController { } } + /** + * Update password. + * @param oldPassword old password + * @param newPassword new password + * @return Code 200 if update successfully, Code 401 if old password invalid, + * otherwise 500 + */ @PutMapping("/password") @Deprecated public RestResult updatePassword(@RequestParam(value = "oldPassword") String oldPassword, diff --git a/pigx-register/src/main/java/com/alibaba/nacos/exception/ConsoleExceptionHandler.java b/pigx-register/src/main/java/com/alibaba/nacos/exception/ConsoleExceptionHandler.java old mode 100755 new mode 100644 index 71d170137..fca1bfdf4 --- a/pigx-register/src/main/java/com/alibaba/nacos/exception/ConsoleExceptionHandler.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/exception/ConsoleExceptionHandler.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.alibaba.nacos.exception; import com.alibaba.nacos.common.utils.ExceptionUtil; @@ -25,7 +26,7 @@ import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; /** - * Exception handler for console module + * Exception handler for console module. * * @author nkorange * @since 1.2.0 @@ -33,7 +34,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler; @ControllerAdvice public class ConsoleExceptionHandler { - private static final Logger logger = LoggerFactory.getLogger(ConsoleExceptionHandler.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ConsoleExceptionHandler.class); @ExceptionHandler(AccessException.class) private ResponseEntity handleAccessException(AccessException e) { @@ -47,7 +48,7 @@ public class ConsoleExceptionHandler { @ExceptionHandler(Exception.class) private ResponseEntity handleException(Exception e) { - logger.error("CONSOLE", e); + LOGGER.error("CONSOLE", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(ExceptionUtil.getAllExceptionMsg(e)); } diff --git a/pigx-register/src/main/java/com/alibaba/nacos/filter/JwtAuthenticationTokenFilter.java b/pigx-register/src/main/java/com/alibaba/nacos/filter/JwtAuthenticationTokenFilter.java old mode 100755 new mode 100644 index 4016933a4..b3e8b74d3 --- a/pigx-register/src/main/java/com/alibaba/nacos/filter/JwtAuthenticationTokenFilter.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/filter/JwtAuthenticationTokenFilter.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.alibaba.nacos.filter; import com.alibaba.nacos.api.common.Constants; -import com.alibaba.nacos.nacos.JwtTokenManager; -import com.alibaba.nacos.nacos.NacosAuthConfig; +import com.alibaba.nacos.security.nacos.JwtTokenManager; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; import org.apache.commons.lang3.StringUtils; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; @@ -30,7 +31,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; /** - * jwt auth token filter + * jwt auth token filter. * * @author wfnuser */ @@ -38,7 +39,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter { private static final String TOKEN_PREFIX = "Bearer "; - private JwtTokenManager tokenManager; + private final JwtTokenManager tokenManager; public JwtAuthenticationTokenFilter(JwtTokenManager tokenManager) { this.tokenManager = tokenManager; @@ -59,7 +60,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter { } /** - * Get token from header + * Get token from header. */ private String resolveToken(HttpServletRequest request) { String bearerToken = request.getHeader(NacosAuthConfig.AUTHORIZATION_HEADER); diff --git a/pigx-register/src/main/java/com/alibaba/nacos/model/Namespace.java b/pigx-register/src/main/java/com/alibaba/nacos/model/Namespace.java old mode 100755 new mode 100644 index 2e6635769..29df59e22 --- a/pigx-register/src/main/java/com/alibaba/nacos/model/Namespace.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/model/Namespace.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.alibaba.nacos.model; /** - * Namespace + * Namespace. * * @author diamond */ @@ -31,7 +32,7 @@ public class Namespace { private int configCount; /** - * 0 : Global configuration， 1 : Default private namespace ，2 : Custom namespace + * 0 : Global configuration， 1 : Default private namespace ，2 : Custom namespace. */ private int type; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/model/NamespaceAllInfo.java b/pigx-register/src/main/java/com/alibaba/nacos/model/NamespaceAllInfo.java old mode 100755 new mode 100644 index b81a03a33..3ffb5f84f --- a/pigx-register/src/main/java/com/alibaba/nacos/model/NamespaceAllInfo.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/model/NamespaceAllInfo.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.alibaba.nacos.model; /** - * all namespace info + * all namespace info. * * @author Nacos */ diff --git a/pigx-register/src/main/java/com/alibaba/nacos/nacos/CustomAuthenticationProvider.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/CustomAuthenticationProvider.java old mode 100755 new mode 100644 similarity index 93% rename from pigx-register/src/main/java/com/alibaba/nacos/nacos/CustomAuthenticationProvider.java rename to pigx-register/src/main/java/com/alibaba/nacos/security/nacos/CustomAuthenticationProvider.java index 26abb6d71..e607921e7 --- a/pigx-register/src/main/java/com/alibaba/nacos/nacos/CustomAuthenticationProvider.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/CustomAuthenticationProvider.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.nacos.nacos; -import com.alibaba.nacos.nacos.users.NacosUserDetailsServiceImpl; +package com.alibaba.nacos.security.nacos; + +import com.alibaba.nacos.security.nacos.users.NacosUserDetailsServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -25,7 +26,7 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Component; /** - * auth provider + * auth provider. * * @author wfnuser */ diff --git a/pigx-register/src/main/java/com/alibaba/nacos/nacos/JwtAuthenticationEntryPoint.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/JwtAuthenticationEntryPoint.java old mode 100755 new mode 100644 similarity index 88% rename from pigx-register/src/main/java/com/alibaba/nacos/nacos/JwtAuthenticationEntryPoint.java rename to pigx-register/src/main/java/com/alibaba/nacos/security/nacos/JwtAuthenticationEntryPoint.java index 1cba991ae..f340adf7d --- a/pigx-register/src/main/java/com/alibaba/nacos/nacos/JwtAuthenticationEntryPoint.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/JwtAuthenticationEntryPoint.java @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.nacos.nacos; + +package com.alibaba.nacos.security.nacos; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,19 +28,19 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; /** - * jwt auth fail point + * jwt auth fail point. * * @author wfnuser */ @Component public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint { - private static final Logger logger = LoggerFactory.getLogger(JwtAuthenticationEntryPoint.class); + private static final Logger LOGGER = LoggerFactory.getLogger(JwtAuthenticationEntryPoint.class); @Override public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e) throws IOException, ServletException { - logger.error("Responding with unauthorized error. Message:{}, url:{}", e.getMessage(), request.getRequestURI()); + LOGGER.error("Responding with unauthorized error. Message:{}, url:{}", e.getMessage(), request.getRequestURI()); response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized"); } diff --git a/pigx-register/src/main/java/com/alibaba/nacos/nacos/JwtTokenManager.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/JwtTokenManager.java old mode 100755 new mode 100644 similarity index 91% rename from pigx-register/src/main/java/com/alibaba/nacos/nacos/JwtTokenManager.java rename to pigx-register/src/main/java/com/alibaba/nacos/security/nacos/JwtTokenManager.java index f2152e8fd..d77408f8f --- a/pigx-register/src/main/java/com/alibaba/nacos/nacos/JwtTokenManager.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/JwtTokenManager.java @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.nacos.nacos; + +package com.alibaba.nacos.security.nacos; import com.alibaba.nacos.core.auth.AuthConfigs; import io.jsonwebtoken.Claims; @@ -31,7 +32,7 @@ import java.util.Date; import java.util.List; /** - * JWT token manager + * JWT token manager. * * @author wfnuser * @author nkorange @@ -45,7 +46,7 @@ public class JwtTokenManager { private AuthConfigs authConfigs; /** - * Create token + * Create token. * @param authentication auth info * @return token */ @@ -53,9 +54,14 @@ public class JwtTokenManager { return createToken(authentication.getName()); } + /** + * Create token. + * @param userName auth info + * @return token + */ public String createToken(String userName) { - long now = (new Date()).getTime(); + long now = System.currentTimeMillis(); Date validity; validity = new Date(now + authConfigs.getTokenValidityInSeconds() * 1000L); @@ -67,14 +73,12 @@ public class JwtTokenManager { } /** - * Get auth Info + * Get auth Info. * @param token token * @return auth info */ public Authentication getAuthentication(String token) { - /** - * parse the payload of token - */ + Claims claims = Jwts.parser().setSigningKey(authConfigs.getSecretKey()).parseClaimsJws(token).getBody(); List authorities = AuthorityUtils @@ -85,9 +89,8 @@ public class JwtTokenManager { } /** - * validate token + * validate token. * @param token token - * @return whether valid */ public void validateToken(String token) { Jwts.parser().setSigningKey(authConfigs.getSecretKey()).parseClaimsJws(token); diff --git a/pigx-register/src/main/java/com/alibaba/nacos/nacos/NacosAuthConfig.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthConfig.java old mode 100755 new mode 100644 similarity index 89% rename from pigx-register/src/main/java/com/alibaba/nacos/nacos/NacosAuthConfig.java rename to pigx-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthConfig.java index cd236fa12..c10d0bd87 --- a/pigx-register/src/main/java/com/alibaba/nacos/nacos/NacosAuthConfig.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthConfig.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.nacos.nacos; + +package com.alibaba.nacos.security.nacos; import com.alibaba.nacos.filter.JwtAuthenticationTokenFilter; -import com.alibaba.nacos.nacos.users.NacosUserDetailsServiceImpl; +import com.alibaba.nacos.security.nacos.users.NacosUserDetailsServiceImpl; import com.alibaba.nacos.core.auth.AuthConfigs; import com.alibaba.nacos.core.auth.AuthSystemTypes; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.BeanIds; @@ -38,11 +38,10 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic import org.springframework.web.cors.CorsUtils; /** - * Spring security config + * Spring security config. * * @author Nacos */ -@Configuration @EnableGlobalMethodSecurity(prePostEnabled = true) public class NacosAuthConfig extends WebSecurityConfigurerAdapter { @@ -79,22 +78,18 @@ public class NacosAuthConfig extends WebSecurityConfigurerAdapter { @Override public void configure(WebSecurity web) { - String ignoreURLs = null; - // + String ignoreUrls = null; if (AuthSystemTypes.NACOS.name().equalsIgnoreCase(authConfigs.getNacosAuthSystemType())) { - ignoreURLs = "/**"; + ignoreUrls = "/**"; } - // if (StringUtils.isBlank(authConfigs.getNacosAuthSystemType())) { - ignoreURLs = env.getProperty("nacos.security.ignore.urls", "/**"); + ignoreUrls = env.getProperty("nacos.security.ignore.urls", "/**"); } - - if (StringUtils.isNotBlank(ignoreURLs)) { - for (String ignoreURL : ignoreURLs.trim().split(SECURITY_IGNORE_URLS_SPILT_CHAR)) { - web.ignoring().antMatchers(ignoreURL.trim()); + if (StringUtils.isNotBlank(ignoreUrls)) { + for (String each : ignoreUrls.trim().split(SECURITY_IGNORE_URLS_SPILT_CHAR)) { + web.ignoring().antMatchers(each.trim()); } } - } @Override diff --git a/pigx-register/src/main/java/com/alibaba/nacos/nacos/NacosAuthManager.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthManager.java old mode 100755 new mode 100644 similarity index 94% rename from pigx-register/src/main/java/com/alibaba/nacos/nacos/NacosAuthManager.java rename to pigx-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthManager.java index 102a095ac..140af0158 --- a/pigx-register/src/main/java/com/alibaba/nacos/nacos/NacosAuthManager.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthManager.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.nacos.nacos; + +package com.alibaba.nacos.security.nacos; import com.alibaba.nacos.api.common.Constants; import com.alibaba.nacos.config.server.auth.RoleInfo; -import com.alibaba.nacos.nacos.roles.NacosRoleServiceImpl; -import com.alibaba.nacos.nacos.users.NacosUser; +import com.alibaba.nacos.security.nacos.roles.NacosRoleServiceImpl; +import com.alibaba.nacos.security.nacos.users.NacosUser; import com.alibaba.nacos.core.auth.AccessException; import com.alibaba.nacos.core.auth.AuthManager; import com.alibaba.nacos.core.auth.Permission; @@ -38,7 +39,7 @@ import javax.servlet.http.HttpServletRequest; import java.util.List; /** - * Builtin access control entry of Nacos + * Builtin access control entry of Nacos. * * @author nkorange * @since 1.2.0 @@ -107,7 +108,7 @@ public class NacosAuthManager implements AuthManager { } /** - * Get token from header + * Get token from header. */ private String resolveToken(HttpServletRequest request) throws AccessException { String bearerToken = request.getHeader(NacosAuthConfig.AUTHORIZATION_HEADER); diff --git a/pigx-register/src/main/java/com/alibaba/nacos/nacos/roles/NacosRoleServiceImpl.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/roles/NacosRoleServiceImpl.java old mode 100755 new mode 100644 similarity index 89% rename from pigx-register/src/main/java/com/alibaba/nacos/nacos/roles/NacosRoleServiceImpl.java rename to pigx-register/src/main/java/com/alibaba/nacos/security/nacos/roles/NacosRoleServiceImpl.java index 75f7eeac1..582f08bf6 --- a/pigx-register/src/main/java/com/alibaba/nacos/nacos/roles/NacosRoleServiceImpl.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/roles/NacosRoleServiceImpl.java @@ -13,15 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.nacos.nacos.roles; + +package com.alibaba.nacos.security.nacos.roles; import com.alibaba.nacos.config.server.auth.PermissionInfo; import com.alibaba.nacos.config.server.auth.PermissionPersistService; import com.alibaba.nacos.config.server.auth.RoleInfo; import com.alibaba.nacos.config.server.auth.RolePersistService; import com.alibaba.nacos.config.server.model.Page; -import com.alibaba.nacos.nacos.NacosAuthConfig; -import com.alibaba.nacos.nacos.users.NacosUserDetailsServiceImpl; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; +import com.alibaba.nacos.security.nacos.users.NacosUserDetailsServiceImpl; import com.alibaba.nacos.core.auth.AuthConfigs; import com.alibaba.nacos.core.auth.Permission; import com.alibaba.nacos.core.utils.Loggers; @@ -32,7 +33,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; @@ -59,11 +64,11 @@ public class NacosRoleServiceImpl { @Autowired private PermissionPersistService permissionPersistService; - private Set roleSet = new ConcurrentHashSet<>(); + private volatile Set roleSet = new ConcurrentHashSet<>(); - private Map> roleInfoMap = new ConcurrentHashMap<>(); + private volatile Map> roleInfoMap = new ConcurrentHashMap<>(); - private Map> permissionInfoMap = new ConcurrentHashMap<>(); + private volatile Map> permissionInfoMap = new ConcurrentHashMap<>(); @Scheduled(initialDelay = 5000, fixedDelay = 15000) private void reload() { @@ -90,9 +95,9 @@ public class NacosRoleServiceImpl { tmpPermissionInfoMap.put(role, permissionInfoPage.getPageItems()); } - roleSet.addAll(tmpRoleSet); - roleInfoMap.putAll(tmpRoleInfoMap); - permissionInfoMap.putAll(tmpPermissionInfoMap); + roleSet = tmpRoleSet; + roleInfoMap = tmpRoleInfoMap; + permissionInfoMap = tmpPermissionInfoMap; } catch (Exception e) { Loggers.AUTH.warn("[LOAD-ROLES] load failed", e); @@ -101,6 +106,7 @@ public class NacosRoleServiceImpl { /** * Determine if the user has permission of the resource. + * *

* Note if the user has many roles, this method returns true if any one role of the * user has the desired permission. @@ -179,6 +185,11 @@ public class NacosRoleServiceImpl { return permissionPersistService.getPermissions(role, pageNo, pageSize); } + /** + * Add role. + * @param role role name + * @param username user name + */ public void addRole(String role, String username) { if (userDetailsService.getUserFromDatabase(username) == null) { throw new IllegalArgumentException("user '" + username + "' not found!"); @@ -207,6 +218,12 @@ public class NacosRoleServiceImpl { return pageInfo; } + /** + * Add permission. + * @param role role name + * @param resource resource + * @param action action + */ public void addPermission(String role, String resource, String action) { if (!roleSet.contains(role)) { throw new IllegalArgumentException("role " + role + " not found!"); diff --git a/pigx-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUser.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUser.java old mode 100755 new mode 100644 similarity index 94% rename from pigx-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUser.java rename to pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUser.java index 2dbaedaff..ae906ec49 --- a/pigx-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUser.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUser.java @@ -14,11 +14,13 @@ * limitations under the License. */ -package com.alibaba.nacos.nacos.users; +package com.alibaba.nacos.security.nacos.users; import com.alibaba.nacos.core.auth.User; /** + * Nacos User. + * * @author nkorange * @since 1.2.0 */ diff --git a/pigx-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUserDetails.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetails.java old mode 100755 new mode 100644 similarity index 94% rename from pigx-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUserDetails.java rename to pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetails.java index c2ece7a9e..cc75e038b --- a/pigx-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUserDetails.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetails.java @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.nacos.nacos.users; + +package com.alibaba.nacos.security.nacos.users; import com.alibaba.nacos.config.server.model.User; import org.springframework.security.core.GrantedAuthority; @@ -23,13 +24,13 @@ import org.springframework.security.core.userdetails.UserDetails; import java.util.Collection; /** - * custem user + * custom user. * * @author wfnuser */ public class NacosUserDetails implements UserDetails { - private User user; + private final User user; public NacosUserDetails(User user) { this.user = user; diff --git a/pigx-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUserDetailsServiceImpl.java b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetailsServiceImpl.java old mode 100755 new mode 100644 similarity index 97% rename from pigx-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUserDetailsServiceImpl.java rename to pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetailsServiceImpl.java index 84aecc8dc..d8bf52513 --- a/pigx-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUserDetailsServiceImpl.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetailsServiceImpl.java @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.nacos.nacos.users; + +package com.alibaba.nacos.security.nacos.users; import com.alibaba.nacos.config.server.auth.UserPersistService; import com.alibaba.nacos.config.server.model.Page; @@ -31,7 +32,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; /** - * Custem user service + * Custem user service. * * @author wfnuser * @author nkorange diff --git a/pigx-register/src/main/java/com/alibaba/nacos/utils/JwtTokenUtils.java b/pigx-register/src/main/java/com/alibaba/nacos/utils/JwtTokenUtils.java old mode 100755 new mode 100644 index 62bc98572..97e84311f --- a/pigx-register/src/main/java/com/alibaba/nacos/utils/JwtTokenUtils.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/utils/JwtTokenUtils.java @@ -13,9 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.alibaba.nacos.utils; -import io.jsonwebtoken.*; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.MalformedJwtException; +import io.jsonwebtoken.SignatureAlgorithm; +import io.jsonwebtoken.SignatureException; +import io.jsonwebtoken.UnsupportedJwtException; import io.jsonwebtoken.security.Keys; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +40,7 @@ import java.util.Date; import java.util.List; /** - * Jwt token tool + * Jwt token tool. * * @author wfnuser */ @@ -45,31 +52,34 @@ public class JwtTokenUtils { private static final String AUTHORITIES_KEY = "auth"; /** - * minimum SHA_256 secretKey string length + * minimum SHA_256 secretKey string length. */ private static final int SHA_256_SECRET_CHAR_SIZE = 256 / 8; /** - * default SHA_256 secretKey flag + * default SHA_256 secretKey flag. */ private static final String DEFAULT_SECRET_FLAG = "default"; /** - * custom SHA_256 secretKey from config property + * custom SHA_256 secretKey from config property. */ @Value("${nacos.security.token.secret-key:default}") private String customSecretKeyStr; /** - * secret key + * secret key. */ private SecretKey secretKey; /** - * Token validity time(ms) + * Token validity time(ms). */ private long tokenValidityInMilliseconds; + /** + * Init. + */ @PostConstruct public void init() { // use default secretKey for SHA-256 @@ -96,37 +106,27 @@ public class JwtTokenUtils { } /** - * Create token + * Create token. * @param authentication auth info * @return token */ public String createToken(Authentication authentication) { - /** - * Current time - */ - long now = (new Date()).getTime(); - /** - * Validity date - */ - Date validity; - validity = new Date(now + this.tokenValidityInMilliseconds); - /** - * create token - */ + long now = System.currentTimeMillis(); + + Date validity = new Date(now + this.tokenValidityInMilliseconds); + return Jwts.builder().setSubject(authentication.getName()).claim(AUTHORITIES_KEY, "").setExpiration(validity) .signWith(secretKey, SignatureAlgorithm.HS256).compact(); } /** - * Get auth Info + * Get auth Info. * @param token token * @return auth info */ public Authentication getAuthentication(String token) { - /** - * parse the payload of token - */ + Claims claims = Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token).getBody(); List authorities = AuthorityUtils @@ -137,7 +137,7 @@ public class JwtTokenUtils { } /** - * validate token + * validate token. * @param token token * @return whether valid */ diff --git a/pigx-register/src/main/java/com/alibaba/nacos/utils/PasswordEncoderUtil.java b/pigx-register/src/main/java/com/alibaba/nacos/utils/PasswordEncoderUtil.java old mode 100755 new mode 100644 index f02bb3d00..1dbf55c22 --- a/pigx-register/src/main/java/com/alibaba/nacos/utils/PasswordEncoderUtil.java +++ b/pigx-register/src/main/java/com/alibaba/nacos/utils/PasswordEncoderUtil.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.alibaba.nacos.utils; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; /** - * Password encoder tool + * Password encoder tool. * * @author nacos */ diff --git a/pigx-register/src/main/resources/static/console-fe/.babelrc b/pigx-register/src/main/resources/static/console-fe/.babelrc old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/.editorconfig b/pigx-register/src/main/resources/static/console-fe/.editorconfig old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/.eslintignore b/pigx-register/src/main/resources/static/console-fe/.eslintignore old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/.eslintrc b/pigx-register/src/main/resources/static/console-fe/.eslintrc old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/.gitignore b/pigx-register/src/main/resources/static/console-fe/.gitignore old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/.prettierignore b/pigx-register/src/main/resources/static/console-fe/.prettierignore old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/.prettierrc b/pigx-register/src/main/resources/static/console-fe/.prettierrc old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/README.md b/pigx-register/src/main/resources/static/console-fe/README.md old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/package.json b/pigx-register/src/main/resources/static/console-fe/package.json old mode 100755 new mode 100644 index cbdf6d384..22f682292 --- a/pigx-register/src/main/resources/static/console-fe/package.json +++ b/pigx-register/src/main/resources/static/console-fe/package.json @@ -60,14 +60,13 @@ "style-loader": "^1.1.2", "uglifyjs-webpack-plugin": "^2.2.0", "url-loader": "^3.0.0", - "webpack": "^4.41.4", - "webpack-cli": "^3.3.10", - "webpack-dev-server": "^3.10.1" + "webpack": "^4.43.0", + "webpack-cli": "^3.3.12", + "webpack-dev-server": "^3.11.0" }, "dependencies": { "@alifd/next": "^1.17.4", "axios": "^0.18.0", - "jquery": "^3.3.1", "moment": "^2.23.0", "qs": "^6.8.2", "prop-types": "^15.6.2", diff --git a/pigx-register/src/main/resources/static/console-fe/public/css/bootstrap.css b/pigx-register/src/main/resources/static/console-fe/public/css/bootstrap.css old mode 100755 new mode 100644 index ce3ef2335..72451b285 --- a/pigx-register/src/main/resources/static/console-fe/public/css/bootstrap.css +++ b/pigx-register/src/main/resources/static/console-fe/public/css/bootstrap.css @@ -1,9 +1,12 @@ /* * Copyright 1999-2018 Alibaba Group Holding Ltd. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/pigx-register/src/main/resources/static/console-fe/public/css/codemirror.css b/pigx-register/src/main/resources/static/console-fe/public/css/codemirror.css old mode 100755 new mode 100644 index b54156be5..3ebb1bf1a --- a/pigx-register/src/main/resources/static/console-fe/public/css/codemirror.css +++ b/pigx-register/src/main/resources/static/console-fe/public/css/codemirror.css @@ -1,9 +1,12 @@ /* * Copyright 1999-2018 Alibaba Group Holding Ltd. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/pigx-register/src/main/resources/static/console-fe/public/css/console1412.css b/pigx-register/src/main/resources/static/console-fe/public/css/console1412.css old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/css/font-awesome.css b/pigx-register/src/main/resources/static/console-fe/public/css/font-awesome.css old mode 100755 new mode 100644 index 09f8a2e58..4fec53fb9 --- a/pigx-register/src/main/resources/static/console-fe/public/css/font-awesome.css +++ b/pigx-register/src/main/resources/static/console-fe/public/css/font-awesome.css @@ -1,9 +1,12 @@ /* * Copyright 1999-2018 Alibaba Group Holding Ltd. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/pigx-register/src/main/resources/static/console-fe/public/css/fonts/aliyun-console-font.eot b/pigx-register/src/main/resources/static/console-fe/public/css/fonts/aliyun-console-font.eot old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/css/fonts/aliyun-console-font.ttf b/pigx-register/src/main/resources/static/console-fe/public/css/fonts/aliyun-console-font.ttf old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/css/fonts/aliyun-console-font.woff b/pigx-register/src/main/resources/static/console-fe/public/css/fonts/aliyun-console-font.woff old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/css/fonts/font_515771_emcns5054x3whfr.ttf b/pigx-register/src/main/resources/static/console-fe/public/css/fonts/font_515771_emcns5054x3whfr.ttf old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/css/fonts/font_515771_emcns5054x3whfr.woff b/pigx-register/src/main/resources/static/console-fe/public/css/fonts/font_515771_emcns5054x3whfr.woff old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-bold.ttf b/pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-bold.ttf old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-bold.woff b/pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-bold.woff old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-bold.woff2 b/pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-bold.woff2 old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-regular.ttf b/pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-regular.ttf old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-regular.woff b/pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-regular.woff old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-regular.woff2 b/pigx-register/src/main/resources/static/console-fe/public/css/fonts/roboto-regular.woff2 old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/css/icon.css b/pigx-register/src/main/resources/static/console-fe/public/css/icon.css old mode 100755 new mode 100644 index 60cc705ce..4577a45dc --- a/pigx-register/src/main/resources/static/console-fe/public/css/icon.css +++ b/pigx-register/src/main/resources/static/console-fe/public/css/icon.css @@ -1,9 +1,12 @@ /* * Copyright 1999-2018 Alibaba Group Holding Ltd. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -259,4 +262,4 @@ .icon-alitomcat:before { content: "\e607" !important; -} \ No newline at end of file +} diff --git a/pigx-register/src/main/resources/static/console-fe/public/css/merge.css b/pigx-register/src/main/resources/static/console-fe/public/css/merge.css old mode 100755 new mode 100644 index 1305bd07a..0038672ea --- a/pigx-register/src/main/resources/static/console-fe/public/css/merge.css +++ b/pigx-register/src/main/resources/static/console-fe/public/css/merge.css @@ -1,9 +1,12 @@ /* * Copyright 1999-2018 Alibaba Group Holding Ltd. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.eot b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.eot old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.ttf b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.ttf old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.woff b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.woff old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.woff2 b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.woff2 old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-light.eot b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-light.eot old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-light.ttf b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-light.ttf old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-light.woff b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-light.woff old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-light.woff2 b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-light.woff2 old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.eot b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.eot old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.ttf b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.ttf old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.woff b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.woff old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.woff2 b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.woff2 old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.eot b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.eot old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.ttf b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.ttf old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.woff b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.woff old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.woff2 b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.woff2 old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.eot b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.eot old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.ttf b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.ttf old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.woff b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.woff old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.woff2 b/pigx-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.woff2 old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/icons/icon-font.eot b/pigx-register/src/main/resources/static/console-fe/public/icons/icon-font.eot old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/icons/icon-font.svg b/pigx-register/src/main/resources/static/console-fe/public/icons/icon-font.svg old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/icons/icon-font.ttf b/pigx-register/src/main/resources/static/console-fe/public/icons/icon-font.ttf old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/icons/icon-font.woff b/pigx-register/src/main/resources/static/console-fe/public/icons/icon-font.woff old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/img/black_dot.png b/pigx-register/src/main/resources/static/console-fe/public/img/black_dot.png old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/img/favicon.ico b/pigx-register/src/main/resources/static/console-fe/public/img/favicon.ico old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/img/logo-2000-390.svg b/pigx-register/src/main/resources/static/console-fe/public/img/logo-2000-390.svg old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/img/nacos.png b/pigx-register/src/main/resources/static/console-fe/public/img/nacos.png old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/index.html b/pigx-register/src/main/resources/static/console-fe/public/index.html old mode 100755 new mode 100644 index cde191100..f076d8a62 --- a/pigx-register/src/main/resources/static/console-fe/public/index.html +++ b/pigx-register/src/main/resources/static/console-fe/public/index.html @@ -1,10 +1,12 @@ - + + diff --git a/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.addone.fullscreen.js b/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.addone.fullscreen.js old mode 100755 new mode 100644 index 32afce68c..e38b6a0ed --- a/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.addone.fullscreen.js +++ b/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.addone.fullscreen.js @@ -1,9 +1,12 @@ /* * Copyright 1999-2018 Alibaba Group Holding Ltd. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -48,4 +51,4 @@ window.scrollTo(info.scrollLeft, info.scrollTop); cm.refresh(); } -}); \ No newline at end of file +}); diff --git a/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.addone.json-lint.js b/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.addone.json-lint.js old mode 100755 new mode 100644 index 684673ef6..5628e0da6 --- a/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.addone.json-lint.js +++ b/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.addone.json-lint.js @@ -1,9 +1,12 @@ /* * Copyright 1999-2018 Alibaba Group Holding Ltd. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -38,4 +41,4 @@ CodeMirror.registerHelper("lint", "json", function(text) { return found; }); -}); \ No newline at end of file +}); diff --git a/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.addone.lint.js b/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.addone.lint.js old mode 100755 new mode 100644 index d7363bfe4..927caf8f2 --- a/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.addone.lint.js +++ b/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.addone.lint.js @@ -1,9 +1,12 @@ /* * Copyright 1999-2018 Alibaba Group Holding Ltd. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -245,4 +248,4 @@ CodeMirror.defineExtension("performLint", function() { if (this.state.lint) startLinting(this); }); -}); \ No newline at end of file +}); diff --git a/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.js b/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.js old mode 100755 new mode 100644 index 00872a7c2..559b4ea1a --- a/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.js +++ b/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.js @@ -1,9 +1,12 @@ /* * Copyright 1999-2018 Alibaba Group Holding Ltd. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.lib.clike-lint.js b/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.lib.clike-lint.js old mode 100755 new mode 100644 index 8c6e921bb..5ea9b1851 --- a/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.lib.clike-lint.js +++ b/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.lib.clike-lint.js @@ -1,9 +1,12 @@ /* * Copyright 1999-2018 Alibaba Group Holding Ltd. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -796,4 +799,4 @@ CodeMirror.defineMode("clike", function(config, parserConfig) { } }); -}); \ No newline at end of file +}); diff --git a/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.lib.json-lint.js b/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.lib.json-lint.js old mode 100755 new mode 100644 index d395030b1..92989879d --- a/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.lib.json-lint.js +++ b/pigx-register/src/main/resources/static/console-fe/public/js/codemirror.lib.json-lint.js @@ -1,9 +1,12 @@ /* * Copyright 1999-2018 Alibaba Group Holding Ltd. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -30,7 +33,7 @@ case 1: // replace escaped characters with actual character .replace(/\\v/g,'\v') .replace(/\\f/g,'\f') .replace(/\\b/g,'\b'); - + break; case 2:this.$ = Number(yytext); break; @@ -354,7 +357,7 @@ next:function () { if (this._input === "") { return this.EOF; } else { - this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(), + this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(), {text: "", token: null, line: this.yylineno}); } }, @@ -442,4 +445,4 @@ exports.main = function commonjsMain(args) { if (typeof module !== 'undefined' && require.main === module) { exports.main(typeof process !== 'undefined' ? process.argv.slice(1) : require("system").args); } -} \ No newline at end of file +} diff --git a/pigx-register/src/main/resources/static/console-fe/public/js/diff_match_patch.js b/pigx-register/src/main/resources/static/console-fe/public/js/diff_match_patch.js old mode 100755 new mode 100644 diff --git a/pigx-register/src/main/resources/static/console-fe/public/js/javascript.js b/pigx-register/src/main/resources/static/console-fe/public/js/javascript.js old mode 100755 new mode 100644 index 388753ce4..b6b45102c --- a/pigx-register/src/main/resources/static/console-fe/public/js/javascript.js +++ b/pigx-register/src/main/resources/static/console-fe/public/js/javascript.js @@ -1,9 +1,12 @@ /* * Copyright 1999-2018 Alibaba Group Holding Ltd. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/pigx-register/src/main/resources/static/console-fe/public/js/jquery.js b/pigx-register/src/main/resources/static/console-fe/public/js/jquery.js old mode 100755 new mode 100644 index bcd3956c8..b0614034a --- a/pigx-register/src/main/resources/static/console-fe/public/js/jquery.js +++ b/pigx-register/src/main/resources/static/console-fe/public/js/jquery.js @@ -1,4 +1,2 @@ -/*! jQuery v3.2.1 | (c) JS Foundation and other contributors | jquery.org/license */ -!function(a,b){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.2.1",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null==a?f.call(this):a<0?this[a+this.length]:this[a]},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c0&&b-1 in a)}var x=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(N),U=new RegExp("^"+L+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+N),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),aa=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:d<0?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ba=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ca=function(a,b){return b?"\0"===a?"\ufffd":a.slice(0,-1)+"\\"+a.charCodeAt(a.length-1).toString(16)+" ":"\\"+a},da=function(){m()},ea=ta(function(a){return a.disabled===!0&&("form"in a||"label"in a)},{dir:"parentNode",next:"legend"});try{G.apply(D=H.call(v.childNodes),v.childNodes),D[v.childNodes.length].nodeType}catch(fa){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s=b&&b.ownerDocument,w=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==w&&9!==w&&11!==w)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==w&&(l=Z.exec(a)))if(f=l[1]){if(9===w){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(s&&(j=s.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(l[2])return G.apply(d,b.getElementsByTagName(a)),d;if((f=l[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==w)s=b,r=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(ba,ca):b.setAttribute("id",k=u),o=g(a),h=o.length;while(h--)o[h]="#"+k+" "+sa(o[h]);r=o.join(","),s=$.test(a)&&qa(b.parentNode)||b}if(r)try{return G.apply(d,s.querySelectorAll(r)),d}catch(x){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(P,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("fieldset");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&a.sourceIndex-b.sourceIndex;if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return function(b){return"form"in b?b.parentNode&&b.disabled===!1?"label"in b?"label"in b.parentNode?b.parentNode.disabled===a:b.disabled===a:b.isDisabled===a||b.isDisabled!==!a&&ea(b)===a:b.disabled===a:"label"in b&&b.disabled===a}}function pa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function qa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return!!b&&"HTML"!==b.nodeName},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),v!==n&&(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(n.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){return a.getAttribute("id")===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}}):(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c,d,e,f=b.getElementById(a);if(f){if(c=f.getAttributeNode("id"),c&&c.value===a)return[f];e=b.getElementsByName(a),d=0;while(f=e[d++])if(c=f.getAttributeNode("id"),c&&c.value===a)return[f]}return[]}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){if("undefined"!=typeof b.getElementsByClassName&&p)return b.getElementsByClassName(a)},r=[],q=[],(c.qsa=Y.test(n.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){a.innerHTML="";var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+K+"*[*^$|!~]?="),2!==a.querySelectorAll(":enabled").length&&q.push(":enabled",":disabled"),o.appendChild(a).disabled=!0,2!==a.querySelectorAll(":disabled").length&&q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Y.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"*"),s.call(a,"[s!='']:x"),r.push("!=",N)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Y.test(o.compareDocumentPosition),t=b||Y.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?I(k,a)-I(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?I(k,a)-I(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?la(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(S,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.escape=function(a){return(a+"").replace(ba,ca)},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(_,aa),a[3]=(a[3]||a[4]||a[5]||"").replace(_,aa),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return V.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&T.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(_,aa).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:!b||(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(O," ")+" ").indexOf(c)>-1:"|="===b&&(e===c||e.slice(0,c.length+1)===c+"-"))}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(P,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(_,aa),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return U.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(_,aa).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:oa(!1),disabled:oa(!0),checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:pa(function(){return[0]}),last:pa(function(a,b){return[b-1]}),eq:pa(function(a,b,c){return[c<0?c+b:c]}),even:pa(function(a,b){for(var c=0;c=0;)a.push(d);return a}),gt:pa(function(a,b,c){for(var d=c<0?c+b:c;++d1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function va(a,b,c){for(var d=0,e=b.length;d-1&&(f[j]=!(g[j]=l))}}else r=wa(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ya(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ta(function(a){return a===b},h,!0),l=ta(function(a){return I(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];i1&&ua(m),i>1&&sa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(P,"$1"),c,i0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=E.call(i));u=wa(u)}G.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&ga.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=ya(b[c]),f[u]?d.push(f):e.push(f);f=A(a,za(e,d)),f.selector=a}return f},i=ga.select=function(a,b,c,e){var f,i,j,k,l,m="function"==typeof a&&a,n=!e&&g(a=m.selector||a);if(c=c||[],1===n.length){if(i=n[0]=n[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&9===b.nodeType&&p&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(_,aa),b)||[])[0],!b)return c;m&&(b=b.parentNode),a=a.slice(i.shift().value.length)}f=V.needsContext.test(a)?0:i.length;while(f--){if(j=i[f],d.relative[k=j.type])break;if((l=d.find[k])&&(e=l(j.matches[0].replace(_,aa),$.test(i[0].type)&&qa(b.parentNode)||b))){if(i.splice(f,1),a=e.length&&sa(i),!a)return G.apply(c,e),c;break}}}return(m||h(a,n))(e,b,!p,c,!b||$.test(a)&&qa(b.parentNode)||b),c},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("fieldset"))}),ja(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){if(!c)return a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){if(!c&&"input"===a.nodeName.toLowerCase())return a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(J,function(a,b,c){var d;if(!c)return a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);r.find=x,r.expr=x.selectors,r.expr[":"]=r.expr.pseudos,r.uniqueSort=r.unique=x.uniqueSort,r.text=x.getText,r.isXMLDoc=x.isXML,r.contains=x.contains,r.escapeSelector=x.escape;var y=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&r(a).is(c))break;d.push(a)}return d},z=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},A=r.expr.match.needsContext;function B(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()}var C=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,D=/^.[^:#\[\.,]*$/;function E(a,b,c){return r.isFunction(b)?r.grep(a,function(a,d){return!!b.call(a,d,a)!==c}):b.nodeType?r.grep(a,function(a){return a===b!==c}):"string"!=typeof b?r.grep(a,function(a){return i.call(b,a)>-1!==c}):D.test(b)?r.filter(b,a,c):(b=r.filter(b,a),r.grep(a,function(a){return i.call(b,a)>-1!==c&&1===a.nodeType}))}r.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?r.find.matchesSelector(d,a)?[d]:[]:r.find.matches(a,r.grep(b,function(a){return 1===a.nodeType}))},r.fn.extend({find:function(a){var b,c,d=this.length,e=this;if("string"!=typeof a)return this.pushStack(r(a).filter(function(){for(b=0;b1?r.uniqueSort(c):c},filter:function(a){return this.pushStack(E(this,a||[],!1))},not:function(a){return this.pushStack(E(this,a||[],!0))},is:function(a){return!!E(this,"string"==typeof a&&A.test(a)?r(a):a||[],!1).length}});var F,G=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,H=r.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||F,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:G.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof r?b[0]:b,r.merge(this,r.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),C.test(e[1])&&r.isPlainObject(b))for(e in b)r.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&(this[0]=f,this.length=1),this}return a.nodeType?(this[0]=a,this.length=1,this):r.isFunction(a)?void 0!==c.ready?c.ready(a):a(r):r.makeArray(a,this)};H.prototype=r.fn,F=r(d);var I=/^(?:parents|prev(?:Until|All))/,J={children:!0,contents:!0,next:!0,prev:!0};r.fn.extend({has:function(a){var b=r(a,this),c=b.length;return this.filter(function(){for(var a=0;a-1:1===c.nodeType&&r.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?r.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?i.call(r(a),this[0]):i.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(r.uniqueSort(r.merge(this.get(),r(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function K(a,b){while((a=a[b])&&1!==a.nodeType);return a}r.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return y(a,"parentNode")},parentsUntil:function(a,b,c){return y(a,"parentNode",c)},next:function(a){return K(a,"nextSibling")},prev:function(a){return K(a,"previousSibling")},nextAll:function(a){return y(a,"nextSibling")},prevAll:function(a){return y(a,"previousSibling")},nextUntil:function(a,b,c){return y(a,"nextSibling",c)},prevUntil:function(a,b,c){return y(a,"previousSibling",c)},siblings:function(a){return z((a.parentNode||{}).firstChild,a)},children:function(a){return z(a.firstChild)},contents:function(a){return B(a,"iframe")?a.contentDocument:(B(a,"template")&&(a=a.content||a),r.merge([],a.childNodes))}},function(a,b){r.fn[a]=function(c,d){var e=r.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=r.filter(d,e)),this.length>1&&(J[a]||r.uniqueSort(e),I.test(a)&&e.reverse()),this.pushStack(e)}});var L=/[^\x20\t\r\n\f]+/g;function M(a){var b={};return r.each(a.match(L)||[],function(a,c){b[c]=!0}),b}r.Callbacks=function(a){a="string"==typeof a?M(a):r.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=e||a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h-1)f.splice(c,1),c<=h&&h--}),this},has:function(a){return a?r.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||b||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j};function N(a){return a}function O(a){throw a}function P(a,b,c,d){var e;try{a&&r.isFunction(e=a.promise)?e.call(a).done(b).fail(c):a&&r.isFunction(e=a.then)?e.call(a,b,c):b.apply(void 0,[a].slice(d))}catch(a){c.apply(void 0,[a])}}r.extend({Deferred:function(b){var c=[["notify","progress",r.Callbacks("memory"),r.Callbacks("memory"),2],["resolve","done",r.Callbacks("once memory"),r.Callbacks("once memory"),0,"resolved"],["reject","fail",r.Callbacks("once memory"),r.Callbacks("once memory"),1,"rejected"]],d="pending",e={state:function(){return d},always:function(){return f.done(arguments).fail(arguments),this},"catch":function(a){return e.then(null,a)},pipe:function(){var a=arguments;return r.Deferred(function(b){r.each(c,function(c,d){var e=r.isFunction(a[d[4]])&&a[d[4]];f[d[1]](function(){var a=e&&e.apply(this,arguments);a&&r.isFunction(a.promise)?a.promise().progress(b.notify).done(b.resolve).fail(b.reject):b[d[0]+"With"](this,e?[a]:arguments)})}),a=null}).promise()},then:function(b,d,e){var f=0;function g(b,c,d,e){return function(){var h=this,i=arguments,j=function(){var a,j;if(!(b=f&&(d!==O&&(h=void 0,i=[a]),c.rejectWith(h,i))}};b?k():(r.Deferred.getStackHook&&(k.stackTrace=r.Deferred.getStackHook()),a.setTimeout(k))}}return r.Deferred(function(a){c[0][3].add(g(0,a,r.isFunction(e)?e:N,a.notifyWith)),c[1][3].add(g(0,a,r.isFunction(b)?b:N)),c[2][3].add(g(0,a,r.isFunction(d)?d:O))}).promise()},promise:function(a){return null!=a?r.extend(a,e):e}},f={};return r.each(c,function(a,b){var g=b[2],h=b[5];e[b[1]]=g.add,h&&g.add(function(){d=h},c[3-a][2].disable,c[0][2].lock),g.add(b[3].fire),f[b[0]]=function(){return f[b[0]+"With"](this===f?void 0:this,arguments),this},f[b[0]+"With"]=g.fireWith}),e.promise(f),b&&b.call(f,f),f},when:function(a){var b=arguments.length,c=b,d=Array(c),e=f.call(arguments),g=r.Deferred(),h=function(a){return function(c){d[a]=this,e[a]=arguments.length>1?f.call(arguments):c,--b||g.resolveWith(d,e)}};if(b<=1&&(P(a,g.done(h(c)).resolve,g.reject,!b),"pending"===g.state()||r.isFunction(e[c]&&e[c].then)))return g.then();while(c--)P(e[c],h(c),g.reject);return g.promise()}});var Q=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;r.Deferred.exceptionHook=function(b,c){a.console&&a.console.warn&&b&&Q.test(b.name)&&a.console.warn("jQuery.Deferred exception: "+b.message,b.stack,c)},r.readyException=function(b){a.setTimeout(function(){throw b})};var R=r.Deferred();r.fn.ready=function(a){return R.then(a)["catch"](function(a){r.readyException(a)}),this},r.extend({isReady:!1,readyWait:1,ready:function(a){(a===!0?--r.readyWait:r.isReady)||(r.isReady=!0,a!==!0&&--r.readyWait>0||R.resolveWith(d,[r]))}}),r.ready.then=R.then;function S(){d.removeEventListener("DOMContentLoaded",S), -a.removeEventListener("load",S),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",S),a.addEventListener("load",S));var T=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)T(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h1,null,!0)},removeData:function(a){return this.each(function(){X.remove(this,a)})}}),r.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=W.get(a,b),c&&(!d||Array.isArray(c)?d=W.access(a,b,r.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=r.queue(a,b),d=c.length,e=c.shift(),f=r._queueHooks(a,b),g=function(){r.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return W.get(a,c)||W.access(a,c,{empty:r.Callbacks("once memory").add(function(){W.remove(a,[b+"queue",c])})})}}),r.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length\x20\t\r\n\f]+)/i,la=/^$|\/(?:java|ecma)script/i,ma={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};ma.optgroup=ma.option,ma.tbody=ma.tfoot=ma.colgroup=ma.caption=ma.thead,ma.th=ma.td;function na(a,b){var c;return c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[],void 0===b||b&&B(a,b)?r.merge([a],c):c}function oa(a,b){for(var c=0,d=a.length;c-1)e&&e.push(f);else if(j=r.contains(f.ownerDocument,f),g=na(l.appendChild(f),"script"),j&&oa(g),c){k=0;while(f=g[k++])la.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),o.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="",o.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var ra=d.documentElement,sa=/^key/,ta=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,ua=/^([^.]*)(?:\.(.+)|)/;function va(){return!0}function wa(){return!1}function xa(){try{return d.activeElement}catch(a){}}function ya(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)ya(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=wa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return r().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=r.guid++)),a.each(function(){r.event.add(this,b,e,d,c)})}r.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=W.get(a);if(q){c.handler&&(f=c,c=f.handler,e=f.selector),e&&r.find.matchesSelector(ra,e),c.guid||(c.guid=r.guid++),(i=q.events)||(i=q.events={}),(g=q.handle)||(g=q.handle=function(b){return"undefined"!=typeof r&&r.event.triggered!==b.type?r.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(L)||[""],j=b.length;while(j--)h=ua.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n&&(l=r.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=r.event.special[n]||{},k=r.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&r.expr.match.needsContext.test(e),namespace:o.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,o,g)!==!1||a.addEventListener&&a.addEventListener(n,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),r.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=W.hasData(a)&&W.get(a);if(q&&(i=q.events)){b=(b||"").match(L)||[""],j=b.length;while(j--)if(h=ua.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){l=r.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&p!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,o,q.handle)!==!1||r.removeEvent(a,n,q.handle),delete i[n])}else for(n in i)r.event.remove(a,n+b[j],c,d,!0);r.isEmptyObject(i)&&W.remove(a,"handle events")}},dispatch:function(a){var b=r.event.fix(a),c,d,e,f,g,h,i=new Array(arguments.length),j=(W.get(this,"events")||{})[b.type]||[],k=r.event.special[b.type]||{};for(i[0]=b,c=1;c=1))for(;j!==this;j=j.parentNode||this)if(1===j.nodeType&&("click"!==a.type||j.disabled!==!0)){for(f=[],g={},c=0;c-1:r.find(e,this,null,[j]).length),g[e]&&f.push(d);f.length&&h.push({elem:j,handlers:f})}return j=this,i\x20\t\r\n\f]*)[^>]*)\/>/gi,Aa=/\s*$/g;function Ea(a,b){return B(a,"table")&&B(11!==b.nodeType?b:b.firstChild,"tr")?r(">tbody",a)[0]||a:a}function Fa(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function Ga(a){var b=Ca.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ha(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(W.hasData(a)&&(f=W.access(a),g=W.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;c1&&"string"==typeof q&&!o.checkClone&&Ba.test(q))return a.each(function(e){var f=a.eq(e);s&&(b[0]=q.call(this,e,f.html())),Ja(f,b,c,d)});if(m&&(e=qa(b,a[0].ownerDocument,!1,a,d),f=e.firstChild,1===e.childNodes.length&&(e=f),f||d)){for(h=r.map(na(e,"script"),Fa),i=h.length;l")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=r.contains(a.ownerDocument,a);if(!(o.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||r.isXMLDoc(a)))for(g=na(h),f=na(a),d=0,e=f.length;d0&&oa(g,!i&&na(a,"script")),h},cleanData:function(a){for(var b,c,d,e=r.event.special,f=0;void 0!==(c=a[f]);f++)if(U(c)){if(b=c[W.expando]){if(b.events)for(d in b.events)e[d]?r.event.remove(c,d):r.removeEvent(c,d,b.handle);c[W.expando]=void 0}c[X.expando]&&(c[X.expando]=void 0)}}}),r.fn.extend({detach:function(a){return Ka(this,a,!0)},remove:function(a){return Ka(this,a)},text:function(a){return T(this,function(a){return void 0===a?r.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return Ja(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ea(this,a);b.appendChild(a)}})},prepend:function(){return Ja(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ea(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ja(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ja(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(r.cleanData(na(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null!=a&&a,b=null==b?a:b,this.map(function(){return r.clone(this,a,b)})},html:function(a){return T(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!Aa.test(a)&&!ma[(ka.exec(a)||["",""])[1].toLowerCase()]){a=r.htmlPrefilter(a);try{for(;c1)}});function _a(a,b,c,d,e){return new _a.prototype.init(a,b,c,d,e)}r.Tween=_a,_a.prototype={constructor:_a,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||r.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(r.cssNumber[c]?"":"px")},cur:function(){var a=_a.propHooks[this.prop];return a&&a.get?a.get(this):_a.propHooks._default.get(this)},run:function(a){var b,c=_a.propHooks[this.prop];return this.options.duration?this.pos=b=r.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):_a.propHooks._default.set(this),this}},_a.prototype.init.prototype=_a.prototype,_a.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=r.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){r.fx.step[a.prop]?r.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[r.cssProps[a.prop]]&&!r.cssHooks[a.prop]?a.elem[a.prop]=a.now:r.style(a.elem,a.prop,a.now+a.unit)}}},_a.propHooks.scrollTop=_a.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},r.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},r.fx=_a.prototype.init,r.fx.step={};var ab,bb,cb=/^(?:toggle|show|hide)$/,db=/queueHooks$/;function eb(){bb&&(d.hidden===!1&&a.requestAnimationFrame?a.requestAnimationFrame(eb):a.setTimeout(eb,r.fx.interval),r.fx.tick())}function fb(){return a.setTimeout(function(){ab=void 0}),ab=r.now()}function gb(a,b){var c,d=0,e={height:a};for(b=b?1:0;d<4;d+=2-b)c=ca[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function hb(a,b,c){for(var d,e=(kb.tweeners[b]||[]).concat(kb.tweeners["*"]),f=0,g=e.length;f1)},removeAttr:function(a){return this.each(function(){r.removeAttr(this,a)})}}),r.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?r.prop(a,b,c):(1===f&&r.isXMLDoc(a)||(e=r.attrHooks[b.toLowerCase()]||(r.expr.match.bool.test(b)?lb:void 0)),void 0!==c?null===c?void r.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=r.find.attr(a,b), -null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&B(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(L);if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),lb={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=mb[b]||r.find.attr;mb[b]=function(a,b,d){var e,f,g=b.toLowerCase();return d||(f=mb[g],mb[g]=e,e=null!=c(a,b,d)?g:null,mb[g]=f),e}});var nb=/^(?:input|select|textarea|button)$/i,ob=/^(?:a|area)$/i;r.fn.extend({prop:function(a,b){return T(this,r.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[r.propFix[a]||a]})}}),r.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&r.isXMLDoc(a)||(b=r.propFix[b]||b,e=r.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=r.find.attr(a,"tabindex");return b?parseInt(b,10):nb.test(a.nodeName)||ob.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),o.optSelected||(r.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),r.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){r.propFix[this.toLowerCase()]=this});function pb(a){var b=a.match(L)||[];return b.join(" ")}function qb(a){return a.getAttribute&&a.getAttribute("class")||""}r.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).addClass(a.call(this,b,qb(this)))});if("string"==typeof a&&a){b=a.match(L)||[];while(c=this[i++])if(e=qb(c),d=1===c.nodeType&&" "+pb(e)+" "){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=pb(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).removeClass(a.call(this,b,qb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(L)||[];while(c=this[i++])if(e=qb(c),d=1===c.nodeType&&" "+pb(e)+" "){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=pb(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):r.isFunction(a)?this.each(function(c){r(this).toggleClass(a.call(this,c,qb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=r(this),f=a.match(L)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=qb(this),b&&W.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":W.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+pb(qb(c))+" ").indexOf(b)>-1)return!0;return!1}});var rb=/\r/g;r.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=r.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,r(this).val()):a,null==e?e="":"number"==typeof e?e+="":Array.isArray(e)&&(e=r.map(e,function(a){return null==a?"":a+""})),b=r.valHooks[this.type]||r.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=r.valHooks[e.type]||r.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(rb,""):null==c?"":c)}}}),r.extend({valHooks:{option:{get:function(a){var b=r.find.attr(a,"value");return null!=b?b:pb(r.text(a))}},select:{get:function(a){var b,c,d,e=a.options,f=a.selectedIndex,g="select-one"===a.type,h=g?null:[],i=g?f+1:e.length;for(d=f<0?i:g?f:0;d-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),r.each(["radio","checkbox"],function(){r.valHooks[this]={set:function(a,b){if(Array.isArray(b))return a.checked=r.inArray(r(a).val(),b)>-1}},o.checkOn||(r.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var sb=/^(?:focusinfocus|focusoutblur)$/;r.extend(r.event,{trigger:function(b,c,e,f){var g,h,i,j,k,m,n,o=[e||d],p=l.call(b,"type")?b.type:b,q=l.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!sb.test(p+r.event.triggered)&&(p.indexOf(".")>-1&&(q=p.split("."),p=q.shift(),q.sort()),k=p.indexOf(":")<0&&"on"+p,b=b[r.expando]?b:new r.Event(p,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=q.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:r.makeArray(c,[b]),n=r.event.special[p]||{},f||!n.trigger||n.trigger.apply(e,c)!==!1)){if(!f&&!n.noBubble&&!r.isWindow(e)){for(j=n.delegateType||p,sb.test(j+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),i=h;i===(e.ownerDocument||d)&&o.push(i.defaultView||i.parentWindow||a)}g=0;while((h=o[g++])&&!b.isPropagationStopped())b.type=g>1?j:n.bindType||p,m=(W.get(h,"events")||{})[b.type]&&W.get(h,"handle"),m&&m.apply(h,c),m=k&&h[k],m&&m.apply&&U(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=p,f||b.isDefaultPrevented()||n._default&&n._default.apply(o.pop(),c)!==!1||!U(e)||k&&r.isFunction(e[p])&&!r.isWindow(e)&&(i=e[k],i&&(e[k]=null),r.event.triggered=p,e[p](),r.event.triggered=void 0,i&&(e[k]=i)),b.result}},simulate:function(a,b,c){var d=r.extend(new r.Event,c,{type:a,isSimulated:!0});r.event.trigger(d,null,b)}}),r.fn.extend({trigger:function(a,b){return this.each(function(){r.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];if(c)return r.event.trigger(a,b,c,!0)}}),r.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(a,b){r.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),r.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),o.focusin="onfocusin"in a,o.focusin||r.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){r.event.simulate(b,a.target,r.event.fix(a))};r.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=W.access(d,b);e||d.addEventListener(a,c,!0),W.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=W.access(d,b)-1;e?W.access(d,b,e):(d.removeEventListener(a,c,!0),W.remove(d,b))}}});var tb=a.location,ub=r.now(),vb=/\?/;r.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||r.error("Invalid XML: "+b),c};var wb=/\[\]$/,xb=/\r?\n/g,yb=/^(?:submit|button|image|reset|file)$/i,zb=/^(?:input|select|textarea|keygen)/i;function Ab(a,b,c,d){var e;if(Array.isArray(b))r.each(b,function(b,e){c||wb.test(a)?d(a,e):Ab(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==r.type(b))d(a,b);else for(e in b)Ab(a+"["+e+"]",b[e],c,d)}r.param=function(a,b){var c,d=[],e=function(a,b){var c=r.isFunction(b)?b():b;d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(null==c?"":c)};if(Array.isArray(a)||a.jquery&&!r.isPlainObject(a))r.each(a,function(){e(this.name,this.value)});else for(c in a)Ab(c,a[c],b,e);return d.join("&")},r.fn.extend({serialize:function(){return r.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=r.prop(this,"elements");return a?r.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!r(this).is(":disabled")&&zb.test(this.nodeName)&&!yb.test(a)&&(this.checked||!ja.test(a))}).map(function(a,b){var c=r(this).val();return null==c?null:Array.isArray(c)?r.map(c,function(a){return{name:b.name,value:a.replace(xb,"\r\n")}}):{name:b.name,value:c.replace(xb,"\r\n")}}).get()}});var Bb=/%20/g,Cb=/#.*$/,Db=/([?&])_=[^&]*/,Eb=/^(.*?):[ \t]*([^\r\n]*)$/gm,Fb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Gb=/^(?:GET|HEAD)$/,Hb=/^\/\//,Ib={},Jb={},Kb="*/".concat("*"),Lb=d.createElement("a");Lb.href=tb.href;function Mb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(L)||[];if(r.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Nb(a,b,c,d){var e={},f=a===Jb;function g(h){var i;return e[h]=!0,r.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Ob(a,b){var c,d,e=r.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&r.extend(!0,a,d),a}function Pb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}if(f)return f!==i[0]&&i.unshift(f),c[f]}function Qb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}r.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:tb.href,type:"GET",isLocal:Fb.test(tb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Kb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":r.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Ob(Ob(a,r.ajaxSettings),b):Ob(r.ajaxSettings,a)},ajaxPrefilter:Mb(Ib),ajaxTransport:Mb(Jb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m,n,o=r.ajaxSetup({},c),p=o.context||o,q=o.context&&(p.nodeType||p.jquery)?r(p):r.event,s=r.Deferred(),t=r.Callbacks("once memory"),u=o.statusCode||{},v={},w={},x="canceled",y={readyState:0,getResponseHeader:function(a){var b;if(k){if(!h){h={};while(b=Eb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return k?g:null},setRequestHeader:function(a,b){return null==k&&(a=w[a.toLowerCase()]=w[a.toLowerCase()]||a,v[a]=b),this},overrideMimeType:function(a){return null==k&&(o.mimeType=a),this},statusCode:function(a){var b;if(a)if(k)y.always(a[y.status]);else for(b in a)u[b]=[u[b],a[b]];return this},abort:function(a){var b=a||x;return e&&e.abort(b),A(0,b),this}};if(s.promise(y),o.url=((b||o.url||tb.href)+"").replace(Hb,tb.protocol+"//"),o.type=c.method||c.type||o.method||o.type,o.dataTypes=(o.dataType||"*").toLowerCase().match(L)||[""],null==o.crossDomain){j=d.createElement("a");try{j.href=o.url,j.href=j.href,o.crossDomain=Lb.protocol+"//"+Lb.host!=j.protocol+"//"+j.host}catch(z){o.crossDomain=!0}}if(o.data&&o.processData&&"string"!=typeof o.data&&(o.data=r.param(o.data,o.traditional)),Nb(Ib,o,c,y),k)return y;l=r.event&&o.global,l&&0===r.active++&&r.event.trigger("ajaxStart"),o.type=o.type.toUpperCase(),o.hasContent=!Gb.test(o.type),f=o.url.replace(Cb,""),o.hasContent?o.data&&o.processData&&0===(o.contentType||"").indexOf("application/x-www-form-urlencoded")&&(o.data=o.data.replace(Bb,"+")):(n=o.url.slice(f.length),o.data&&(f+=(vb.test(f)?"&":"?")+o.data,delete o.data),o.cache===!1&&(f=f.replace(Db,"$1"),n=(vb.test(f)?"&":"?")+"_="+ub++ +n),o.url=f+n),o.ifModified&&(r.lastModified[f]&&y.setRequestHeader("If-Modified-Since",r.lastModified[f]),r.etag[f]&&y.setRequestHeader("If-None-Match",r.etag[f])),(o.data&&o.hasContent&&o.contentType!==!1||c.contentType)&&y.setRequestHeader("Content-Type",o.contentType),y.setRequestHeader("Accept",o.dataTypes[0]&&o.accepts[o.dataTypes[0]]?o.accepts[o.dataTypes[0]]+("*"!==o.dataTypes[0]?", "+Kb+"; q=0.01":""):o.accepts["*"]);for(m in o.headers)y.setRequestHeader(m,o.headers[m]);if(o.beforeSend&&(o.beforeSend.call(p,y,o)===!1||k))return y.abort();if(x="abort",t.add(o.complete),y.done(o.success),y.fail(o.error),e=Nb(Jb,o,c,y)){if(y.readyState=1,l&&q.trigger("ajaxSend",[y,o]),k)return y;o.async&&o.timeout>0&&(i=a.setTimeout(function(){y.abort("timeout")},o.timeout));try{k=!1,e.send(v,A)}catch(z){if(k)throw z;A(-1,z)}}else A(-1,"No Transport");function A(b,c,d,h){var j,m,n,v,w,x=c;k||(k=!0,i&&a.clearTimeout(i),e=void 0,g=h||"",y.readyState=b>0?4:0,j=b>=200&&b<300||304===b,d&&(v=Pb(o,y,d)),v=Qb(o,v,y,j),j?(o.ifModified&&(w=y.getResponseHeader("Last-Modified"),w&&(r.lastModified[f]=w),w=y.getResponseHeader("etag"),w&&(r.etag[f]=w)),204===b||"HEAD"===o.type?x="nocontent":304===b?x="notmodified":(x=v.state,m=v.data,n=v.error,j=!n)):(n=x,!b&&x||(x="error",b<0&&(b=0))),y.status=b,y.statusText=(c||x)+"",j?s.resolveWith(p,[m,x,y]):s.rejectWith(p,[y,x,n]),y.statusCode(u),u=void 0,l&&q.trigger(j?"ajaxSuccess":"ajaxError",[y,o,j?m:n]),t.fireWith(p,[y,x]),l&&(q.trigger("ajaxComplete",[y,o]),--r.active||r.event.trigger("ajaxStop")))}return y},getJSON:function(a,b,c){return r.get(a,b,c,"json")},getScript:function(a,b){return r.get(a,void 0,b,"script")}}),r.each(["get","post"],function(a,b){r[b]=function(a,c,d,e){return r.isFunction(c)&&(e=e||d,d=c,c=void 0),r.ajax(r.extend({url:a,type:b,dataType:e,data:c,success:d},r.isPlainObject(a)&&a))}}),r._evalUrl=function(a){return r.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},r.fn.extend({wrapAll:function(a){var b;return this[0]&&(r.isFunction(a)&&(a=a.call(this[0])),b=r(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this},wrapInner:function(a){return r.isFunction(a)?this.each(function(b){r(this).wrapInner(a.call(this,b))}):this.each(function(){var b=r(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=r.isFunction(a);return this.each(function(c){r(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(a){return this.parent(a).not("body").each(function(){r(this).replaceWith(this.childNodes)}),this}}),r.expr.pseudos.hidden=function(a){return!r.expr.pseudos.visible(a)},r.expr.pseudos.visible=function(a){return!!(a.offsetWidth||a.offsetHeight||a.getClientRects().length)},r.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Rb={0:200,1223:204},Sb=r.ajaxSettings.xhr();o.cors=!!Sb&&"withCredentials"in Sb,o.ajax=Sb=!!Sb,r.ajaxTransport(function(b){var c,d;if(o.cors||Sb&&!b.crossDomain)return{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Rb[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}}),r.ajaxPrefilter(function(a){a.crossDomain&&(a.contents.script=!1)}),r.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return r.globalEval(a),a}}}),r.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),r.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=r("