You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by ra...@apache.org on 2021/03/30 01:47:37 UTC
[dubbo-admin] branch mergeLatestCode2Antd updated (6ec3d8e ->
e10c602)
This is an automated email from the ASF dual-hosted git repository.
ranke pushed a change to branch mergeLatestCode2Antd
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git.
from 6ec3d8e fix nacos dataId can't match dubbo (#717)
add 1dc93cd add dubbo-admin-ui-antd module
add 8ec188d Temporarily add the information that the output rat does not pass
add 73cf20c modify CI
add 1483327 Update ci.yml
add 8b8f823 Solving the rat problem
add 1d3408c update ci
add b6cc5e6 [2021-3-21]Merge the latest code into the antd branch (#710)
add c14cdcd Merge branch 'develop' of https://github.com/apache/dubbo-admin into upstream-develop (#711)
add 75afb10 fix #713 (#718)
add e10c602 Merge branch 'dev-change-ui2antd' into mergeLatestCode2Antd
No new revisions were added by this update.
Summary of changes:
.../dubbo/admin/common/util/ConvertUtil.java | 4 +-
.../org/apache/dubbo/admin/model/dto/BaseDTO.java | 18 +
.../apache/dubbo/admin/service/RouteService.java | 1 -
.../.editorconfig | 11 +-
dubbo-admin-ui-antd/.eslintignore | 8 +
.../.eslintrc.js | 10 +-
dubbo-admin-ui-antd/.gitignore | 40 ++
dubbo-admin-ui-antd/.prettierignore | 23 +
.../.prettierrc.js | 5 +-
.../.stylelintrc.js | 5 +-
dubbo-admin-ui-antd/README.md | 46 ++
dubbo-admin-ui-antd/README_zh.md | 50 ++
.../config/config.dev.ts | 27 +-
dubbo-admin-ui-antd/config/config.ts | 75 +++
.../config/defaultSettings.ts | 34 +-
dubbo-admin-ui-antd/config/oneapi.json | 593 +++++++++++++++++++++
.../config/proxy.ts | 35 +-
dubbo-admin-ui-antd/config/routes.ts | 78 +++
.../jest.config.js | 12 +-
dubbo-admin-ui-antd/jsconfig.json | 10 +
dubbo-admin-ui-antd/mock/listTableList.ts | 191 +++++++
dubbo-admin-ui-antd/mock/notices.ts | 107 ++++
.../mock/route.ts | 9 +-
dubbo-admin-ui-antd/mock/user.ts | 211 ++++++++
dubbo-admin-ui-antd/package.json | 109 ++++
dubbo-admin-ui-antd/public/favicon.ico | Bin 0 -> 4286 bytes
dubbo-admin-ui-antd/public/home_bg.png | Bin 0 -> 203330 bytes
dubbo-admin-ui-antd/public/icons/icon-128x128.png | Bin 0 -> 1329 bytes
dubbo-admin-ui-antd/public/icons/icon-192x192.png | Bin 0 -> 1856 bytes
dubbo-admin-ui-antd/public/icons/icon-512x512.png | Bin 0 -> 5082 bytes
.../assets => dubbo-admin-ui-antd/public}/logo.png | Bin
dubbo-admin-ui-antd/public/logo.svg | 1 +
dubbo-admin-ui-antd/public/pro_icon.svg | 5 +
.../src/access.ts | 15 +-
dubbo-admin-ui-antd/src/app.tsx | 170 ++++++
.../src/components/Footer/index.tsx | 9 +-
.../src/components/HeaderDropdown/index.less | 18 +-
.../src/components/HeaderDropdown/index.tsx | 28 +-
.../src/components/HeaderSearch/index.less | 36 +-
.../src/components/HeaderSearch/index.tsx | 117 ++++
.../src/components/NoticeIcon/NoticeIcon.tsx | 142 +++++
.../src/components/NoticeIcon/NoticeList.less | 119 +++++
.../src/components/NoticeIcon/NoticeList.tsx | 129 +++++
.../src/components/NoticeIcon/index.less | 40 +-
.../src/components/NoticeIcon/index.tsx | 168 ++++++
.../src/components/RightContent/AvatarDropdown.tsx | 104 ++++
.../src/components/RightContent/index.less | 78 +++
.../src/components/RightContent/index.tsx | 77 +++
dubbo-admin-ui-antd/src/components/index.md | 1 +
dubbo-admin-ui-antd/src/e2e/baseLayout.e2e.js | 73 +++
.../src/global.less | 62 ++-
dubbo-admin-ui-antd/src/global.tsx | 101 ++++
.../src/locales/en-US.ts | 38 +-
.../src/locales/en-US/component.ts | 9 +-
.../src/locales/en-US/globalHeader.ts | 33 ++
dubbo-admin-ui-antd/src/locales/en-US/menu.ts | 69 +++
dubbo-admin-ui-antd/src/locales/en-US/pages.ts | 86 +++
.../src/locales/en-US/pwa.ts | 10 +-
.../src/locales/en-US/settingDrawer.ts | 47 ++
dubbo-admin-ui-antd/src/locales/en-US/settings.ts | 76 +++
.../src/locales/zh-CN.ts | 38 +-
.../src/locales/zh-CN/component.ts | 9 +-
.../src/locales/zh-CN/globalHeader.ts | 33 ++
dubbo-admin-ui-antd/src/locales/zh-CN/menu.ts | 69 +++
dubbo-admin-ui-antd/src/locales/zh-CN/pages.ts | 83 +++
.../src/locales/zh-CN/pwa.ts | 10 +-
.../src/locales/zh-CN/settingDrawer.ts | 47 ++
dubbo-admin-ui-antd/src/locales/zh-CN/settings.ts | 71 +++
dubbo-admin-ui-antd/src/manifest.json | 22 +
.../src/pages/404.tsx | 28 +-
dubbo-admin-ui-antd/src/pages/Admin.tsx | 59 ++
.../src/pages/Service/index.tsx | 12 +-
.../src/pages/TableList/components/UpdateForm.tsx | 225 ++++++++
dubbo-admin-ui-antd/src/pages/TableList/index.tsx | 393 ++++++++++++++
.../src/pages/User/login/index.less | 130 +++++
dubbo-admin-ui-antd/src/pages/User/login/index.tsx | 214 ++++++++
.../src/pages/Welcome.less | 12 +-
dubbo-admin-ui-antd/src/pages/Welcome.tsx | 82 +++
dubbo-admin-ui-antd/src/pages/document.ejs | 208 ++++++++
dubbo-admin-ui-antd/src/service-worker.js | 82 +++
.../src/services/ant-design-pro/api.ts | 27 +-
.../src/services/ant-design-pro/index.ts | 14 +-
.../src/services/ant-design-pro/login.ts | 29 +-
.../src/services/ant-design-pro/rule.ts | 63 +++
.../src/services/ant-design-pro/typings.d.ts | 117 ++++
.../src/storage/auth.ts | 68 +--
dubbo-admin-ui-antd/src/typings.d.ts | 54 ++
.../src/utils/utils.less | 22 +-
dubbo-admin-ui-antd/src/utils/utils.test.ts | 53 ++
.../src/utils/utils.ts | 31 +-
dubbo-admin-ui-antd/tests/PuppeteerEnvironment.js | 57 ++
dubbo-admin-ui-antd/tests/beforeTest.js | 55 ++
dubbo-admin-ui-antd/tests/getBrowser.js | 61 +++
dubbo-admin-ui-antd/tests/run-tests.js | 68 +++
.../tests/setupTests.js | 14 +-
dubbo-admin-ui-antd/tsconfig.json | 40 ++
dubbo-admin-ui/src/assets/logo.svg | 51 ++
.../src/util/auth.js | 30 +-
pom.xml | 3 +
99 files changed, 5940 insertions(+), 317 deletions(-)
copy {dubbo-admin-ui => dubbo-admin-ui-antd}/.editorconfig (60%)
create mode 100644 dubbo-admin-ui-antd/.eslintignore
copy dubbo-admin-ui/babel.config.js => dubbo-admin-ui-antd/.eslintrc.js (82%)
create mode 100644 dubbo-admin-ui-antd/.gitignore
create mode 100644 dubbo-admin-ui-antd/.prettierignore
copy dubbo-admin-ui/babel.config.js => dubbo-admin-ui-antd/.prettierrc.js (92%)
copy dubbo-admin-ui/babel.config.js => dubbo-admin-ui-antd/.stylelintrc.js (92%)
create mode 100644 dubbo-admin-ui-antd/README.md
create mode 100644 dubbo-admin-ui-antd/README_zh.md
copy dubbo-admin-ui/.eslintrc.js => dubbo-admin-ui-antd/config/config.dev.ts (68%)
create mode 100644 dubbo-admin-ui-antd/config/config.ts
copy dubbo-admin-ui/.eslintrc.js => dubbo-admin-ui-antd/config/defaultSettings.ts (66%)
create mode 100644 dubbo-admin-ui-antd/config/oneapi.json
copy dubbo-admin-ui/.eslintrc.js => dubbo-admin-ui-antd/config/proxy.ts (68%)
create mode 100644 dubbo-admin-ui-antd/config/routes.ts
copy dubbo-admin-ui/babel.config.js => dubbo-admin-ui-antd/jest.config.js (76%)
create mode 100644 dubbo-admin-ui-antd/jsconfig.json
create mode 100644 dubbo-admin-ui-antd/mock/listTableList.ts
create mode 100644 dubbo-admin-ui-antd/mock/notices.ts
copy dubbo-admin-ui/babel.config.js => dubbo-admin-ui-antd/mock/route.ts (88%)
create mode 100644 dubbo-admin-ui-antd/mock/user.ts
create mode 100644 dubbo-admin-ui-antd/package.json
create mode 100644 dubbo-admin-ui-antd/public/favicon.ico
create mode 100644 dubbo-admin-ui-antd/public/home_bg.png
create mode 100644 dubbo-admin-ui-antd/public/icons/icon-128x128.png
create mode 100644 dubbo-admin-ui-antd/public/icons/icon-192x192.png
create mode 100644 dubbo-admin-ui-antd/public/icons/icon-512x512.png
copy {dubbo-admin-ui/src/assets => dubbo-admin-ui-antd/public}/logo.png (100%)
create mode 100644 dubbo-admin-ui-antd/public/logo.svg
create mode 100644 dubbo-admin-ui-antd/public/pro_icon.svg
copy dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/MetricsService.java => dubbo-admin-ui-antd/src/access.ts (74%)
create mode 100644 dubbo-admin-ui-antd/src/app.tsx
copy dubbo-admin-ui/babel.config.js => dubbo-admin-ui-antd/src/components/Footer/index.tsx (82%)
copy dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/MetricsService.java => dubbo-admin-ui-antd/src/components/HeaderDropdown/index.less (73%)
copy dubbo-admin-server/src/main/java/org/apache/dubbo/admin/DubboAdminApplication.java => dubbo-admin-ui-antd/src/components/HeaderDropdown/index.tsx (54%)
copy dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Tag.java => dubbo-admin-ui-antd/src/components/HeaderSearch/index.less (64%)
create mode 100644 dubbo-admin-ui-antd/src/components/HeaderSearch/index.tsx
create mode 100644 dubbo-admin-ui-antd/src/components/NoticeIcon/NoticeIcon.tsx
create mode 100644 dubbo-admin-ui-antd/src/components/NoticeIcon/NoticeList.less
create mode 100644 dubbo-admin-ui-antd/src/components/NoticeIcon/NoticeList.tsx
copy dubbo-admin-server/src/main/java/org/apache/dubbo/admin/model/domain/Tag.java => dubbo-admin-ui-antd/src/components/NoticeIcon/index.less (65%)
create mode 100644 dubbo-admin-ui-antd/src/components/NoticeIcon/index.tsx
create mode 100644 dubbo-admin-ui-antd/src/components/RightContent/AvatarDropdown.tsx
create mode 100644 dubbo-admin-ui-antd/src/components/RightContent/index.less
create mode 100644 dubbo-admin-ui-antd/src/components/RightContent/index.tsx
create mode 100644 dubbo-admin-ui-antd/src/components/index.md
create mode 100644 dubbo-admin-ui-antd/src/e2e/baseLayout.e2e.js
copy dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/editors/CustomLocalDateEditor.java => dubbo-admin-ui-antd/src/global.less (55%)
create mode 100644 dubbo-admin-ui-antd/src/global.tsx
copy dubbo-admin-ui/.eslintrc.js => dubbo-admin-ui-antd/src/locales/en-US.ts (51%)
copy dubbo-admin-ui/babel.config.js => dubbo-admin-ui-antd/src/locales/en-US/component.ts (85%)
create mode 100644 dubbo-admin-ui-antd/src/locales/en-US/globalHeader.ts
create mode 100644 dubbo-admin-ui-antd/src/locales/en-US/menu.ts
create mode 100644 dubbo-admin-ui-antd/src/locales/en-US/pages.ts
copy dubbo-admin-ui/babel.config.js => dubbo-admin-ui-antd/src/locales/en-US/pwa.ts (74%)
create mode 100644 dubbo-admin-ui-antd/src/locales/en-US/settingDrawer.ts
create mode 100644 dubbo-admin-ui-antd/src/locales/en-US/settings.ts
copy dubbo-admin-ui/.eslintrc.js => dubbo-admin-ui-antd/src/locales/zh-CN.ts (51%)
copy dubbo-admin-ui/babel.config.js => dubbo-admin-ui-antd/src/locales/zh-CN/component.ts (85%)
create mode 100644 dubbo-admin-ui-antd/src/locales/zh-CN/globalHeader.ts
create mode 100644 dubbo-admin-ui-antd/src/locales/zh-CN/menu.ts
create mode 100644 dubbo-admin-ui-antd/src/locales/zh-CN/pages.ts
copy dubbo-admin-ui/babel.config.js => dubbo-admin-ui-antd/src/locales/zh-CN/pwa.ts (75%)
create mode 100644 dubbo-admin-ui-antd/src/locales/zh-CN/settingDrawer.ts
create mode 100644 dubbo-admin-ui-antd/src/locales/zh-CN/settings.ts
create mode 100644 dubbo-admin-ui-antd/src/manifest.json
copy dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/exception/VersionValidationException.java => dubbo-admin-ui-antd/src/pages/404.tsx (67%)
create mode 100644 dubbo-admin-ui-antd/src/pages/Admin.tsx
copy dubbo-admin-ui/babel.config.js => dubbo-admin-ui-antd/src/pages/Service/index.tsx (85%)
create mode 100644 dubbo-admin-ui-antd/src/pages/TableList/components/UpdateForm.tsx
create mode 100644 dubbo-admin-ui-antd/src/pages/TableList/index.tsx
create mode 100644 dubbo-admin-ui-antd/src/pages/User/login/index.less
create mode 100644 dubbo-admin-ui-antd/src/pages/User/login/index.tsx
copy dubbo-admin-ui/babel.config.js => dubbo-admin-ui-antd/src/pages/Welcome.less (84%)
create mode 100644 dubbo-admin-ui-antd/src/pages/Welcome.tsx
create mode 100644 dubbo-admin-ui-antd/src/pages/document.ejs
create mode 100644 dubbo-admin-ui-antd/src/service-worker.js
copy dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/exception/VersionValidationException.java => dubbo-admin-ui-antd/src/services/ant-design-pro/api.ts (61%)
copy dubbo-admin-ui/babel.config.js => dubbo-admin-ui-antd/src/services/ant-design-pro/index.ts (82%)
copy dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/exception/VersionValidationException.java => dubbo-admin-ui-antd/src/services/ant-design-pro/login.ts (61%)
create mode 100644 dubbo-admin-ui-antd/src/services/ant-design-pro/rule.ts
create mode 100644 dubbo-admin-ui-antd/src/services/ant-design-pro/typings.d.ts
copy dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/exception/ServiceException.java => dubbo-admin-ui-antd/src/storage/auth.ts (50%)
create mode 100644 dubbo-admin-ui-antd/src/typings.d.ts
copy dubbo-admin-server/src/main/java/org/apache/dubbo/admin/service/MetricsService.java => dubbo-admin-ui-antd/src/utils/utils.less (77%)
create mode 100644 dubbo-admin-ui-antd/src/utils/utils.test.ts
copy dubbo-admin-ui/.eslintrc.js => dubbo-admin-ui-antd/src/utils/utils.ts (54%)
create mode 100644 dubbo-admin-ui-antd/tests/PuppeteerEnvironment.js
create mode 100644 dubbo-admin-ui-antd/tests/beforeTest.js
create mode 100644 dubbo-admin-ui-antd/tests/getBrowser.js
create mode 100644 dubbo-admin-ui-antd/tests/run-tests.js
copy dubbo-admin-ui/babel.config.js => dubbo-admin-ui-antd/tests/setupTests.js (81%)
create mode 100644 dubbo-admin-ui-antd/tsconfig.json
create mode 100644 dubbo-admin-ui/src/assets/logo.svg
copy dubbo-admin-server/src/main/java/org/apache/dubbo/admin/common/exception/VersionValidationException.java => dubbo-admin-ui/src/util/auth.js (64%)