From d4f77789c78d6d3a6ec0fef2fef60c4ec886cc7e Mon Sep 17 00:00:00 2001 From: shuanglin Date: Fri, 3 Jan 2025 17:48:07 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=EF=BC=9A?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=BD=AC=E5=8F=91=E6=96=87=E4=BB=B6=E6=B5=81?= =?UTF-8?q?=202.=E8=B0=83=E6=95=B4=E9=A1=B9=E7=9B=AE=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=8C=E4=B8=BA=E5=90=8E=E7=BB=AD=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=8D=87=E7=BA=A7=E5=81=9A=E5=87=86=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/RestBlacklistingController.java | 99 ------ .../rest/RestStatisticsController.java | 120 -------- .../java/net/risesoft/model/ApplyType.java | 29 -- .../net/risesoft/model/ParameterType.java | 31 -- .../net/risesoft/model/ThresholdType.java | 27 -- .../risesoft/service/UseInterfaceService.java | 14 - .../java/net/risesoft/util/AuthCheckUtil.java | 252 ---------------- .../java/net/risesoft/util/JaxRsUtil.java | 72 ----- .../java/net/risesoft/util/JaxWsUtil.java | 164 ---------- .../main/java/net/risesoft/util/RestUtil.java | 21 -- .../net/risesoft/y9public/dto/ApproveDTO.java | 69 ----- .../risesoft/y9public/dto/AuthDictDTO.java | 68 ----- .../y9public/dto/InterfaceApplyDTO.java | 94 ------ .../y9public/dto/InterfaceManageDTO.java | 140 --------- .../risesoft/y9public/dto/ParameterDTO.java | 63 ---- .../risesoft/y9public/dto/ViewApproveDTO.java | 64 ---- .../net/risesoft/y9public/entity/Approve.java | 108 ------- .../risesoft/y9public/entity/AuthDict.java | 101 ------- .../y9public/entity/Blacklisting.java | 55 ---- .../y9public/entity/InterfaceApply.java | 141 --------- .../y9public/entity/InterfaceLimitInfo.java | 70 ----- .../y9public/entity/InterfaceManage.java | 190 ------------ .../risesoft/y9public/entity/Parameter.java | 96 ------ .../y9public/entity/SystemIdentifier.java | 51 ---- .../risesoft/y9public/entity/ViewApprove.java | 120 -------- .../net/risesoft/y9public/vo/ApplyVo.java | 48 --- .../risesoft/y9public/vo/ViewApproveVo.java | 86 ------ .../src/main/resources/sql/data-mysql.sql | 42 --- .../y9vue-interfacePlatform}/.env.development | 2 - .../y9vue-interfacePlatform}/.env.production | 4 +- .../y9vue-interfacePlatform}/.eslintignore | 0 .../y9vue-interfacePlatform}/.eslintrc.js | 0 .../y9vue-interfacePlatform}/.prettierignore | 0 .../y9vue-interfacePlatform}/README.md | 0 .../y9vue-interfacePlatform}/components.d.ts | 0 .../y9vue-interfacePlatform}/index.html | 0 .../package-lock.json | 0 .../y9vue-interfacePlatform}/package.json | 0 .../prettier.config.js | 0 .../y9vue-interfacePlatform}/public/yun.ico | Bin .../y9vue-interfacePlatform}/src/App.vue | 0 .../src/api/apply/apply.ts | 0 .../src/api/approve/approve.ts | 0 .../src/api/authInterface/authInterface.ts | 0 .../src/api/blacklisting/blacklisting.ts | 0 .../src/api/flownode/flownode.ts | 0 .../src/api/home/home.ts | 0 .../src/api/interface/interface.ts | 0 .../src/api/lib/request.js | 0 .../src/api/lib/requestNode.js | 0 .../src/api/logMonitoring/logMonitoring.ts | 0 .../api/systemidentifier/systemidentifier.ts | 0 .../src/api/test/index.ts | 0 .../src/assets/css/nprogress.css | 0 .../src/assets/css/tablestatusfontcolor.css | 0 .../src/assets/font/yjsz.TTF | Bin .../src/assets/icons/png/cloud.png | Bin .../src/assets/icons/png/file.png | Bin .../src/assets/icons/png/folder-open.png | Bin .../src/assets/icons/png/metro.png | Bin .../src/assets/icons/png/node_home.png | Bin .../src/assets/icons/png/node_system.png | Bin .../src/assets/icons/png/search.png | Bin .../src/assets/icons/png/user_female.png | Bin .../src/assets/icons/png/user_gray.png | Bin .../src/assets/icons/png/user_male.png | Bin .../src/assets/icons/svg/ask.svg | 0 .../src/assets/icons/svg/chart.svg | 0 .../src/assets/icons/svg/components.svg | 0 .../src/assets/icons/svg/control.svg | 0 .../src/assets/icons/svg/editor.svg | 0 .../src/assets/icons/svg/history.svg | 0 .../src/assets/icons/svg/home.svg | 0 .../src/assets/icons/svg/image-text.svg | 0 .../src/assets/icons/svg/layers.svg | 0 .../src/assets/icons/svg/message.svg | 0 .../src/assets/icons/svg/monitoring.svg | 0 .../src/assets/icons/svg/other.svg | 0 .../src/assets/icons/svg/page.svg | 0 .../src/assets/icons/svg/pagedetails.svg | 0 .../src/assets/icons/svg/pageform.svg | 0 .../src/assets/icons/svg/pagelist.svg | 0 .../src/assets/icons/svg/roles.svg | 0 .../src/assets/icons/svg/s-fold.svg | 0 .../src/assets/icons/svg/s-unfold.svg | 0 .../src/assets/icons/svg/set.svg | 0 .../src/assets/icons/svg/tree.svg | 0 .../src/assets/icons/svg/users.svg | 0 .../src/assets/icons/svg/y9-logo.svg | 0 .../icons/treeIcon/chart_organization.png | Bin .../src/assets/icons/treeIcon/folder_user.png | Bin .../src/assets/icons/treeIcon/group.png | Bin .../src/assets/icons/treeIcon/user_female.png | Bin .../src/assets/icons/treeIcon/user_male.png | Bin .../src/assets/iconsvg/arrow-down.svg | 0 .../src/assets/iconsvg/arrow-left.svg | 0 .../src/assets/iconsvg/arrow-left2.svg | 0 .../src/assets/iconsvg/arrow-right.svg | 0 .../src/assets/iconsvg/arrow-right2.svg | 0 .../src/assets/iconsvg/arrow-up.svg | 0 .../src/assets/iconsvg/bnb-fill.svg | 0 .../src/assets/iconsvg/chart.svg | 0 .../src/assets/iconsvg/close.svg | 0 .../src/assets/iconsvg/close2.svg | 0 .../src/assets/iconsvg/components.svg | 0 .../src/assets/iconsvg/control.svg | 0 .../src/assets/iconsvg/detail.svg | 0 .../src/assets/iconsvg/edit.svg | 0 .../src/assets/iconsvg/editor.svg | 0 .../src/assets/iconsvg/home.svg | 0 .../src/assets/iconsvg/icon.svg | 0 .../src/assets/iconsvg/language-outline.svg | 0 .../src/assets/iconsvg/list.svg | 0 .../src/assets/iconsvg/menu-fold.svg | 0 .../src/assets/iconsvg/menu-unfold.svg | 0 .../src/assets/iconsvg/message.svg | 0 .../src/assets/iconsvg/more.svg | 0 .../src/assets/iconsvg/page.svg | 0 .../src/assets/iconsvg/permissions.svg | 0 .../src/assets/iconsvg/pwd.svg | 0 .../src/assets/iconsvg/refresh.svg | 0 .../src/assets/iconsvg/search.svg | 0 .../src/assets/iconsvg/set.svg | 0 .../src/assets/iconsvg/svgo.yml | 0 .../src/assets/iconsvg/user.svg | 0 .../src/assets/images/app-icon.png | Bin .../src/assets/images/bg-smooth.jpg | Bin .../src/assets/images/bg.jpg | Bin .../src/assets/images/logo.png | Bin .../src/assets/images/meeting.jpg | Bin .../src/assets/images/menu-bg1.png | Bin .../src/assets/images/menu-bg10.png | Bin .../src/assets/images/menu-bg5.png | Bin .../src/assets/images/menu-bg7.png | Bin .../src/assets/images/menu-bg8.png | Bin .../src/assets/images/menu-bg9.png | Bin .../src/assets/images/touxiang.png | Bin .../src/assets/images/youshengyunLogo.png | Bin .../src/assets/images/yun.png | Bin .../src/assets/images/yunLogo.png | Bin .../src/language/en.json | 0 .../src/language/index.ts | 0 .../src/language/zh.json | 0 .../src/layouts/Y9-default/Left.vue | 0 .../src/layouts/Y9-default/RightTop.vue | 0 .../src/layouts/Y9-default/index.vue | 0 .../src/layouts/Y9-horizontal/Navs.vue | 0 .../src/layouts/Y9-horizontal/RightTop.vue | 0 .../src/layouts/Y9-horizontal/index.vue | 0 .../src/layouts/Y9-mobile/Left.vue | 0 .../src/layouts/Y9-mobile/RightTop.vue | 0 .../src/layouts/Y9-mobile/index.vue | 0 .../src/layouts/components/ALink/index.vue | 0 .../layouts/components/BreadCrumbs/index.vue | 0 .../src/layouts/components/Icon.vue | 0 .../src/layouts/components/IconSvg/index.ts | 0 .../src/layouts/components/IconSvg/index.vue | 0 .../src/layouts/components/IconSvg/plugin.ts | 0 .../src/layouts/components/Lock/index.vue | 0 .../src/layouts/components/Lock/pass.vue | 0 .../src/layouts/components/RightTabNav.vue | 0 .../layouts/components/RightTopMessage.vue | 0 .../src/layouts/components/RightTopUser.vue | 0 .../src/layouts/components/SettingsMobile.vue | 0 .../src/layouts/components/SiderMenu.vue | 0 .../src/layouts/components/SiderMenuItem.vue | 0 .../src/layouts/components/Tabs/index.vue | 0 .../src/layouts/components/search/index.vue | 0 .../layouts/components/selectuser/index.vue | 0 .../selectuser/selectuserDialog.vue | 0 .../src/layouts/components/useTopMenuWidth.ts | 0 .../src/layouts/index.vue | 0 .../y9vue-interfacePlatform}/src/main.ts | 0 .../src/router/checkRole.js | 0 .../src/router/checkRouter-backup.js | 0 .../src/router/checkRouter.js | 0 .../src/router/getInitData.js | 0 .../src/router/index.ts | 0 .../src/router/modules/approveRouter.ts | 0 .../src/router/modules/authInfoRouter.ts | 0 .../src/router/modules/blacklistingRouter.ts | 0 .../src/router/modules/flowInfoRouter.ts | 0 .../src/router/modules/homeRouter.ts | 0 .../src/router/modules/interfaceRegister.ts | 0 .../src/router/modules/interfaceRouter.ts | 0 .../src/router/modules/logMonitoringRouter.ts | 0 .../router/modules/mangeInterfaceRouter.ts | 0 .../router/modules/systemidentifierRouter.ts | 0 .../src/router/modules/testInterfaceRouter.ts | 0 .../y9vue-interfacePlatform}/src/settings.ts | 0 .../src/store/index.ts | 0 .../src/store/modules/routerStore.ts | 0 .../src/store/modules/settingStore.ts | 0 .../src/theme/blue/blue.scss | 0 .../src/theme/dark/dark.scss | 0 .../src/theme/default/default.scss | 0 .../src/theme/global-vars.scss | 0 .../src/theme/global.scss | 0 .../src/theme/green/green.scss | 2 +- .../src/utils/directive.ts | 0 .../src/utils/echarts.ts | 0 .../src/utils/index.ts | 0 .../src/utils/object.ts | 0 .../src/utils/routes.ts | 0 .../src/utils/storage.js | 0 .../src/utils/validate.ts | 0 .../src/utils/watermark.ts | 0 .../src/views/401/index.vue | 0 .../src/views/404/index.vue | 0 .../src/views/approve/applyInfo.vue | 0 .../src/views/approve/approve.vue | 0 .../src/views/approve/authDialog.vue | 0 .../src/views/approve/index.vue | 0 .../src/views/auth/dictVal.vue | 0 .../src/views/auth/index.vue | 0 .../src/views/auth/interfaceAuth.vue | 0 .../src/views/auth/interfaceDictVal.vue | 0 .../src/views/blacklisting/blacklisting.vue | 0 .../src/views/flownode/flow.vue | 0 .../src/views/flownode/flowChart.vue | 0 .../src/views/flownode/flowNode.vue | 0 .../src/views/flownode/flowNodeSort.vue | 0 .../src/views/home/home.vue | 6 +- .../src/views/interface/applyInfo.vue | 0 .../src/views/interface/authApplyInfo.vue | 0 .../src/views/interface/authDialog.vue | 0 .../src/views/interface/flowShow.vue | 0 .../src/views/interface/index.vue | 0 .../views/interface/interfaceApply-back.vue | 0 .../src/views/interface/interfaceApply.vue | 0 .../interface/interfaceApplyDialog-back.vue | 0 .../views/interface/interfaceApplyDialog.vue | 0 .../views/interface/interfaceApplyInfo.vue | 0 .../views/interface/interfaceApplyTable.vue | 0 .../src/views/interface/interfaceDialog.vue | 0 .../interface/interfaceDialogApplyTable.vue | 0 .../interfaceRegister-back-全局加载样式.vue | 0 .../src/views/interface/interfaceRegister.vue | 0 .../views/interface/logMonitoringIndex.vue | 0 .../src/views/interface/pubOrStop.vue | 0 .../src/views/interfaceTest/testDialog.vue | 2 +- .../src/views/parameter/limitinfo.vue | 0 .../src/views/parameter/parameter.vue | 0 .../src/views/parameter/parameterTable.vue | 0 .../src/views/systemidentifier/dictVal.vue | 0 .../src/views/systemidentifier/index.vue | 0 .../y9vue-interfacePlatform}/tsconfig.json | 0 .../y9vue-interfacePlatform}/vite.config.js | 2 +- .../pom.xml | 55 ++++ .../net/risesoft/y9public/dto/ApproveDTO.java | 68 +++++ .../risesoft/y9public/dto/AuthDictDTO.java | 66 ++++ .../y9public/dto/InterfaceApplyDTO.java | 92 ++++++ .../y9public/dto/InterfaceManageDTO.java | 143 +++++++++ .../risesoft/y9public/dto/ParameterDTO.java | 63 ++++ .../risesoft/y9public/dto/ViewApproveDTO.java | 63 ++++ .../net/risesoft/y9public/entity/Approve.java | 108 +++++++ .../risesoft/y9public/entity/AuthDict.java | 101 +++++++ .../risesoft/y9public/entity/BaseEntity.java | 23 +- .../y9public/entity/Blacklisting.java | 55 ++++ .../entity/CallApiRequestLogInfo.java | 4 +- .../y9public/entity/InterfaceApply.java | 141 +++++++++ .../y9public/entity/InterfaceLimitInfo.java | 70 +++++ .../y9public/entity/InterfaceManage.java | 195 ++++++++++++ .../risesoft/y9public/entity/Parameter.java | 96 ++++++ .../y9public/entity/SystemIdentifier.java | 51 ++++ .../risesoft/y9public/entity/ViewApprove.java | 120 ++++++++ .../repository/ApproveRepository.java | 0 .../repository/AuthDictRepository.java | 0 .../repository/BlacklistingRepository.java | 0 .../repository/CallApiLogRepository.java | 1 + .../repository/InterfaceApplyRepository.java | 14 +- .../InterfaceLimitInfoRepository.java | 4 +- .../repository/InterfaceManageRepository.java | 22 +- .../repository/ParameterRepository.java | 7 +- .../SystemIdentifierRepository.java | 8 +- .../repository/ViewApproveRepository.java | 2 +- .../net/risesoft/y9public/vo/ApplyVo.java | 48 +++ .../risesoft/y9public/vo/AuthSelectVo.java | 0 .../net/risesoft/y9public/vo/UserData.java | 11 + .../risesoft/y9public/vo/ViewApproveVo.java | 86 ++++++ .../lombok.config | 0 .../pom.xml | 231 ++++++++++++++ .../risesoft/InterfaceExecuteApplication.java | 16 + .../risesoft/InterfaceServletInitializer.java | 2 +- .../net/risesoft/config/CheckLoginFilter.java | 0 .../java/net/risesoft/config/RestConfig.java | 0 .../net/risesoft/config/WebMvcConfig.java | 0 .../RestInterfaceManageController.java | 40 +++ .../controller/UseInterfaceController.java | 19 +- .../java/net/risesoft/model/ApplyType.java | 29 ++ .../net/risesoft/model/ApproveStatus.java | 34 +++ .../main/java/net/risesoft/model/Effect.java | 29 ++ .../net/risesoft/model/InterfaceStatus.java | 29 ++ .../net/risesoft/model/ParameterType.java | 31 ++ .../net/risesoft/model/ThresholdType.java | 27 ++ .../risesoft/service/UseInterfaceService.java | 15 + .../service/impl/UseInterfaceServiceImpl.java | 281 ++++++++++++++---- .../java/net/risesoft/util/AuthCheckUtil.java | 233 +++++++++++++++ .../java/net/risesoft/util/BizException.java | 2 + .../java/net/risesoft/util/CallLogUtil.java | 68 +---- .../java/net/risesoft/util/JaxRsUtil.java | 70 +++++ .../java/net/risesoft/util/JaxWsUtil.java | 164 ++++++++++ .../java/net/risesoft/util/RedissonUtil.java | 103 +++++++ .../main/java/net/risesoft/util/RestUtil.java | 31 ++ .../risesoft/util/WebServiceForwardUtil.java | 18 +- .../src/main/resources/application.yml | 2 +- .../src/main/resources/banner.txt | 10 +- .../src/main/resources/logback.xml | 4 +- .../lombok.config | 9 + .../pom.xml | 46 ++- ...nterfaceManagementPlatformApplication.java | 4 +- .../risesoft/InterfaceServletInitializer.java | 13 + .../java/net/risesoft/OnApplicationReady.java | 0 .../net/risesoft/config/CheckLoginFilter.java | 32 ++ .../java/net/risesoft/config/RestConfig.java | 50 ++++ .../net/risesoft/config/WebMvcConfig.java | 73 +++++ .../rest/RestApproveController.java | 0 .../controller/rest/RestAuthController.java | 4 +- .../rest/RestBlacklistingController.java | 99 ++++++ .../rest/RestInterfaceApplyController.java | 2 +- .../rest/RestInterfaceManageController.java | 30 +- .../rest/RestStatisticsController.java | 112 +++++++ .../rest/RestSystemIdentifierController.java | 0 .../java/net/risesoft/model/ApplyType.java | 29 ++ .../net/risesoft/model/ApproveStatus.java | 0 .../main/java/net/risesoft/model/Effect.java | 0 .../net/risesoft/model/InterfaceStatus.java | 0 .../net/risesoft/model/ParameterType.java | 31 ++ .../net/risesoft/model/ThresholdType.java | 27 ++ .../net/risesoft/service/ApproveService.java | 14 +- .../net/risesoft/service/AuthDictService.java | 15 +- .../risesoft/service/BlacklistingService.java | 7 +- .../service/InterfaceApplyService.java | 9 +- .../service/InterfaceManageService.java | 2 + .../risesoft/service/ParameterService.java | 5 +- .../risesoft/service/StatisticsService.java | 0 .../service/SystemIdentifierService.java | 7 +- .../service/impl/ApproveServiceImpl.java | 0 .../service/impl/AuthDictServiceImpl.java | 28 +- .../service/impl/BlacklistingServiceImpl.java | 0 .../impl/InterfaceApplyServiceImpl.java | 128 ++++---- .../impl/InterfaceManageServiceImpl.java | 80 ++++- .../service/impl/ParameterServiceImpl.java | 122 ++++---- .../service/impl/StatisticsServiceImpl.java | 104 +++---- .../impl/SystemIdentifierServiceImpl.java | 61 ++-- .../java/net/risesoft/util/BizException.java | 10 + .../java/net/risesoft/util/RedissonUtil.java | 70 ++--- .../src/main/resources/application.yml | 191 ++++++++++++ .../src/main/resources/banner.txt | 6 + .../src/main/resources/logback.xml | 14 + .../src/main/resources/sql/data-mysql.sql | 48 +++ 351 files changed, 4148 insertions(+), 2992 deletions(-) delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestBlacklistingController.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestStatisticsController.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/ApplyType.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/ParameterType.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/ThresholdType.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/UseInterfaceService.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/AuthCheckUtil.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/JaxRsUtil.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/JaxWsUtil.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/RestUtil.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/ApproveDTO.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/AuthDictDTO.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/InterfaceApplyDTO.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/InterfaceManageDTO.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/ParameterDTO.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/ViewApproveDTO.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/Approve.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/AuthDict.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/Blacklisting.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/InterfaceApply.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/InterfaceLimitInfo.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/InterfaceManage.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/Parameter.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/SystemIdentifier.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/ViewApprove.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/vo/ApplyVo.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/vo/ViewApproveVo.java delete mode 100644 risenet-y9boot-webapp-interface-platform/src/main/resources/sql/data-mysql.sql rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/.env.development (99%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/.env.production (95%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/.eslintignore (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/.eslintrc.js (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/.prettierignore (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/README.md (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/components.d.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/index.html (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/package-lock.json (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/package.json (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/prettier.config.js (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/public/yun.ico (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/App.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/api/apply/apply.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/api/approve/approve.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/api/authInterface/authInterface.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/api/blacklisting/blacklisting.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/api/flownode/flownode.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/api/home/home.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/api/interface/interface.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/api/lib/request.js (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/api/lib/requestNode.js (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/api/logMonitoring/logMonitoring.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/api/systemidentifier/systemidentifier.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/api/test/index.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/css/nprogress.css (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/css/tablestatusfontcolor.css (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/font/yjsz.TTF (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/png/cloud.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/png/file.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/png/folder-open.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/png/metro.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/png/node_home.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/png/node_system.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/png/search.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/png/user_female.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/png/user_gray.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/png/user_male.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/ask.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/chart.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/components.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/control.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/editor.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/history.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/home.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/image-text.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/layers.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/message.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/monitoring.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/other.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/page.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/pagedetails.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/pageform.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/pagelist.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/roles.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/s-fold.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/s-unfold.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/set.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/tree.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/users.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/svg/y9-logo.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/treeIcon/chart_organization.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/treeIcon/folder_user.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/treeIcon/group.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/treeIcon/user_female.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/icons/treeIcon/user_male.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/arrow-down.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/arrow-left.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/arrow-left2.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/arrow-right.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/arrow-right2.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/arrow-up.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/bnb-fill.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/chart.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/close.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/close2.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/components.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/control.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/detail.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/edit.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/editor.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/home.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/icon.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/language-outline.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/list.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/menu-fold.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/menu-unfold.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/message.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/more.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/page.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/permissions.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/pwd.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/refresh.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/search.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/set.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/svgo.yml (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/iconsvg/user.svg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/images/app-icon.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/images/bg-smooth.jpg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/images/bg.jpg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/images/logo.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/images/meeting.jpg (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/images/menu-bg1.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/images/menu-bg10.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/images/menu-bg5.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/images/menu-bg7.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/images/menu-bg8.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/images/menu-bg9.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/images/touxiang.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/images/youshengyunLogo.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/images/yun.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/assets/images/yunLogo.png (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/language/en.json (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/language/index.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/language/zh.json (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/Y9-default/Left.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/Y9-default/RightTop.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/Y9-default/index.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/Y9-horizontal/Navs.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/Y9-horizontal/RightTop.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/Y9-horizontal/index.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/Y9-mobile/Left.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/Y9-mobile/RightTop.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/Y9-mobile/index.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/ALink/index.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/BreadCrumbs/index.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/Icon.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/IconSvg/index.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/IconSvg/index.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/IconSvg/plugin.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/Lock/index.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/Lock/pass.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/RightTabNav.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/RightTopMessage.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/RightTopUser.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/SettingsMobile.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/SiderMenu.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/SiderMenuItem.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/Tabs/index.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/search/index.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/selectuser/index.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/selectuser/selectuserDialog.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/components/useTopMenuWidth.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/layouts/index.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/main.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/router/checkRole.js (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/router/checkRouter-backup.js (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/router/checkRouter.js (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/router/getInitData.js (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/router/index.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/router/modules/approveRouter.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/router/modules/authInfoRouter.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/router/modules/blacklistingRouter.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/router/modules/flowInfoRouter.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/router/modules/homeRouter.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/router/modules/interfaceRegister.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/router/modules/interfaceRouter.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/router/modules/logMonitoringRouter.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/router/modules/mangeInterfaceRouter.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/router/modules/systemidentifierRouter.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/router/modules/testInterfaceRouter.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/settings.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/store/index.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/store/modules/routerStore.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/store/modules/settingStore.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/theme/blue/blue.scss (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/theme/dark/dark.scss (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/theme/default/default.scss (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/theme/global-vars.scss (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/theme/global.scss (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/theme/green/green.scss (89%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/utils/directive.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/utils/echarts.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/utils/index.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/utils/object.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/utils/routes.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/utils/storage.js (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/utils/validate.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/utils/watermark.ts (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/401/index.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/404/index.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/approve/applyInfo.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/approve/approve.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/approve/authDialog.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/approve/index.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/auth/dictVal.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/auth/index.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/auth/interfaceAuth.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/auth/interfaceDictVal.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/blacklisting/blacklisting.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/flownode/flow.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/flownode/flowChart.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/flownode/flowNode.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/flownode/flowNodeSort.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/home/home.vue (99%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interface/applyInfo.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interface/authApplyInfo.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interface/authDialog.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interface/flowShow.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interface/index.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interface/interfaceApply-back.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interface/interfaceApply.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interface/interfaceApplyDialog-back.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interface/interfaceApplyDialog.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interface/interfaceApplyInfo.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interface/interfaceApplyTable.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interface/interfaceDialog.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interface/interfaceDialogApplyTable.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interface/interfaceRegister-back-全局加载样式.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interface/interfaceRegister.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interface/logMonitoringIndex.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interface/pubOrStop.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/interfaceTest/testDialog.vue (99%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/parameter/limitinfo.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/parameter/parameter.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/parameter/parameterTable.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/systemidentifier/dictVal.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/src/views/systemidentifier/index.vue (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/tsconfig.json (100%) rename {y9vue-interfacePlatform => vue/y9vue-interfacePlatform}/vite.config.js (98%) create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/pom.xml create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/ApproveDTO.java create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/AuthDictDTO.java create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/InterfaceApplyDTO.java create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/InterfaceManageDTO.java create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/ParameterDTO.java create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/ViewApproveDTO.java create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/Approve.java create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/AuthDict.java rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-support-interface-jpa-repository}/src/main/java/net/risesoft/y9public/entity/BaseEntity.java (93%) create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/Blacklisting.java rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-support-interface-jpa-repository}/src/main/java/net/risesoft/y9public/entity/CallApiRequestLogInfo.java (98%) create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/InterfaceApply.java create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/InterfaceLimitInfo.java create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/InterfaceManage.java create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/Parameter.java create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/SystemIdentifier.java create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/ViewApprove.java rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-support-interface-jpa-repository}/src/main/java/net/risesoft/y9public/repository/ApproveRepository.java (100%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-support-interface-jpa-repository}/src/main/java/net/risesoft/y9public/repository/AuthDictRepository.java (100%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-support-interface-jpa-repository}/src/main/java/net/risesoft/y9public/repository/BlacklistingRepository.java (100%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-support-interface-jpa-repository}/src/main/java/net/risesoft/y9public/repository/CallApiLogRepository.java (96%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-support-interface-jpa-repository}/src/main/java/net/risesoft/y9public/repository/InterfaceApplyRepository.java (57%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-support-interface-jpa-repository}/src/main/java/net/risesoft/y9public/repository/InterfaceLimitInfoRepository.java (95%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-support-interface-jpa-repository}/src/main/java/net/risesoft/y9public/repository/InterfaceManageRepository.java (58%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-support-interface-jpa-repository}/src/main/java/net/risesoft/y9public/repository/ParameterRepository.java (89%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-support-interface-jpa-repository}/src/main/java/net/risesoft/y9public/repository/SystemIdentifierRepository.java (85%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-support-interface-jpa-repository}/src/main/java/net/risesoft/y9public/repository/ViewApproveRepository.java (83%) create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/vo/ApplyVo.java rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-support-interface-jpa-repository}/src/main/java/net/risesoft/y9public/vo/AuthSelectVo.java (100%) create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/vo/UserData.java create mode 100644 y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/vo/ViewApproveVo.java rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-execute}/lombok.config (100%) create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/pom.xml create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/InterfaceExecuteApplication.java rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-execute}/src/main/java/net/risesoft/InterfaceServletInitializer.java (84%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-execute}/src/main/java/net/risesoft/config/CheckLoginFilter.java (100%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-execute}/src/main/java/net/risesoft/config/RestConfig.java (100%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-execute}/src/main/java/net/risesoft/config/WebMvcConfig.java (100%) create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/controller/RestInterfaceManageController.java rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-execute}/src/main/java/net/risesoft/controller/UseInterfaceController.java (64%) create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/ApplyType.java create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/ApproveStatus.java create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/Effect.java create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/InterfaceStatus.java create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/ParameterType.java create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/ThresholdType.java create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/service/UseInterfaceService.java rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-execute}/src/main/java/net/risesoft/service/impl/UseInterfaceServiceImpl.java (72%) create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/AuthCheckUtil.java rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-execute}/src/main/java/net/risesoft/util/BizException.java (82%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-execute}/src/main/java/net/risesoft/util/CallLogUtil.java (74%) create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/JaxRsUtil.java create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/JaxWsUtil.java create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/RedissonUtil.java create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/RestUtil.java rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-execute}/src/main/java/net/risesoft/util/WebServiceForwardUtil.java (60%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-execute}/src/main/resources/application.yml (99%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-execute}/src/main/resources/banner.txt (52%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-execute}/src/main/resources/logback.xml (79%) create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/lombok.config rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/pom.xml (92%) rename risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/InterfacePlatformApplication.java => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/InterfaceManagementPlatformApplication.java (78%) create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/InterfaceServletInitializer.java rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/OnApplicationReady.java (100%) create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/config/CheckLoginFilter.java create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/config/RestConfig.java create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/config/WebMvcConfig.java rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/controller/rest/RestApproveController.java (100%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/controller/rest/RestAuthController.java (98%) create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestBlacklistingController.java rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/controller/rest/RestInterfaceApplyController.java (98%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/controller/rest/RestInterfaceManageController.java (95%) create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestStatisticsController.java rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/controller/rest/RestSystemIdentifierController.java (100%) create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/ApplyType.java rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/model/ApproveStatus.java (100%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/model/Effect.java (100%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/model/InterfaceStatus.java (100%) create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/ParameterType.java create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/ThresholdType.java rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/service/ApproveService.java (73%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/service/AuthDictService.java (65%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/service/BlacklistingService.java (74%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/service/InterfaceApplyService.java (83%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/service/InterfaceManageService.java (97%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/service/ParameterService.java (77%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/service/StatisticsService.java (100%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/service/SystemIdentifierService.java (85%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/service/impl/ApproveServiceImpl.java (100%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/service/impl/AuthDictServiceImpl.java (92%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/service/impl/BlacklistingServiceImpl.java (100%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/service/impl/InterfaceApplyServiceImpl.java (73%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/service/impl/InterfaceManageServiceImpl.java (93%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/service/impl/ParameterServiceImpl.java (61%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/service/impl/StatisticsServiceImpl.java (82%) rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/service/impl/SystemIdentifierServiceImpl.java (71%) create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/util/BizException.java rename {risenet-y9boot-webapp-interface-platform => y9-module-interface/risenet-y9boot-webapp-interface-platform-manager}/src/main/java/net/risesoft/util/RedissonUtil.java (62%) create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/resources/application.yml create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/resources/banner.txt create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/resources/logback.xml create mode 100644 y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/resources/sql/data-mysql.sql diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestBlacklistingController.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestBlacklistingController.java deleted file mode 100644 index a80a1bc..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestBlacklistingController.java +++ /dev/null @@ -1,99 +0,0 @@ -package net.risesoft.controller.rest; - -import net.risesoft.log.OperationTypeEnum; -import net.risesoft.log.annotation.RiseLog; -import net.risesoft.service.BlacklistingService; -import net.risesoft.y9public.entity.Blacklisting; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.util.HashMap; -import java.util.Map; - -/** - * 黑名单录入 - * - * @author duanzhixin - */ -@Controller -@RequestMapping("/api/rest/blacklisting") -public class RestBlacklistingController { - - - @Autowired - private BlacklistingService blacklistingService; - - //获取系统标识列表信息 - @RequestMapping("/getPage") - @ResponseBody - @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "黑名单录入管理-获取黑名单列表信息") - public Map getPage(String name, int page, int limit) { - Blacklisting blacklisting = new Blacklisting(); - blacklisting.setName(name); - Map map = new HashMap<>(); - Page page1 = blacklistingService.getPage(blacklisting, page, limit); - map.put("data", page1.getContent()); - map.put("count", page1.getTotalElements()); - map.put("code", "0"); - return map; - } - - - //保存信息 - @PostMapping("/saveInfo") - @ResponseBody - @RiseLog(operationType = OperationTypeEnum.ADD, operationName = "黑名单录入管理-保存黑名单信息") - public Map saveInterfaceInfo(Blacklisting blacklisting) { - Map map = new HashMap<>(); - Map dataMap = blacklistingService.saveInfo(blacklisting); - map.putAll(dataMap); - map.put("code", "0"); - return map; - } - - //根据id获取信息 - @RequestMapping("/getInfoById") - @ResponseBody - @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "黑名单录入管理-获取黑名单详细信息") - public Map getAuthInfoById(String id) { - Map map = new HashMap<>(); - Blacklisting identifier = blacklistingService.getInfoById(id); - map.put("data", identifier); - map.put("code", "0"); - return map; - } - - //根据id删除黑名单信息 - @RequestMapping("/delInfoById") - @ResponseBody - @RiseLog(operationType = OperationTypeEnum.DELETE, operationName = "系统标识管理-删除系统标识信息") - public Map delAuthInfoById(String id) { - Map map = new HashMap<>(); - Map isOk = blacklistingService.delInfo(id); - map.putAll(isOk); - map.put("code", "0"); - return map; - } - - //修改黑名单启停用 - @PostMapping("/updateEnable") - @ResponseBody - @RiseLog(operationType = OperationTypeEnum.MODIFY, operationName = "流程管理-修改流程启用停用状态") - public Map updateEnable(Blacklisting blacklisting) { - Map map = new HashMap<>(); - Map dataMap = blacklistingService.updateEnable(blacklisting); - if ((boolean) dataMap.get("status")) { - map.put("status", "success"); - } else { - map.put("status", "err"); - map.put("msg", dataMap.get("msg")); - } - map.put("code", "0"); - return map; - } - -} diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestStatisticsController.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestStatisticsController.java deleted file mode 100644 index 001492d..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestStatisticsController.java +++ /dev/null @@ -1,120 +0,0 @@ -package net.risesoft.controller.rest; - -import net.risesoft.log.OperationTypeEnum; -import net.risesoft.log.annotation.RiseLog; -import net.risesoft.service.StatisticsService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.HashMap; -import java.util.Map; - -/** - * @author : lxd - * @description : 用于统计首页可视化的统计数据 - * @createDate : 2024/10/30 14:48 - */ -@RestController -@RequestMapping("/api/rest/statistics") -public class RestStatisticsController { - @Autowired - private StatisticsService statisticsService; - - /** - * 接口概况：注册数、发布数、停用数 - * - * @return - */ - @GetMapping("/interfaceOverview") - @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "获取接口概况：注册数、发布数、停用数") - public Map getInterfaceOverview() { - return statisticsService.getInterfaceOverview(); - } - - /** - * 获取接口运行正常、异常数 - * - * @return - */ - @GetMapping("/runningCount") - @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "获取接口运行正常、异常数") - public Map getRunningCount() { - return statisticsService.getRunningCount(); - } - - /** - * 接口调用趋势图 - * - * @param type 当天、近一周、近一月、近一年 - * @return - */ - @GetMapping("/trend") - @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "获取接口调用趋势图") - public Map getCallTrend(String type) { - return statisticsService.getCallTrend(type); - } - - /** - * 日志概况 : 总调用量、今日调用量、总异常量、今日异常量 - * - * @return - */ - @GetMapping("/logOverview") - @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "获取日志概况统计数：总调用量、今日调用量、总异常量、今日异常量") - public Map getLogOverview() { - return statisticsService.getLogOverview(); - } - - /** - * 异常情况列表 - * - * @param page 页码 - * @param limit 每页大小 - * @return - */ - @GetMapping("/exception") - @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "获取接口调用异常情况列表") - public Map getException(int page, int limit) { - return statisticsService.getException(page, limit); - } - - /** - * 接口日志情况列表 - * - * @param conditionMap 筛选条件 - * @return - */ - @PostMapping("/logMonitoring") - @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "获取接口调用日志情况列表") - public Map getLogMonitoringInfo(@RequestBody Map conditionMap) { - if (conditionMap == null) { - Map res = new HashMap(); - res.put("code", "1"); - return res; - } - return statisticsService.getLogMonitoringInfo(conditionMap); - } - - /** - * 获取接口日志检索选项值 - * - * @return - */ - @GetMapping("/logMonitoring/options") - public Map getLogMonitoringOptions() { - return statisticsService.getLogMonitoringOptions(); - } - - /** - * 接口实时日志播报 - * - * @param page 页码 - * @param limit 每页大小 - * @return - */ - @GetMapping("/realTimeLog") - @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "接口实时日志播报") - public Map getRealTimeLog(int page, int limit) { - return statisticsService.getRealTimeLog(page, limit); - } -} diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/ApplyType.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/ApplyType.java deleted file mode 100644 index c89724c..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/ApplyType.java +++ /dev/null @@ -1,29 +0,0 @@ -package net.risesoft.model; - -/** - * 申请类型枚举类 - */ -public enum ApplyType { - //接口调用申请 - INVOKE("0", "调用"), - //接口停用申请 - PUB_INTERFACE("2", "发布"), - //接口发布申请 - STOP_INTERFACE("1", "停用"); - - private final String enName; - private final String name; - - private ApplyType(String enName, String name) { - this.enName = enName; - this.name = name; - } - - public String getEnName() { - return enName; - } - - public String getName() { - return name; - } -} \ No newline at end of file diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/ParameterType.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/ParameterType.java deleted file mode 100644 index 1b83570..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/ParameterType.java +++ /dev/null @@ -1,31 +0,0 @@ -package net.risesoft.model; - -/** - * 数据类型枚举类 - */ -public enum ParameterType { - //INT类型 - INTEGER("integer", "integer"), - //BOOLEAN - BOOLEAN("boolean", "boolean"), - //INT类型 - STRING("String", "String"), - //DOUBLE - DOUBLE("double", "double"); - - private final String enName; - private final String name; - - private ParameterType(String enName, String name) { - this.enName = enName; - this.name = name; - } - - public String getEnName() { - return enName; - } - - public String getName() { - return name; - } -} \ No newline at end of file diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/ThresholdType.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/ThresholdType.java deleted file mode 100644 index 6e3f9be..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/ThresholdType.java +++ /dev/null @@ -1,27 +0,0 @@ -package net.risesoft.model; - -/** - * 限流类型枚举类 - */ -public enum ThresholdType { - //自定义 - TYPE_ZDY("0", "自定义"), - //QPS - QPS("1", "QPS"); - - private final String enName; - private final String name; - - private ThresholdType(String enName, String name) { - this.enName = enName; - this.name = name; - } - - public String getEnName() { - return enName; - } - - public String getName() { - return name; - } -} \ No newline at end of file diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/UseInterfaceService.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/UseInterfaceService.java deleted file mode 100644 index 14061d7..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/UseInterfaceService.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.risesoft.service; - -import net.risesoft.y9public.dto.InterfaceManageDTO; - -import javax.servlet.http.HttpServletRequest; -import java.util.Map; - -public interface UseInterfaceService { - //接口转发 - Map forward(String id, HttpServletRequest request); - - //接口测试 - Map testForward(InterfaceManageDTO interfaceManageDTO, HttpServletRequest request); -} diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/AuthCheckUtil.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/AuthCheckUtil.java deleted file mode 100644 index f88ee06..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/AuthCheckUtil.java +++ /dev/null @@ -1,252 +0,0 @@ -package net.risesoft.util; - -import cn.hutool.crypto.digest.DigestAlgorithm; -import cn.hutool.crypto.digest.Digester; -import com.alibaba.fastjson.JSONArray; -import net.risesoft.y9public.entity.InterfaceApply; -import net.risesoft.y9public.entity.InterfaceManage; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Component; - -import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.regex.Pattern; - -import static net.risesoft.service.impl.UseInterfaceServiceImpl.regx; - -@Component -public class AuthCheckUtil { - - //sql注入正则 - private static String badStrReg = "\\b(and|or)\\b.{1,6}?(=|>|<|\\bin\\b|\\blike\\b)|\\/\\*.+?\\*\\/|<\\s*script\\b|" + - "\\bEXEC\\b|UNION.+?SELECT|UPDATE.+?SET|INSERT\\s+INFO.+?VALUES|(SELECT|DELETE).+?FROM|(CREATE|ALTER|DROP|TRUNCATE)\\s+(TABLE|DATABASE)"; - - //xss脚本正则 - private final static Pattern[] scriptPatterns = { - Pattern.compile("", Pattern.CASE_INSENSITIVE), - Pattern.compile("src[\r\n]*=[\r\n]*\\\'(.*?)\\\'", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL), - Pattern.compile("", Pattern.CASE_INSENSITIVE), - Pattern.compile("", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL), - Pattern.compile("eval\\((.*?)\\)", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL), - Pattern.compile("expression\\((.*?)\\)", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL), - Pattern.compile("javascript:", Pattern.CASE_INSENSITIVE), - Pattern.compile("vbscript:", Pattern.CASE_INSENSITIVE), - Pattern.compile("onload(.*?)=", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL) - }; - - public static String getIp(HttpServletRequest request) { - String ip = request.getHeader("X-Real-IP"); - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("X-Forwarded-For"); - } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("Proxy-Client-Ip"); - } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("WL-Proxy-Client-Ip"); - } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getRemoteAddr(); - } - return ip; - } - - /** - * 过滤sql注入 - * - * @param src 单个参数值 - */ - public String checkSQLInject(String src, String key) { - if (StringUtils.isBlank(src)) { - return src; - } - - //非法sql注入正则 - Pattern sqlPattern = Pattern.compile(badStrReg, Pattern.CASE_INSENSITIVE); - if (sqlPattern.matcher(src.toLowerCase()).find()) { - throw new BizException("sql注入检查，参数" + key + "含有非法攻击字符，请检查"); - } - return src; - } - - /** - * 清除xss - * - * @param src 单个参数值 - */ - public String checkXSS(String src, String key) { - if (StringUtils.isBlank(src)) { - return src; - } - String temp = src; - for (Pattern pattern : scriptPatterns) { - temp = pattern.matcher(temp).replaceAll(""); - } - temp = temp.replaceAll("<", "<").replaceAll(">", ">"); - if (!temp.equals(src)) { - throw new BizException("xss攻击检查，参数" + key + "含有非法攻击字符"); - } - return src; - } - - /** - * 参数类型校验 - * - * @param parameter 参数值 - * @param type 参数类型 - */ - private Boolean checkParameterType(String parameter, String type) { - switch (type) { - case "String": - return true; - case "integer": - String regx = "\\d+"; - if (Pattern.matches(regx, parameter)) { - try { - int num = Integer.parseInt(parameter); - return true; - } catch (NumberFormatException e) { - return false; - } - } else { - return false; - } - case "boolean": - if ("true".equals(parameter.toLowerCase()) || "false".equals(parameter.toLowerCase())) { - return true; - } else { - return false; - } - case "number": - if (StringUtils.isNumeric(parameter)) { - return true; - } else { - return false; - } - default: - return false; - } - } - - //数据基础校验 - public Boolean checkData(String val, String key, String type, List errList) { - int len = errList.size(); - try { - //检查xss攻击和sql注入 - checkXSS(checkSQLInject(val, key), key); - //类型校验 - if (StringUtils.isNotBlank(val)) { - if (!checkParameterType(val, type)) { - errList.add("参数类型检查，参数：" + key + "数据类型不正确，不是" + type); - } - } - } catch (BizException e) { - errList.add(e.getMessage()); - } - if (errList.size() == len) { - return false; - } else { - return true; - } - } - - //权限校验 - public Boolean checkAki(HttpServletRequest request, Map querymap, InterfaceManage interfaceManage, InterfaceApply apply, Map resultmap, Map valMap) { - - String accessKey = request.getHeader("userKey"); - - if (apply == null) { - resultmap.put("status", 401); - resultmap.put("msg", "无权限访问该接口,非法调用者或您的唯一标识不正确"); - return false; - } - List ipList = Arrays.asList(apply.getIpWhitelist().split(",")); - if (!ipList.contains(getIp(request))) { - resultmap.put("status", 401); - resultmap.put("msg", "无权限访问该接口,未开通此ip"); - return false; - } - - //检测参数范围是否正确 - if ("是".equals(interfaceManage.getIsLimitData())) { - List booleanList = new ArrayList<>(); - if (StringUtils.isNotBlank(apply.getAuth())) { - Map authMap = JSONArray.parseObject(apply.getAuth(), Map.class); - for (String key : authMap.keySet()) { - booleanList.add(checkParameter(valMap.get(key), authMap.get(key), regx)); - } - } - if (booleanList.contains(false)) { - resultmap.put("status", 401); - resultmap.put("msg", "无权限访问该接口,参数超出范围"); - return false; - } - } - - if ("是".equals(interfaceManage.getIsAuth())) { - if (querymap.get("userGetSign") != null) { - String userGetSign = querymap.get("userGetSign").toString(); - querymap.remove("userGetSign"); - - String sign2 = getSign(querymap, apply.getUserSecret()); - - if (!sign2.equals(userGetSign)) { - resultmap.put("status", 401); - resultmap.put("msg", "无权限访问该接口,秘钥错误"); - return false; - } - } else { - resultmap.put("status", 401); - resultmap.put("msg", "无权限访问该接口,未带权限校验值"); - return false; - } - } - - return true; - } - - /** - * 校验权限范围值 - */ - private Boolean checkParameter(Object obj, String parameterRange, String regx) { - if (obj == null) { - return true; - } - String parameter = obj.toString(); - if (StringUtils.isBlank(parameter) && StringUtils.isBlank(parameterRange)) { - return true; - } - if (StringUtils.isBlank(parameterRange)) { - return false; - } - if (StringUtils.isBlank(parameter)) { - return true; - } - String[] parameters = parameter.split(regx); - String val = "," + parameterRange + ","; - for (String str : parameters) { - if (StringUtils.isNotBlank(str)) { - if (val.indexOf("," + str + ",") == -1) { - return false; - } - } - } - return true; - } - - /** - * 获取sign值 - * - * @param map - * @param secretKry - * @return - */ - private static String getSign(Map map, String secretKry) { - Digester md5 = new Digester(DigestAlgorithm.SHA256); - String content = map.toString() + "." + secretKry; - return md5.digestHex(content); - } -} diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/JaxRsUtil.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/JaxRsUtil.java deleted file mode 100644 index 66fbf7a..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/JaxRsUtil.java +++ /dev/null @@ -1,72 +0,0 @@ -package net.risesoft.util; - -import net.risesoft.y9public.entity.InterfaceManage; -import org.springframework.stereotype.Component; - -import javax.ws.rs.client.*; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Component -public class JaxRsUtil { - public Map JaxRsForward(InterfaceManage interfaceManage, List> list, Map headers) { - Map map = new HashMap<>(); - try { - Client client = ClientBuilder.newClient(); - String url = interfaceManage.getNetworkAgreement() + "://" + interfaceManage.getInterfaceUrl(); - WebTarget target; - if (url.indexOf("/{") != -1 && url.indexOf("}") != -1) { - //替换restful风格url - - for (Map map1 : list) { - for (String key : map1.keySet()) { - url.replace("{" + key + "}", map1.get(key)); - - } - } - target = client.target(url); - } else { - target = client.target(url); - for (Map map1 : list) { - for (String key : map1.keySet()) { - target = target.queryParam(key, map1.get(key)); - } - } - } - Invocation.Builder builder = target.request(); - if (headers.size() != 0) { - for (String key : headers.keySet()) { - builder = builder.header(key, headers.get(key)); - } - } - if ("get".equals(interfaceManage.getInterfaceMethod())) { - Response response = builder.get(); - if (response.getStatus() != 200) { - map.put("status", false); - } else { - map.put("status", true); - } - map.put("code", response.getStatus()); - map.put("data", response.readEntity(String.class)); - } else if ("post".equals(interfaceManage.getInterfaceMethod())) { - Response response = builder.post(Entity.entity("param", MediaType.TEXT_PLAIN_TYPE)); - if (response.getStatus() != 200) { - map.put("status", false); - } else { - map.put("status", true); - } - map.put("code", response.getStatus()); - map.put("data", response.readEntity(String.class)); - } - } catch (Exception e) { - map.put("status", false); - map.put("msg", e.getMessage()); - } - - return map; - } - -} diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/JaxWsUtil.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/JaxWsUtil.java deleted file mode 100644 index 7612ff2..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/JaxWsUtil.java +++ /dev/null @@ -1,164 +0,0 @@ -package net.risesoft.util; - -import net.risesoft.y9public.entity.InterfaceManage; -import org.apache.commons.lang3.StringUtils; -import org.apache.cxf.endpoint.Client; -import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory; -import org.apache.cxf.transport.http.HTTPConduit; -import org.apache.cxf.transports.http.configuration.HTTPClientPolicy; -import org.springframework.stereotype.Component; - -import javax.xml.namespace.QName; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Component -public class JaxWsUtil { - public Map JaxWsForward(InterfaceManage interfaceManage, List list) { - Map map = new HashMap<>(); - try { - JaxWsDynamicClientFactory clientFactory = JaxWsDynamicClientFactory.newInstance(); - Client client = clientFactory.createClient(interfaceManage.getNetworkAgreement() + "://" + interfaceManage.getInterfaceUrl()); - HTTPConduit conduit = (HTTPConduit) client.getConduit(); - HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy(); - httpClientPolicy.setConnectionTimeout(6000000); - httpClientPolicy.setReceiveTimeout(6000000); - conduit.setClient(httpClientPolicy); - Object[] objects = new Object[0]; - if (StringUtils.isNotBlank(interfaceManage.getNameSpace())) { - QName operationName = new QName(interfaceManage.getNameSpace(), interfaceManage.getMethod()); - objects = getData(client, operationName, list); - } else { - QName operationName = new QName(interfaceManage.getMethod()); - objects = getData(client, operationName, list); - } - if (objects != null) { - map.put("status", true); - map.put("data", objects[0]); - } else { - map.put("status", false); - } - } catch (Exception e) { - map.put("status", false); - map.put("msg", "对方系统请求失败！"); - e.printStackTrace(); - } - return map; - } - - private Object[] getData(Client client, QName operationName, List list) throws Exception { - switch (list.size()) { - case 1: - return client.invoke(operationName, list.get(0)); - case 2: - return client.invoke(operationName, list.get(0), list.get(1)); - case 3: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2)); - case 4: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3)); - case 5: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4)); - case 6: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4), list.get(5)); - case 7: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4), list.get(5), list.get(6)); - case 8: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4), list.get(5), list.get(6), list.get(7)); - case 9: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4), list.get(5), list.get(6), list.get(7), list.get(8)); - case 10: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9)); - case 11: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10)); - case 12: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11)); - case 13: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12)); - case 14: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12) - , list.get(13)); - case 15: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12) - , list.get(13), list.get(14)); - case 16: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12) - , list.get(13), list.get(14), list.get(15)); - case 17: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12) - , list.get(13), list.get(14), list.get(15), list.get(16)); - case 18: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12) - , list.get(13), list.get(14), list.get(15), list.get(16), list.get(17)); - case 19: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12) - , list.get(13), list.get(14), list.get(15), list.get(16), list.get(17), list.get(18)); - case 20: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12) - , list.get(13), list.get(14), list.get(15), list.get(16), list.get(17), list.get(18), list.get(19)); - case 21: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12) - , list.get(13), list.get(14), list.get(15), list.get(16), list.get(17), list.get(18), list.get(19), list.get(20)); - case 22: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12) - , list.get(13), list.get(14), list.get(15), list.get(16), list.get(17), list.get(18), list.get(19), list.get(20) - , list.get(21)); - case 23: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12) - , list.get(13), list.get(14), list.get(15), list.get(16), list.get(17), list.get(18), list.get(19), list.get(20) - , list.get(21), list.get(22)); - case 24: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12) - , list.get(13), list.get(14), list.get(15), list.get(16), list.get(17), list.get(18), list.get(19), list.get(20) - , list.get(21), list.get(22), list.get(23)); - case 25: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12) - , list.get(13), list.get(14), list.get(15), list.get(16), list.get(17), list.get(18), list.get(19), list.get(20) - , list.get(21), list.get(22), list.get(23), list.get(24)); - case 26: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12) - , list.get(13), list.get(14), list.get(15), list.get(16), list.get(17), list.get(18), list.get(19), list.get(20) - , list.get(21), list.get(22), list.get(23), list.get(24), list.get(25)); - case 27: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12) - , list.get(13), list.get(14), list.get(15), list.get(16), list.get(17), list.get(18), list.get(19), list.get(20) - , list.get(21), list.get(22), list.get(23), list.get(24), list.get(25), list.get(26)); - case 28: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12) - , list.get(13), list.get(14), list.get(15), list.get(16), list.get(17), list.get(18), list.get(19), list.get(20) - , list.get(21), list.get(22), list.get(23), list.get(24), list.get(25), list.get(26), list.get(27)); - case 29: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12) - , list.get(13), list.get(14), list.get(15), list.get(16), list.get(17), list.get(18), list.get(19), list.get(20) - , list.get(21), list.get(22), list.get(23), list.get(24), list.get(25), list.get(26), list.get(27), list.get(28)); - case 30: - return client.invoke(operationName, list.get(0), list.get(1), list.get(2), list.get(3), list.get(4) - , list.get(5), list.get(6), list.get(7), list.get(8), list.get(9), list.get(10), list.get(11), list.get(12) - , list.get(13), list.get(14), list.get(15), list.get(16), list.get(17), list.get(18), list.get(19), list.get(20) - , list.get(21), list.get(22), list.get(23), list.get(24), list.get(25), list.get(26), list.get(27), list.get(28) - , list.get(29)); - default: - return null; - } - } -} diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/RestUtil.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/RestUtil.java deleted file mode 100644 index 4c5db08..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/RestUtil.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.risesoft.util; - -import org.springframework.http.client.SimpleClientHttpRequestFactory; -import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; - - -@Component -public class RestUtil { - /** - * @param connectTimeout 连接服务器超时时间 - * @param readTimeout 读取数据超时时间 - * @return - */ - public RestTemplate restTemplate(int connectTimeout, int readTimeout) { - SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory(); - requestFactory.setConnectTimeout(connectTimeout); - requestFactory.setReadTimeout(readTimeout); - return new RestTemplate(requestFactory); - } -} diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/ApproveDTO.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/ApproveDTO.java deleted file mode 100644 index e6fd229..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/ApproveDTO.java +++ /dev/null @@ -1,69 +0,0 @@ -package net.risesoft.y9public.dto; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import net.risesoft.y9public.entity.Approve; -import net.risesoft.y9public.entity.BaseEntity; - -import java.io.Serializable; - -@Data -@NoArgsConstructor -public class ApproveDTO extends BaseEntity implements Serializable { - - private static final long serialVersionUID = 3121652146259274217L; - - private String id; - - private String interfaceId; - - private String applyId; - - private String illustrate; - - private String approveStatus; - - private String notes; - - private String personName; - - private String personId; - - private String interfaceStatus; - - private String isOver; - - private String isNew; - - private String interfaceName; - - private String version; - - private String approveOption; - - private String flowNode; - - private String alreadyApproveUser; - - private String currentUserId; - - private String currentNode; - - public ApproveDTO(Approve dto) { - this.id = dto.getId(); - this.interfaceId = dto.getInterfaceId(); - this.illustrate = dto.getIllustrate(); - this.approveStatus = dto.getApproveStatus(); - this.notes = dto.getNotes(); - this.personName = dto.getPersonName(); - this.personId = dto.getPersonId(); - this.interfaceStatus = dto.getInterfaceStatus(); - this.isOver = dto.getIsOver(); - this.flowNode = dto.getFlowNode(); - this.alreadyApproveUser = dto.getAlreadyApproveUser(); - this.currentUserId = dto.getCurrentUserId(); - this.currentNode = dto.getCurrentNode(); - } -} - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/AuthDictDTO.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/AuthDictDTO.java deleted file mode 100644 index 3702954..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/AuthDictDTO.java +++ /dev/null @@ -1,68 +0,0 @@ -package net.risesoft.y9public.dto; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import net.risesoft.y9public.entity.AuthDict; -import net.risesoft.y9public.entity.BaseEntity; - - -import java.io.Serializable; - -@Data -@NoArgsConstructor -public class AuthDictDTO extends BaseEntity implements Serializable { - - private static final long serialVersionUID = 3121642144259272227L; - - private String id; - - private String interfaceId; - - private String parameterName; - - private String fieldName; - - private String fieldVal; - - private String showVal; - - private String parameterType; - - private String parameterId; - - private String isDelete; - - private String pid; - - private Integer sort; - - private String isTree; - - private String isPrimary; - - private String personId; - - private String personName; - - private Boolean hasChildren; - - public AuthDictDTO(AuthDict dto) { - this.id = dto.getId(); - this.interfaceId = dto.getInterfaceId(); - this.parameterName = dto.getParameterName(); - this.fieldName = dto.getFieldName(); - this.fieldVal = dto.getFieldVal(); - this.showVal = dto.getShowVal(); - this.parameterType = dto.getParameterType(); - this.parameterId = dto.getParameterId(); - this.isDelete = dto.getIsDelete(); - this.pid = dto.getPid(); - this.sort = dto.getSort(); - this.isTree = dto.getIsTree(); - this.isPrimary = dto.getIsPrimary(); - this.personId = dto.getPersonId(); - this.personName = dto.getPersonName(); - } -} - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/InterfaceApplyDTO.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/InterfaceApplyDTO.java deleted file mode 100644 index ea265d4..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/InterfaceApplyDTO.java +++ /dev/null @@ -1,94 +0,0 @@ -package net.risesoft.y9public.dto; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import net.risesoft.y9public.entity.InterfaceApply; - - -import java.io.Serializable; - -@Data -@NoArgsConstructor -public class InterfaceApplyDTO implements Serializable { - - private static final long serialVersionUID = 3121642146259274227L; - - private String id; - - private String interfaceId; - - private String applyPersonName; - - private String applyPersonId; - - private String systemIdentifier; - - private String applySystemName; - - private String auth; - - private String applyPersonDeptName; - - private String applyPersonDeptId; - - private String usePersonResponsible; - - private String usePersonResponsiblePhone; - - private String notes; - - private String applyTime; - - private String applyReason; - - private String applyType; - - private String userKey; - - private String userSecret; - - private String ipWhitelist; - - private String applyStopTime; - - private String oldId; - - private String sameId; - - private String dataType; - - private String isEffective; - - private String flowId; - - private String userData; - - - public InterfaceApplyDTO(InterfaceApply dto) { - this.id = dto.getId(); - this.interfaceId = dto.getInterfaceId(); - this.applyPersonName = dto.getApplyPersonName(); - this.applyPersonId = dto.getApplyPersonId(); - this.systemIdentifier = dto.getSystemIdentifier(); - this.auth = dto.getAuth(); - this.applyPersonDeptName = dto.getApplyPersonDeptName(); - this.usePersonResponsible = dto.getUsePersonResponsible(); - this.usePersonResponsiblePhone = dto.getUsePersonResponsiblePhone(); - this.notes = dto.getNotes(); - this.applyTime = dto.getApplyTime(); - this.applyReason = dto.getApplyReason(); - this.applyType = dto.getApplyType(); - this.userKey = dto.getUserKey(); - this.userSecret = dto.getUserSecret(); - this.ipWhitelist = dto.getIpWhitelist(); - this.applyStopTime = dto.getApplyStopTime(); - this.oldId = dto.getOldId(); - this.sameId = dto.getSameId(); - this.dataType = dto.getDataType(); - this.isEffective = dto.getIsEffective(); - this.applySystemName = dto.getApplySystemName(); - this.applyPersonDeptId = dto.getApplyPersonDeptId(); - } -} - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/InterfaceManageDTO.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/InterfaceManageDTO.java deleted file mode 100644 index e7cc17c..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/InterfaceManageDTO.java +++ /dev/null @@ -1,140 +0,0 @@ -package net.risesoft.y9public.dto; - -import lombok.Data; -import lombok.NoArgsConstructor; -import net.risesoft.y9public.entity.BaseEntity; -import net.risesoft.y9public.entity.InterfaceLimitInfo; -import net.risesoft.y9public.entity.InterfaceManage; -import net.risesoft.y9public.entity.Parameter; - -import java.io.Serializable; -import java.util.List; - -@Data -@NoArgsConstructor -public class InterfaceManageDTO extends BaseEntity implements Serializable { - - private static final long serialVersionUID = 3226632145259274287L; - - - private String id; - - private String interfaceName; - - private String sameInterfaceId; - - private String interfaceUrl; - - private String parameterIds; - - private String isAuth; - - private String isLimit; - - private String isBack; - - private String illustrate; - - private String interfaceType; - - private String interfaceStatus; - - private String interfaceMethod; - - private String version; - - private String notes; - - private String personName; - - private String personId; - - private String deptInfo; - - private String deptId; - - private String systemName; - - private String systemId; - - private String head; - - private String isOverwrite; - - private String interfaceFileUrl; - - private String interfaceFileName; - - private String isDelete; - - private String isTest; - - private String networkAgreement; - - private String headPhone; - - private String overwriteInterfaceId; - - private String nameSpace; - - private String method; - - private String webSpecification; - - private Integer page; - - private Integer limit; - - private String parameters; - - private String resParameters; - - private String reqParameters; - - private String limitInfo; - - private String approveStatus; - - private String mayApply; - - private String isLimitData; - - private List parameterList; - - private InterfaceLimitInfo limitInfoEntity; - - public InterfaceManageDTO(InterfaceManage dto) { - this.id = dto.getId(); - this.interfaceName = dto.getInterfaceName(); - this.sameInterfaceId = dto.getSameInterfaceId(); - this.interfaceUrl = dto.getInterfaceUrl(); - this.parameterIds = dto.getParameterIds(); - this.isAuth = dto.getIsAuth(); - this.isLimit = dto.getIsLimit(); - this.illustrate = dto.getIllustrate(); - this.interfaceType = dto.getInterfaceType(); - this.interfaceStatus = dto.getInterfaceStatus(); - this.interfaceMethod = dto.getInterfaceMethod(); - this.version = dto.getVersion(); - this.notes = dto.getNotes(); - this.personName = dto.getPersonName(); - this.personId = dto.getPersonId(); - this.deptInfo = dto.getDeptInfo(); - this.head = dto.getHead(); - this.isOverwrite = dto.getIsOverwrite(); - this.interfaceFileUrl = dto.getInterfaceFileUrl(); - this.isDelete = dto.getIsDelete(); - this.isTest = dto.getIsTest(); - this.networkAgreement = dto.getNetworkAgreement(); - this.headPhone = dto.getHeadPhone(); - this.overwriteInterfaceId = dto.getOverwriteInterfaceId(); - this.nameSpace = dto.getNameSpace(); - this.method = dto.getMethod(); - this.webSpecification = dto.getWebSpecification(); - this.isLimitData = dto.getIsLimitData(); - this.deptId = dto.getDeptId(); - this.systemId = dto.getSystemId(); - this.systemName = dto.getSystemName(); - } -} - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/ParameterDTO.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/ParameterDTO.java deleted file mode 100644 index 2dab959..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/ParameterDTO.java +++ /dev/null @@ -1,63 +0,0 @@ -package net.risesoft.y9public.dto; - -import lombok.Data; -import lombok.NoArgsConstructor; -import net.risesoft.y9public.entity.Parameter; - -import java.io.Serializable; -import java.util.List; - -@Data -@NoArgsConstructor -public class ParameterDTO implements Serializable { - - private static final long serialVersionUID = 3821646146259274267L; - - private String id; - - private String interfaceId; - - private String parameterKey; - - private String val; - - private String defaultVal; - - private String parameterType; - - private String required; - - private String notes; - - private String personId; - - private String parameterStatus; - - private String pid; - - private Integer level; - - private Integer sort; - - private String isItems; - - private List children; - - public ParameterDTO(Parameter dto) { - this.id = dto.getId(); - this.interfaceId = dto.getInterfaceId(); - this.parameterKey = dto.getParameterKey(); - this.val = dto.getVal(); - this.defaultVal = dto.getDefaultVal(); - this.parameterType = dto.getParameterType(); - this.required = dto.getRequired(); - this.notes = dto.getNotes(); - this.personId = dto.getPersonId(); - this.parameterStatus = dto.getParameterStatus(); - this.pid = dto.getPid(); - this.level = dto.getLevel(); - this.isItems = dto.getIsItems(); - this.sort = dto.getSort(); - } -} - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/ViewApproveDTO.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/ViewApproveDTO.java deleted file mode 100644 index f539f57..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/dto/ViewApproveDTO.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.risesoft.y9public.dto; - - -import lombok.Data; -import lombok.NoArgsConstructor; - - -import java.io.Serializable; -import java.util.Date; - -@Data -@NoArgsConstructor -public class ViewApproveDTO implements Serializable { - - private static final long serialVersionUID = 3121642145259274427L; - - - private String approveId; - - private String interfaceId; - - private String applyId; - - private String approveStatus; - - private String illustrate; - - private String applyType; - - private String notes; - - private String isOver; - - private String approveInterfaceStatus; - - private String approvePersonName; - - private String approvePersonId; - - private String applyPersonName; - - private String applyPersonId; - - private String interfaceName; - - private String interfaceStatus; - - private String version; - - private Integer page; - - private Integer limit; - private String statusSort; - - private Date createTime; - private Date applyTime; - - private String statusRole; - private String alreadyApproveUser; - private String currentUserId; - private String startDate; - private String endDate; -} - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/Approve.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/Approve.java deleted file mode 100644 index 9042d50..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/Approve.java +++ /dev/null @@ -1,108 +0,0 @@ -package net.risesoft.y9public.entity; - -import lombok.Data; -import lombok.NoArgsConstructor; -import net.risesoft.y9public.dto.ApproveDTO; -import org.hibernate.annotations.Comment; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import java.io.Serializable; - -@Data -@NoArgsConstructor -@Entity -@Table(name = "Y9_INTERFACE_APPROVE") -@org.hibernate.annotations.Table(comment = "接口审批表", appliesTo = "Y9_INTERFACE_APPROVE") -public class Approve extends BaseEntity implements Serializable { - - private static final long serialVersionUID = 3121642146259274227L; - - @Id - @Column(name = "ID", columnDefinition = "varchar(36) default '' comment 'ID'") - private String id; - - @Column(name = "INTERFACE_ID", columnDefinition = "varchar(36) default '' comment '接口id'") - @Comment(value = "接口ID") - private String interfaceId; - - @Column(name = "APPLY_ID", columnDefinition = "varchar(36) default '' comment '申请ID'") - @Comment(value = "申请ID") - private String applyId; - - @Column(name = "PERSON_NAME", columnDefinition = "varchar(1000) default '' comment '审批人'") - @Comment(value = "审批人") - private String personName; - - @Column(name = "PERSON_ID", columnDefinition = "varchar(1000) default '' comment '审批人ID'") - @Comment(value = "审批人ID") - private String personId; - - @Column(name = "ILLUSTRATE", columnDefinition = "varchar(4000) default '' comment '审批说明'") - @Comment(value = "审批说明") - private String illustrate; - - @Column(name = "APPROVE_STATUS", columnDefinition = "varchar(100) default '' comment '审批意见'") - @Comment(value = "审批意见") - private String approveStatus; - - @Column(name = "NOTES", columnDefinition = "varchar(2000) default '' comment '备注'") - @Comment(value = "备注") - private String notes; - - @Column(name = "INTERFACE_STATUS", columnDefinition = "varchar(10) default '' comment '接口状态'") - @Comment(value = "接口状态") - private String interfaceStatus; - - @Column(name = "IS_OVER", columnDefinition = "varchar(10) default '' comment '是否结束(Y结束，N未结束)'") - @Comment(value = "是否结束") - private String isOver; - - @Column(name = "APPLY_TYPE", columnDefinition = "varchar(10) default '' comment '申请类型'") - @Comment(value = "申请类型") - private String applyType; - - @Column(name = "IS_NEW", columnDefinition = "varchar(10) default '' comment '是否最新数据'") - @Comment(value = "是否最新数据") - private String isNew; - - @Column(name = "FLOW_NODE", columnDefinition = "text comment '流程节点信息'") - @Comment(value = "流程节点信息") - private String flowNode; - - @Column(name = "ALREADY_APPROVE_USER", columnDefinition = "varchar(1000) default '' comment '已审批人员id'") - @Comment(value = "已审批人员id") - private String alreadyApproveUser; - - @Column(name = "CURRENT_USER_ID", columnDefinition = "varchar(100) default '' comment '当前审批人员'") - @Comment(value = "当前审批人员") - private String currentUserId; - - @Column(name = "CURRENT_NODE", columnDefinition = "varchar(500) default '' comment '当前节点信息'") - @Comment(value = "当前节点信息") - private String currentNode; - - @Column(name = "BUS_ID_JSON", columnDefinition = "text comment '业务关联id信息'") - @Comment(value = "当前节点信息") - private String busIdJson; - - public Approve(ApproveDTO dto) { - this.id = dto.getId(); - this.interfaceId = dto.getInterfaceId(); - this.applyId = dto.getApplyId(); - this.illustrate = dto.getIllustrate(); - this.approveStatus = dto.getApproveStatus(); - this.notes = dto.getNotes(); - this.personName = dto.getPersonName(); - this.personId = dto.getPersonId(); - this.interfaceStatus = dto.getInterfaceStatus(); - this.isOver = dto.getIsOver(); - this.flowNode = dto.getFlowNode(); - this.alreadyApproveUser = dto.getAlreadyApproveUser(); - this.currentUserId = dto.getCurrentUserId(); - this.currentNode = dto.getCurrentNode(); - } -} - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/AuthDict.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/AuthDict.java deleted file mode 100644 index 2fae4d3..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/AuthDict.java +++ /dev/null @@ -1,101 +0,0 @@ -package net.risesoft.y9public.entity; - -import lombok.Data; -import lombok.NoArgsConstructor; -import net.risesoft.y9public.dto.AuthDictDTO; -import org.hibernate.annotations.Comment; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import java.io.Serializable; - -@Data -@NoArgsConstructor -@Entity -@Table(name = "Y9_INTERFACE_AUTH_DICT") -@org.hibernate.annotations.Table(comment = "接口鉴权字典", appliesTo = "Y9_INTERFACE_AUTH_DICT") -public class AuthDict extends BaseEntity implements Serializable { - - private static final long serialVersionUID = 3121642144259272227L; - - @Id - @Column(name = "ID", columnDefinition = "varchar(36) default '' comment 'ID'") - private String id; - - @Column(name = "INTERFACE_ID", columnDefinition = "varchar(36) default '' comment '接口id'") - @Comment(value = "接口ID") - private String interfaceId; - - @Column(name = "PARAMETER_NAME", columnDefinition = "varchar(100) default '' comment '参数名'") - @Comment(value = "参数名") - private String parameterName; - - @Column(name = "FIELD_NAME", columnDefinition = "varchar(36) default '' comment '字段名'") - @Comment(value = "字段名") - private String fieldName; - - @Column(name = "FIELD_VAL", columnDefinition = "varchar(100) default '' comment '字段值'") - @Comment(value = "字段值") - private String fieldVal; - - @Column(name = "SHOW_VAL", columnDefinition = "varchar(100) default '' comment '显示值'") - @Comment(value = "显示值") - private String showVal; - - @Column(name = "PARAMETER_TYPE", columnDefinition = "varchar(100) default '' comment '参数类型（公有；私有；）'") - @Comment(value = "参数类型") - private String parameterType; - - @Column(name = "PARAMETER_ID", columnDefinition = "varchar(100) default '' comment '参数ID'") - @Comment(value = "参数ID") - private String parameterId; - - @Column(name = "IS_DELETE", columnDefinition = "varchar(100) default '' comment '参数类型（Y无效；N有效）'") - @Comment(value = "是否有效") - private String isDelete; - - @Column(name = "PID", columnDefinition = "varchar(36) default '' comment '父级id'") - @Comment(value = "父级id") - private String pid; - - @Column(name = "SORT", columnDefinition = "int comment '序号'") - @Comment(value = "序号") - private Integer sort; - - @Column(name = "IS_TREE", columnDefinition = "varchar(10) default '' comment '是否树形数据（是；否；）'") - @Comment(value = "是否树形") - private String isTree; - - @Column(name = "IS_PRIMARY", columnDefinition = "varchar(10) default '' comment '是否主表数据'") - @Comment(value = "是否主表数据") - private String isPrimary; - - @Column(name = "PERSON_ID", columnDefinition = "varchar(36) default '' comment '填写人ID'") - @Comment(value = "填写人ID") - private String personId; - - @Column(name = "PERSON_NAME", columnDefinition = "varchar(100) default '' comment '填写人名称'") - @Comment(value = "填写人名称") - private String personName; - - public AuthDict(AuthDictDTO dto) { - this.id = dto.getId(); - this.interfaceId = dto.getInterfaceId(); - this.parameterName = dto.getParameterName(); - this.fieldName = dto.getFieldName(); - this.fieldVal = dto.getFieldVal(); - this.showVal = dto.getShowVal(); - this.parameterType = dto.getParameterType(); - this.parameterId = dto.getParameterId(); - this.isDelete = dto.getIsDelete(); - this.pid = dto.getPid(); - this.sort = dto.getSort(); - this.isTree = dto.getIsTree(); - this.isPrimary = dto.getIsPrimary(); - this.personId = dto.getPersonId(); - this.personName = dto.getPersonName(); - } -} - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/Blacklisting.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/Blacklisting.java deleted file mode 100644 index d18f4e7..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/Blacklisting.java +++ /dev/null @@ -1,55 +0,0 @@ -package net.risesoft.y9public.entity; - -import lombok.Data; -import lombok.NoArgsConstructor; -import org.hibernate.annotations.Comment; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import java.io.Serializable; - -@Data -@NoArgsConstructor -@Entity -@Table(name = "Y9_INTERFACE_BLACKLISTING") -@org.hibernate.annotations.Table(comment = "黑名单录入", appliesTo = "Y9_INTERFACE_BLACKLISTING") -public class Blacklisting extends BaseEntity implements Serializable { - - private static final long serialVersionUID = 3121642146259214221L; - - @Id - @Column(name = "ID", columnDefinition = "varchar(50) default '' comment 'ID'") - private String id; - - @Column(name = "name", columnDefinition = "varchar(100) default '' comment '名称'") - @Comment(value = "名称") - private String name; - - @Column(name = "IP", columnDefinition = "varchar(300) default '' comment '黑名单IP'") - @Comment(value = "黑名单IP") - private String ip; - - @Column(name = "INTERFACE_IDS", columnDefinition = "varchar(1000) default '' comment '接口id'") - @Comment(value = "接口id") - private String interfaceIds; - - @Column(name = "notes", columnDefinition = "varchar(254) default '' comment '备注'") - @Comment(value = "备注") - private String notes; - - @Column(name = "SORT", columnDefinition = "int comment '排序'") - @Comment(value = "排序") - private Integer sort; - - @Column(name = "IS_DELETE", columnDefinition = "varchar(10) default 'N' comment '是否删除Y删除，N未删除'") - @Comment(value = "是否删除") - private String isDelete; - - @Column(name = "IS_ENABLE", columnDefinition = "varchar(10) default 'N' comment '参数类型（true启用；false停用）'") - @Comment(value = "是否启用") - private String isEnable; - -} - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/InterfaceApply.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/InterfaceApply.java deleted file mode 100644 index cc065a4..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/InterfaceApply.java +++ /dev/null @@ -1,141 +0,0 @@ -package net.risesoft.y9public.entity; - -import lombok.Data; -import lombok.NoArgsConstructor; -import net.risesoft.y9public.dto.InterfaceApplyDTO; -import org.hibernate.annotations.Comment; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import java.io.Serializable; - -@Data -@NoArgsConstructor -@Entity -@Table(name = "Y9_INTERFACE_APPLY") -@org.hibernate.annotations.Table(comment = "接口申请表", appliesTo = "Y9_INTERFACE_APPLY") -public class InterfaceApply extends BaseEntity implements Serializable { - - private static final long serialVersionUID = 3121642146259274227L; - - @Id - @Column(name = "ID", columnDefinition = "varchar(36) default '' comment 'ID'") - private String id; - - @Column(name = "INTERFACE_ID", columnDefinition = "varchar(36) default '' comment '接口id'") - @Comment(value = "接口ID") - private String interfaceId; - - @Column(name = "APPLY_PERSON_NAME", columnDefinition = "varchar(50) default '' comment '接口申请人'") - @Comment(value = "接口申请人") - private String applyPersonName; - - @Column(name = "APPLY_PERSON_ID", columnDefinition = "varchar(36) default '' comment '接口申请人ID'") - @Comment(value = "接口申请人ID") - private String applyPersonId; - - @Column(name = "SYSTEM_IDENTIFIER", columnDefinition = "varchar(254) default '' comment '系统标识'") - @Comment(value = "申请系统标识") - private String systemIdentifier; - - @Column(name = "APPLY_SYSTEM_NAME", columnDefinition = "varchar(254) default '' comment '申请系统名称'") - @Comment(value = "申请系统名称") - private String applySystemName; - - @Column(name = "AUTH", columnDefinition = "text comment '权限信息'") - @Comment(value = "权限信息") - private String auth; - - @Column(name = "APPLY_PERSON_DEPT_NAME", columnDefinition = "varchar(254) default '' comment '接口申请人单位名称'") - @Comment(value = "接口申请人单位名称") - private String applyPersonDeptName; - - @Column(name = "APPLY_PERSON_DEPT_ID", columnDefinition = "varchar(254) default '' comment '接口申请人单位id'") - @Comment(value = "接口申请人单位id") - private String applyPersonDeptId; - - @Column(name = "USE_PERSON_RESPONSIBLE", columnDefinition = "varchar(50) default '' comment '接口调用责任人'") - @Comment(value = "接口调用责任人") - private String usePersonResponsible; - - @Column(name = "USE_PERSON_RESPONSIBLE_PHONE", columnDefinition = "varchar(20) default '' comment '接口调用责任人联系方式'") - @Comment(value = "接口调用责任人联系方式") - private String usePersonResponsiblePhone; - - @Column(name = "NOTES", columnDefinition = "varchar(254) default '' comment '申请备注'") - @Comment(value = "申请备注") - private String notes; - - @Column(name = "APPLY_TIME", columnDefinition = "varchar(20) default '' comment '申请日期'") - @Comment(value = "申请日期") - private String applyTime; - - @Column(name = "APPLY_REASON", columnDefinition = "varchar(500) default '' comment '申请事由'") - @Comment(value = "申请事由") - private String applyReason; - - @Column(name = "APPLY_TYPE", columnDefinition = "varchar(10) default '' comment '申请类型'") - @Comment(value = "申请类型") - private String applyType; - - @Column(name = "USER_KEY", columnDefinition = "varchar(100) default '' comment '用户令牌'") - @Comment(value = "用户令牌") - private String userKey; - - @Column(name = "USER_SECRET", columnDefinition = "varchar(100) default '' comment '用户密钥'") - @Comment(value = "用户密钥") - private String userSecret; - - @Column(name = "IP_WHITELIST", columnDefinition = "varchar(100) default '' comment 'IP白名单'") - @Comment(value = "IP白名单") - private String ipWhitelist; - - @Column(name = "APPLY_STOP_TIME", columnDefinition = "varchar(20) default '' comment '申请停用时间'") - @Comment(value = "申请停用时间") - private String applyStopTime; - - @Column(name = "OLD_ID", columnDefinition = "varchar(36) default '' comment '关联回显之前的申请信息,目前只有接口调用申请会存'") - @Comment(value = "变更前旧id") - private String oldId; - - @Column(name = "SAME_ID", columnDefinition = "varchar(36) default '' comment '同一个申请变更id'") - @Comment(value = "同一个申请变更id") - private String sameId; - - @Column(name = "DATA_TYPE", columnDefinition = "varchar(10) default '新增' comment '数据类型-新增-变更'") - @Comment(value = "数据类型") - private String dataType; - - @Column(name = "IS_EFFECTIVE", columnDefinition = "varchar(2) default 'Y' comment '数据是否有效：Y有效-N无效'") - @Comment(value = "数据是否有效") - private String isEffective; - - public InterfaceApply(InterfaceApplyDTO dto) { - this.id = dto.getId(); - this.interfaceId = dto.getInterfaceId(); - this.applyPersonName = dto.getApplyPersonName(); - this.applyPersonId = dto.getApplyPersonId(); - this.systemIdentifier = dto.getSystemIdentifier(); - this.applySystemName = dto.getApplySystemName(); - this.auth = dto.getAuth(); - this.applyPersonDeptName = dto.getApplyPersonDeptName(); - this.applyPersonDeptId = dto.getApplyPersonDeptId(); - this.usePersonResponsible = dto.getUsePersonResponsible(); - this.usePersonResponsiblePhone = dto.getUsePersonResponsiblePhone(); - this.notes = dto.getNotes(); - this.applyTime = dto.getApplyTime(); - this.applyReason = dto.getApplyReason(); - this.applyType = dto.getApplyType(); - this.userKey = dto.getUserKey(); - this.userSecret = dto.getUserSecret(); - this.ipWhitelist = dto.getIpWhitelist(); - this.applyStopTime = dto.getApplyStopTime(); - this.oldId = dto.getOldId(); - this.sameId = dto.getSameId(); - this.dataType = dto.getDataType(); - this.isEffective = dto.getIsEffective(); - } -} - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/InterfaceLimitInfo.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/InterfaceLimitInfo.java deleted file mode 100644 index ebe4213..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/InterfaceLimitInfo.java +++ /dev/null @@ -1,70 +0,0 @@ -package net.risesoft.y9public.entity; - -import lombok.Data; -import lombok.NoArgsConstructor; -import org.hibernate.annotations.Comment; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import java.io.Serializable; - -@Data -@NoArgsConstructor -@Entity -@Table(name = "Y9_INTERFACE_LIMIT") -@org.hibernate.annotations.Table(comment = "接口限流信息表", appliesTo = "Y9_INTERFACE_LIMIT") -public class InterfaceLimitInfo extends BaseEntity implements Serializable { - - private static final long serialVersionUID = 3121642146259274227L; - - @Id - @Column(name = "ID", columnDefinition = "varchar(36) default '' comment 'ID'") - private String id; - - @Column(name = "INTERFACE_ID", columnDefinition = "varchar(36) default '' comment '接口id'") - @Comment(value = "接口ID") - private String interfaceId; - - @Column(name = "EFFECT", columnDefinition = "varchar(500) default '' comment '流控效果：快速失败（1）;Warm Up（2）;排队等候（3）;'") - @Comment(value = "流控效果") - private String effect; - - @Column(name = "WARM_TIME", columnDefinition = "varchar(500) default '' comment '预热时长（秒）'") - @Comment(value = "预热时长") - private String warmTime; - - @Column(name = "THRESHOLD_TYPE", columnDefinition = "varchar(500) default '' comment '阈值类型'") - @Comment(value = "阈值类型") - private String thresholdType; - - @Column(name = "THRESHOLD_VAL", columnDefinition = "varchar(500) default '' comment '阈值'") - @Comment(value = "阈值") - private String thresholdVal; - - @Column(name = "WAIT_TIME", columnDefinition = "varchar(500) default '' comment '超时时间（毫秒）'") - @Comment(value = "超时时间") - private String waitTime; - - @Column(name = "IS_COLONY", columnDefinition = "varchar(500) default '' comment '是否集群'") - @Comment(value = "是否集群") - private String isColony; - - @Column(name = "LIMIT_TIME", columnDefinition = "varchar(20) default '' comment '限定时间，单位：秒'") - @Comment(value = "限定时间") - private String limitTime; - - @Column(name = "LiMIT_COUNT", columnDefinition = "varchar(10) default '' comment '限定时间内总访问量'") - @Comment(value = "限定时间内总访问量") - private String limitCount; - - @Column(name = "PERSON_ID", columnDefinition = "varchar(36) default '' comment '填写人ID'") - @Comment(value = "填写人ID") - private String personId; - - @Column(name = "PERSON_NAME", columnDefinition = "varchar(36) default '' comment '填写人名称'") - @Comment(value = "填写人名称") - private String personName; -} - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/InterfaceManage.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/InterfaceManage.java deleted file mode 100644 index 897f165..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/InterfaceManage.java +++ /dev/null @@ -1,190 +0,0 @@ -package net.risesoft.y9public.entity; - -import lombok.Data; -import lombok.NoArgsConstructor; -import net.risesoft.y9public.dto.InterfaceManageDTO; -import org.hibernate.annotations.Comment; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import java.io.Serializable; - -@Data -@NoArgsConstructor -@Entity -@Table(name = "Y9_INTERFACE_MANAGE_INFO") -@org.hibernate.annotations.Table(comment = "接口管理信息", appliesTo = "Y9_INTERFACE_MANAGE_INFO") -public class InterfaceManage extends BaseEntity implements Serializable { - - private static final long serialVersionUID = 3226632146259274287L; - - @Id - @Column(name = "ID", columnDefinition = "varchar(36) default '' comment 'ID'") - private String id; - - @Column(name = "INTERFACE_NAME", columnDefinition = "varchar(100) default '' comment '接口名称'") - @Comment(value = "接口名称") - private String interfaceName; - - @Column(name = "SAME_INTERFACE_ID", columnDefinition = "varchar(36) default '' comment '同一接口id'") - @Comment(value = "接口id") - private String sameInterfaceId; - - @Column(name = "INTERFACE_URL", columnDefinition = "varchar(500) default '' comment '接口调用地址'") - @Comment(value = "接口调用地址") - private String interfaceUrl; - - @Column(name = "IS_AUTH", columnDefinition = "varchar(10) default '' comment '是否鉴权'") - @Comment(value = "是否鉴权") - private String isAuth; - - @Column(name = "AUTH_INFO", columnDefinition = "varchar(1000) default '' comment '鉴权信息'") - @Comment(value = "鉴权信息") - private String authInfo; - - @Column(name = "IS_LIMIT", columnDefinition = "varchar(10) default '' comment '是否限流'") - @Comment(value = "是否限流") - private String isLimit; - - @Column(name = "IS_LIMIT_DATA", columnDefinition = "varchar(10) default '' comment '是否控制数据权限范围'") - @Comment(value = "是否控制数据权限范围") - private String isLimitData; - - @Column(name = "ILLUSTRATE", columnDefinition = "varchar(500) default '' comment '接口说明'") - @Comment(value = "接口说明") - private String illustrate; - - @Column(name = "INTERFACE_TYPE", columnDefinition = "varchar(50) default '' comment '接口类型'") - @Comment(value = "接口类型") - private String interfaceType; - - @Column(name = "NETWORK_AGREEMENT", columnDefinition = "varchar(50) default '' comment '网络协议'") - @Comment(value = "网络协议") - private String networkAgreement; - - @Column(name = "INTERFACE_STATUS", columnDefinition = "varchar(10) default '' comment '接口状态'") - @Comment(value = "接口状态") - private String interfaceStatus; - - @Column(name = "INTERFACE_METHOD", columnDefinition = "varchar(10) default '' comment '请求方式'") - @Comment(value = "请求方式") - private String interfaceMethod; - - @Column(name = "VERSION", columnDefinition = "varchar(50) default '' comment '接口版本'") - @Comment(value = "接口版本") - private String version; - - @Column(name = "NOTES", columnDefinition = "varchar(254) default '' comment '备注'") - @Comment(value = "备注") - private String notes; - - @Column(name = "PERSON_NAME", columnDefinition = "varchar(50) default '' comment '接口填报人'") - @Comment(value = "接口填报人") - private String personName; - - @Column(name = "PERSON_ID", columnDefinition = "varchar(36) default '' comment '接口填报人ID'") - @Comment(value = "接口填报人ID") - private String personId; - - @Column(name = "DEPT_INFO", columnDefinition = "varchar(254) default '' comment '接口提供公司名称'") - @Comment(value = "接口提供公司名称") - private String deptInfo; - - @Column(name = "DEPT_ID", columnDefinition = "varchar(50) default '' comment '接口提供公司id'") - @Comment(value = "接口提供公司id") - private String deptId; - - @Column(name = "SYSTEM_NAME", columnDefinition = "varchar(254) default '' comment '接口提供系统名称'") - @Comment(value = "接口提供系统名称") - private String systemName; - - @Column(name = "SYSTEM_ID", columnDefinition = "varchar(50) default '' comment '接口提供系统标识'") - @Comment(value = "接口提供系统标识") - private String systemId; - - @Column(name = "HEAD", columnDefinition = "varchar(50) default '' comment '接口负责人名称'") - @Comment(value = "接口负责人名称") - private String head; - - @Column(name = "HEAD_PHONE", columnDefinition = "varchar(50) default '' comment '接口负责人'") - @Comment(value = "接口负责人联系方式") - private String headPhone; - - @Column(name = "IS_OVERWRITE", columnDefinition = "varchar(10) default '' comment '是否覆盖更新Y覆盖，N未覆盖'") - @Comment(value = "是否覆盖更新") - private String isOverwrite; - - @Column(name = "OVERWRITE_INTERFACE_ID", columnDefinition = "varchar(36) default '' comment '覆盖更新接口id'") - @Comment(value = "覆盖更新接口id") - private String overwriteInterfaceId; - - @Column(name = "INTERFACE_FILE_URL", columnDefinition = "varchar(500) default '' comment '接口文档下载地址'") - @Comment(value = "接口文档下载地址") - private String interfaceFileUrl; - - @Column(name = "INTERFACE_FILE_NAME", columnDefinition = "varchar(100) default '' comment '接口文档名称'") - @Comment(value = "接口文档名称") - private String interfaceFileName; - - @Column(name = "IS_DELETE", columnDefinition = "varchar(50) default 'N' comment '是否删除，Y删除，N未删除'") - @Comment(value = "是否已经删除") - private String isDelete; - - @Column(name = "IS_TEST", columnDefinition = "varchar(10) default '' comment '是否测试接口'") - @Comment(value = "是否测试接口") - private String isTest; - - @Column(name = "PARAMETER_IDS", columnDefinition = "varchar(2000) default '' comment '鉴权参数id串'") - @Comment(value = "鉴权参数id串") - private String parameterIds; - - @Column(name = "NAME_SPACE", columnDefinition = "varchar(300) default '' comment '命名空间'") - @Comment(value = "命名空间") - private String nameSpace; - - @Column(name = "METHOD", columnDefinition = "varchar(300) default '' comment 'webService调用方法'") - @Comment(value = "webService调用方法") - private String method; - - @Column(name = "WEB_SPECIFICATION", columnDefinition = "varchar(20) default '' comment 'webService开发规范协议'") - @Comment(value = "webService开发规范协议") - private String webSpecification; - - - public InterfaceManage(InterfaceManageDTO dto) { - this.id = dto.getId(); - this.interfaceName = dto.getInterfaceName(); - this.sameInterfaceId = dto.getSameInterfaceId(); - this.interfaceUrl = dto.getInterfaceUrl(); - this.parameterIds = dto.getParameterIds(); - this.isAuth = dto.getIsAuth(); - this.isLimit = dto.getIsLimit(); - this.illustrate = dto.getIllustrate(); - this.interfaceType = dto.getInterfaceType(); - this.interfaceStatus = dto.getInterfaceStatus(); - this.interfaceMethod = dto.getInterfaceMethod(); - this.version = dto.getVersion(); - this.notes = dto.getNotes(); - this.personName = dto.getPersonName(); - this.personId = dto.getPersonId(); - this.deptInfo = dto.getDeptInfo(); - this.head = dto.getHead(); - this.isOverwrite = dto.getIsOverwrite(); - this.interfaceFileUrl = dto.getInterfaceFileUrl(); - this.isDelete = dto.getIsDelete(); - this.isTest = dto.getIsTest(); - this.networkAgreement = dto.getNetworkAgreement(); - this.headPhone = dto.getHeadPhone(); - this.overwriteInterfaceId = dto.getOverwriteInterfaceId(); - this.nameSpace = dto.getNameSpace(); - this.method = dto.getMethod(); - this.webSpecification = dto.getWebSpecification(); - this.isLimitData = dto.getIsLimitData(); - this.deptId = dto.getDeptId(); - this.systemId = dto.getSystemId(); - this.systemName = dto.getSystemName(); - } -} - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/Parameter.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/Parameter.java deleted file mode 100644 index e41d3e5..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/Parameter.java +++ /dev/null @@ -1,96 +0,0 @@ -package net.risesoft.y9public.entity; - -import lombok.Data; -import lombok.NoArgsConstructor; -import net.risesoft.y9public.dto.ParameterDTO; -import org.hibernate.annotations.Comment; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import java.io.Serializable; - -@Data -@NoArgsConstructor -@Entity -@Table(name = "Y9_INTERFACE_PARAMETER") -@org.hibernate.annotations.Table(comment = "接口参数表", appliesTo = "Y9_INTERFACE_PARAMETER") -public class Parameter extends BaseEntity implements Serializable { - - private static final long serialVersionUID = 3121642146259274227L; - - @Id - @Column(name = "ID", columnDefinition = "varchar(36) default '' comment 'ID'") - private String id; - - @Column(name = "INTERFACE_ID", columnDefinition = "varchar(36) default '' comment '接口id'") - @Comment(value = "接口ID") - private String interfaceId; - - @Column(name = "PARAMETER_KEY", columnDefinition = "varchar(500) default '' comment '参数key'") - @Comment(value = "参数key") - private String parameterKey; - - @Column(name = "VAL", columnDefinition = "varchar(500) default '' comment '参数值'") - @Comment(value = "参数值") - private String val; - - @Column(name = "DEFAULT_VAL", columnDefinition = "varchar(500) default '' comment '默认参数值'") - @Comment(value = "默认参数值") - private String defaultVal; - - @Column(name = "PARAMETER_TYPE", columnDefinition = "varchar(20) default '' comment '参数类型'") - @Comment(value = "参数类型") - private String parameterType; - - @Column(name = "REQUIRED", columnDefinition = "varchar(10) default '' comment '是否必填Y是，N否'") - @Comment(value = "是否必填") - private String required; - - @Column(name = "NOTES", columnDefinition = "varchar(254) default '' comment '参数说明'") - @Comment(value = "参数说明") - private String notes; - - @Column(name = "PERSON_ID", columnDefinition = "varchar(36) default '' comment '填写人ID'") - @Comment(value = "填写人ID") - private String personId; - - @Column(name = "PARAMETER_STATUS", columnDefinition = "varchar(10) default '' comment '参数状态（1请求头参数，2请求参数，3返回参数）'") - @Comment(value = "参数状态") - private String parameterStatus; - - @Column(name = "PID", columnDefinition = "varchar(36) default '' comment '父级id'") - @Comment(value = "父级id") - private String pid; - - @Column(name = "LEVEL", columnDefinition = "int comment '节点层级，根节点层级为1'") - @Comment(value = "节点层级") - private Integer level; - - @Column(name = "IS_ITEMS", columnDefinition = "varchar(10) default '' comment '是否数组'") - @Comment(value = "是否数组") - private String isItems; - - @Column(name = "SORT", columnDefinition = "int comment '序号'") - @Comment(value = "序号") - private Integer sort; - - public Parameter(ParameterDTO dto) { - this.id = dto.getId(); - this.interfaceId = dto.getInterfaceId(); - this.parameterKey = dto.getParameterKey(); - this.val = dto.getVal(); - this.defaultVal = dto.getDefaultVal(); - this.parameterType = dto.getParameterType(); - this.required = dto.getRequired(); - this.notes = dto.getNotes(); - this.personId = dto.getPersonId(); - this.parameterStatus = dto.getParameterStatus(); - this.pid = dto.getPid(); - this.level = dto.getLevel(); - this.isItems = dto.getIsItems(); - this.sort = dto.getSort(); - } -} - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/SystemIdentifier.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/SystemIdentifier.java deleted file mode 100644 index f6aeef2..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/SystemIdentifier.java +++ /dev/null @@ -1,51 +0,0 @@ -package net.risesoft.y9public.entity; - -import lombok.Data; -import lombok.NoArgsConstructor; -import org.hibernate.annotations.Comment; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import java.io.Serializable; - -@Data -@NoArgsConstructor -@Entity -@Table(name = "Y9_INTERFACE_SYSTEM_IDENTIFIER") -@org.hibernate.annotations.Table(comment = "系统标识录入", appliesTo = "Y9_INTERFACE_SYSTEM_IDENTIFIER") -public class SystemIdentifier extends BaseEntity implements Serializable { - - private static final long serialVersionUID = 3121642146259274227L; - - @Id - @Column(name = "ID", columnDefinition = "varchar(36) default '' comment 'ID'") - private String id; - - @Column(name = "name", columnDefinition = "varchar(100) default '' comment 'name'") - @Comment(value = "名称") - private String name; - - @Column(name = "PARAMETER_TYPE", columnDefinition = "varchar(20) default '' comment '数据类型0是单位，1是系统'") - @Comment(value = "数据类型") - private String parameterType; - - @Column(name = "PID", columnDefinition = "varchar(36) default '' comment '父级id'") - @Comment(value = "父级id") - private String pid; - - @Column(name = "PNAME", columnDefinition = "varchar(100) default '' comment '父级名称'") - @Comment(value = "父级名称") - private String pname; - - @Column(name = "SORT", columnDefinition = "int comment '排序'") - @Comment(value = "排序") - private Integer sort; - - @Column(name = "IS_DELETE", columnDefinition = "varchar(10) default 'N' comment '是否删除Y删除，N未删除'") - @Comment(value = "是否删除") - private String isDelete; - -} - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/ViewApprove.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/ViewApprove.java deleted file mode 100644 index 8381f48..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/ViewApprove.java +++ /dev/null @@ -1,120 +0,0 @@ -package net.risesoft.y9public.entity; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.hibernate.annotations.Comment; -import org.hibernate.annotations.CreationTimestamp; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import java.io.Serializable; -import java.util.Date; - -@Data -@NoArgsConstructor -@Entity -@Table(name = "VIEW_APPROVE_LIST") -@org.hibernate.annotations.Table(comment = "接口审批视图表", appliesTo = "VIEW_APPROVE_LIST") -public class ViewApprove implements Serializable { - - private static final long serialVersionUID = 3121642145259274427L; - - @Id - @Column(name = "APPROVE_ID") - private String approveId; - - @Column(name = "INTERFACE_ID") - @Comment(value = "接口ID") - private String interfaceId; - - @Column(name = "APPLY_ID") - @Comment(value = "申请ID") - private String applyId; - - @Column(name = "APPROVE_STATUS") - @Comment(value = "审批意见") - private String approveStatus; - - @Column(name = "ILLUSTRATE") - @Comment(value = "审批说明") - private String illustrate; - - @Column(name = "APPLY_TYPE") - @Comment(value = "申请类型") - private String applyType; - - @Column(name = "NOTES") - @Comment(value = "备注") - private String notes; - - @Column(name = "IS_OVER") - @Comment(value = "是否结束") - private String isOver; - - @Column(name = "APPROVE_INTERFACE_STATUS") - @Comment(value = "审批接口状态") - private String approveInterfaceStatus; - - @Column(name = "APPROVE_PERSON_NAME") - @Comment(value = "审批人") - private String approvePersonName; - - @Column(name = "APPROVE_PERSON_ID") - @Comment(value = "审批人ID") - private String approvePersonId; - - @Column(name = "APPLY_PERSON_NAME") - @Comment(value = "申请人名称") - private String applyPersonName; - - @Column(name = "APPLY_PERSON_ID") - @Comment(value = "申请人ID") - private String applyPersonId; - - @Column(name = "INTERFACE_NAME") - @Comment(value = "接口名称") - private String interfaceName; - - @Column(name = "INTERFACE_STATUS") - @Comment(value = "接口状态") - private String interfaceStatus; - - @Column(name = "VERSION") - @Comment(value = "接口版本") - private String version; - - @Column(name = "IS_LIMIT_DATA") - @Comment(value = "是否控制数据权限信息") - private String isLimitData; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @CreationTimestamp - @Column(name = "CREATETIME") - private Date createTime; - - @Column(name = "ALREADY_APPROVE_USER", columnDefinition = "varchar(1000) default '' comment '已审批人员id'") - @Comment(value = "已审批人员id") - private String alreadyApproveUser; - - @Column(name = "CURRENT_USER_ID", columnDefinition = "varchar(100) default '' comment '当前审批人员'") - @Comment(value = "当前审批人员") - private String currentUserId; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @CreationTimestamp - @Column(name = "APPLY_TIME") - private Date applyTime; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @CreationTimestamp - @Column(name = "UPDATETIME") - private Date updateTime; - - @Column(name = "STATUS_SORT") - @Comment(value = "状态排序") - private String statusSort; -} - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/vo/ApplyVo.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/vo/ApplyVo.java deleted file mode 100644 index c18ba74..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/vo/ApplyVo.java +++ /dev/null @@ -1,48 +0,0 @@ -package net.risesoft.y9public.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.NoArgsConstructor; -import net.risesoft.y9public.entity.BaseEntity; - -import java.io.Serializable; -import java.util.Date; - -@Data -@NoArgsConstructor -public class ApplyVo extends BaseEntity implements Serializable { - - private static final long serialVersionUID = 3121652146259274217L; - - private String id; - - private String applyPersonName; - - private String approveStatus; - - private String applyReason; - - private String interfaceId; - - private String sameId; - - private String approveId; - - /** - * 创建时间 - */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - protected Date createTime; - - public ApplyVo(String id, String applyPersonName, String approveStatus, Date createTime, String applyReason, String interfaceId, String sameId, String approveId) { - this.id = id; - this.applyPersonName = applyPersonName; - this.approveStatus = approveStatus; - this.createTime = createTime; - this.applyReason = applyReason; - this.interfaceId = interfaceId; - this.sameId = sameId; - this.approveId = approveId; - } -} - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/vo/ViewApproveVo.java b/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/vo/ViewApproveVo.java deleted file mode 100644 index 120f909..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/vo/ViewApproveVo.java +++ /dev/null @@ -1,86 +0,0 @@ -package net.risesoft.y9public.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.NoArgsConstructor; -import net.risesoft.y9public.entity.ViewApprove; - -import java.io.Serializable; -import java.util.Date; - -@Data -@NoArgsConstructor -public class ViewApproveVo implements Serializable { - - private static final long serialVersionUID = 3121644149259274427L; - - private String approveId; - - private String interfaceId; - - private String applyId; - - private String approveStatus; - - private String illustrate; - - private String applyType; - - private String notes; - - private String isOver; - - private String approveInterfaceStatus; - - private String approvePersonName; - - private String approvePersonId; - - private String applyPersonName; - - private String applyPersonId; - - private String interfaceName; - - private String interfaceStatus; - - private String version; - private String statusSort; - - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date createTime; - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date applyTime; - private String alreadyApproveUser; - - private String currentUserId; - - private String isNow; - private String isLimitData; - - public ViewApproveVo(ViewApprove dto) { - this.approveId = dto.getApproveId(); - this.interfaceId = dto.getInterfaceId(); - this.applyId = dto.getApplyId(); - this.approveStatus = dto.getApproveStatus(); - this.illustrate = dto.getIllustrate(); - this.applyType = dto.getApplyType(); - this.notes = dto.getNotes(); - this.isOver = dto.getIsOver(); - this.approveInterfaceStatus = dto.getApproveInterfaceStatus(); - this.approvePersonName = dto.getApprovePersonName(); - this.approvePersonId = dto.getApprovePersonId(); - this.applyPersonName = dto.getApplyPersonName(); - this.applyPersonId = dto.getApplyPersonId(); - this.interfaceName = dto.getInterfaceName(); - this.interfaceStatus = dto.getInterfaceStatus(); - this.version = dto.getVersion(); - this.createTime = dto.getCreateTime(); - this.alreadyApproveUser = dto.getAlreadyApproveUser(); - this.currentUserId = dto.getCurrentUserId(); - this.applyTime = dto.getApplyTime(); - this.isLimitData = dto.getIsLimitData(); - this.statusSort = dto.getStatusSort(); - } -} - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/resources/sql/data-mysql.sql b/risenet-y9boot-webapp-interface-platform/src/main/resources/sql/data-mysql.sql deleted file mode 100644 index 30d27b8..0000000 --- a/risenet-y9boot-webapp-interface-platform/src/main/resources/sql/data-mysql.sql +++ /dev/null @@ -1,42 +0,0 @@ --- 删除表 -DROP TABLE y9_interface.view_approve_list; ---DROP TABLE IF EXISTS view_approve_list; - --- 创建视图 -create -or replace -algorithm = UNDEFINED view `y9_interface`.`view_approve_list` as -select `nia`.`ID` as `APPROVE_ID`, - `nia`.`INTERFACE_ID` as `INTERFACE_ID`, - `nia`.`APPLY_ID` as `APPLY_ID`, - `nia`.`APPROVE_STATUS` as `APPROVE_STATUS`, - `nia`.`ILLUSTRATE` as `ILLUSTRATE`, - `nia`.`APPLY_TYPE` as `APPLY_TYPE`, - `nia`.`NOTES` as `NOTES`, - `nia`.`IS_OVER` as `IS_OVER`, - `nia`.`INTERFACE_STATUS` as `APPROVE_INTERFACE_STATUS`, - `nia`.`PERSON_ID` as `APPROVE_PERSON_ID`, - `nia`.`PERSON_NAME` as `APPROVE_PERSON_NAME`, - `nia`.`CREATETIME` as `CREATETIME`, - `nia`.`UPDATETIME` as `UPDATETIME`, - `nia`.`CURRENT_USER_ID` as `CURRENT_USER_ID`, - `nia`.`ALREADY_APPROVE_USER` as `ALREADY_APPROVE_USER`, - `nia2`.`APPLY_PERSON_ID` as `APPLY_PERSON_ID`, - `nia2`.`APPLY_PERSON_NAME` as `APPLY_PERSON_NAME`, - `nia2`.`CREATETIME` as `apply_time`, - `nimi`.`INTERFACE_NAME` as `INTERFACE_NAME`, - `nimi`.`INTERFACE_STATUS` as `INTERFACE_STATUS`, - `nimi`.`VERSION` as `VERSION`, - `nimi`.`IS_LIMIT_DATA` as `IS_LIMIT_DATA`, - (case - when (`nia`.`APPROVE_STATUS` = '未审批') then '0' - when (`nia`.`APPROVE_STATUS` = '审批中') then '1' - when (`nia`.`APPROVE_STATUS` = '通过') then '2' - when (`nia`.`APPROVE_STATUS` = '不通过') then '3' - end) as `STATUS_SORT` -from ((`y9_interface`.`y9_interface_approve` `nia` - left join `y9_interface`.`y9_interface_apply` `nia2` on - ((`nia`.`APPLY_ID` = `nia2`.`ID`))) - left join `y9_interface`.`y9_interface_manage_info` `nimi` on - ((`nia`.`INTERFACE_ID` = `nimi`.`ID`))) -order by `nia`.`UPDATETIME` desc; diff --git a/y9vue-interfacePlatform/.env.development b/vue/y9vue-interfacePlatform/.env.development similarity index 99% rename from y9vue-interfacePlatform/.env.development rename to vue/y9vue-interfacePlatform/.env.development index 938caf0..d63c15b 100644 --- a/y9vue-interfacePlatform/.env.development +++ b/vue/y9vue-interfacePlatform/.env.development @@ -44,5 +44,3 @@ VUE_APP_CREDENTIALS = true VUE_APP_REMEMBER_TIME = 30 # appFeatures #VUE_APP_APPFEATURES = '1' - - diff --git a/y9vue-interfacePlatform/.env.production b/vue/y9vue-interfacePlatform/.env.production similarity index 95% rename from y9vue-interfacePlatform/.env.production rename to vue/y9vue-interfacePlatform/.env.production index b90037c..d63c15b 100644 --- a/y9vue-interfacePlatform/.env.production +++ b/vue/y9vue-interfacePlatform/.env.production @@ -8,7 +8,7 @@ VUE_APP_PUBLIC_PATH = '/interface/' #api接口域名 VUE_APP_HOST = 'http://localhost:7055/' # index页面 -VUE_APP_HOST_INDEX = 'http://localhost:7055/interface/' +VUE_APP_HOST_INDEX = 'http://localhost:7070/interface/' # y9home接口 VUE_APP_CONTEXT = 'http://localhost:7055/interfacePlatform/' # 执行转发节点入口接口 @@ -44,5 +44,3 @@ VUE_APP_CREDENTIALS = true VUE_APP_REMEMBER_TIME = 30 # appFeatures #VUE_APP_APPFEATURES = '1' - - diff --git a/y9vue-interfacePlatform/.eslintignore b/vue/y9vue-interfacePlatform/.eslintignore similarity index 100% rename from y9vue-interfacePlatform/.eslintignore rename to vue/y9vue-interfacePlatform/.eslintignore diff --git a/y9vue-interfacePlatform/.eslintrc.js b/vue/y9vue-interfacePlatform/.eslintrc.js similarity index 100% rename from y9vue-interfacePlatform/.eslintrc.js rename to vue/y9vue-interfacePlatform/.eslintrc.js diff --git a/y9vue-interfacePlatform/.prettierignore b/vue/y9vue-interfacePlatform/.prettierignore similarity index 100% rename from y9vue-interfacePlatform/.prettierignore rename to vue/y9vue-interfacePlatform/.prettierignore diff --git a/y9vue-interfacePlatform/README.md b/vue/y9vue-interfacePlatform/README.md similarity index 100% rename from y9vue-interfacePlatform/README.md rename to vue/y9vue-interfacePlatform/README.md diff --git a/y9vue-interfacePlatform/components.d.ts b/vue/y9vue-interfacePlatform/components.d.ts similarity index 100% rename from y9vue-interfacePlatform/components.d.ts rename to vue/y9vue-interfacePlatform/components.d.ts diff --git a/y9vue-interfacePlatform/index.html b/vue/y9vue-interfacePlatform/index.html similarity index 100% rename from y9vue-interfacePlatform/index.html rename to vue/y9vue-interfacePlatform/index.html diff --git a/y9vue-interfacePlatform/package-lock.json b/vue/y9vue-interfacePlatform/package-lock.json similarity index 100% rename from y9vue-interfacePlatform/package-lock.json rename to vue/y9vue-interfacePlatform/package-lock.json diff --git a/y9vue-interfacePlatform/package.json b/vue/y9vue-interfacePlatform/package.json similarity index 100% rename from y9vue-interfacePlatform/package.json rename to vue/y9vue-interfacePlatform/package.json diff --git a/y9vue-interfacePlatform/prettier.config.js b/vue/y9vue-interfacePlatform/prettier.config.js similarity index 100% rename from y9vue-interfacePlatform/prettier.config.js rename to vue/y9vue-interfacePlatform/prettier.config.js diff --git a/y9vue-interfacePlatform/public/yun.ico b/vue/y9vue-interfacePlatform/public/yun.ico similarity index 100% rename from y9vue-interfacePlatform/public/yun.ico rename to vue/y9vue-interfacePlatform/public/yun.ico diff --git a/y9vue-interfacePlatform/src/App.vue b/vue/y9vue-interfacePlatform/src/App.vue similarity index 100% rename from y9vue-interfacePlatform/src/App.vue rename to vue/y9vue-interfacePlatform/src/App.vue diff --git a/y9vue-interfacePlatform/src/api/apply/apply.ts b/vue/y9vue-interfacePlatform/src/api/apply/apply.ts similarity index 100% rename from y9vue-interfacePlatform/src/api/apply/apply.ts rename to vue/y9vue-interfacePlatform/src/api/apply/apply.ts diff --git a/y9vue-interfacePlatform/src/api/approve/approve.ts b/vue/y9vue-interfacePlatform/src/api/approve/approve.ts similarity index 100% rename from y9vue-interfacePlatform/src/api/approve/approve.ts rename to vue/y9vue-interfacePlatform/src/api/approve/approve.ts diff --git a/y9vue-interfacePlatform/src/api/authInterface/authInterface.ts b/vue/y9vue-interfacePlatform/src/api/authInterface/authInterface.ts similarity index 100% rename from y9vue-interfacePlatform/src/api/authInterface/authInterface.ts rename to vue/y9vue-interfacePlatform/src/api/authInterface/authInterface.ts diff --git a/y9vue-interfacePlatform/src/api/blacklisting/blacklisting.ts b/vue/y9vue-interfacePlatform/src/api/blacklisting/blacklisting.ts similarity index 100% rename from y9vue-interfacePlatform/src/api/blacklisting/blacklisting.ts rename to vue/y9vue-interfacePlatform/src/api/blacklisting/blacklisting.ts diff --git a/y9vue-interfacePlatform/src/api/flownode/flownode.ts b/vue/y9vue-interfacePlatform/src/api/flownode/flownode.ts similarity index 100% rename from y9vue-interfacePlatform/src/api/flownode/flownode.ts rename to vue/y9vue-interfacePlatform/src/api/flownode/flownode.ts diff --git a/y9vue-interfacePlatform/src/api/home/home.ts b/vue/y9vue-interfacePlatform/src/api/home/home.ts similarity index 100% rename from y9vue-interfacePlatform/src/api/home/home.ts rename to vue/y9vue-interfacePlatform/src/api/home/home.ts diff --git a/y9vue-interfacePlatform/src/api/interface/interface.ts b/vue/y9vue-interfacePlatform/src/api/interface/interface.ts similarity index 100% rename from y9vue-interfacePlatform/src/api/interface/interface.ts rename to vue/y9vue-interfacePlatform/src/api/interface/interface.ts diff --git a/y9vue-interfacePlatform/src/api/lib/request.js b/vue/y9vue-interfacePlatform/src/api/lib/request.js similarity index 100% rename from y9vue-interfacePlatform/src/api/lib/request.js rename to vue/y9vue-interfacePlatform/src/api/lib/request.js diff --git a/y9vue-interfacePlatform/src/api/lib/requestNode.js b/vue/y9vue-interfacePlatform/src/api/lib/requestNode.js similarity index 100% rename from y9vue-interfacePlatform/src/api/lib/requestNode.js rename to vue/y9vue-interfacePlatform/src/api/lib/requestNode.js diff --git a/y9vue-interfacePlatform/src/api/logMonitoring/logMonitoring.ts b/vue/y9vue-interfacePlatform/src/api/logMonitoring/logMonitoring.ts similarity index 100% rename from y9vue-interfacePlatform/src/api/logMonitoring/logMonitoring.ts rename to vue/y9vue-interfacePlatform/src/api/logMonitoring/logMonitoring.ts diff --git a/y9vue-interfacePlatform/src/api/systemidentifier/systemidentifier.ts b/vue/y9vue-interfacePlatform/src/api/systemidentifier/systemidentifier.ts similarity index 100% rename from y9vue-interfacePlatform/src/api/systemidentifier/systemidentifier.ts rename to vue/y9vue-interfacePlatform/src/api/systemidentifier/systemidentifier.ts diff --git a/y9vue-interfacePlatform/src/api/test/index.ts b/vue/y9vue-interfacePlatform/src/api/test/index.ts similarity index 100% rename from y9vue-interfacePlatform/src/api/test/index.ts rename to vue/y9vue-interfacePlatform/src/api/test/index.ts diff --git a/y9vue-interfacePlatform/src/assets/css/nprogress.css b/vue/y9vue-interfacePlatform/src/assets/css/nprogress.css similarity index 100% rename from y9vue-interfacePlatform/src/assets/css/nprogress.css rename to vue/y9vue-interfacePlatform/src/assets/css/nprogress.css diff --git a/y9vue-interfacePlatform/src/assets/css/tablestatusfontcolor.css b/vue/y9vue-interfacePlatform/src/assets/css/tablestatusfontcolor.css similarity index 100% rename from y9vue-interfacePlatform/src/assets/css/tablestatusfontcolor.css rename to vue/y9vue-interfacePlatform/src/assets/css/tablestatusfontcolor.css diff --git a/y9vue-interfacePlatform/src/assets/font/yjsz.TTF b/vue/y9vue-interfacePlatform/src/assets/font/yjsz.TTF similarity index 100% rename from y9vue-interfacePlatform/src/assets/font/yjsz.TTF rename to vue/y9vue-interfacePlatform/src/assets/font/yjsz.TTF diff --git a/y9vue-interfacePlatform/src/assets/icons/png/cloud.png b/vue/y9vue-interfacePlatform/src/assets/icons/png/cloud.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/png/cloud.png rename to vue/y9vue-interfacePlatform/src/assets/icons/png/cloud.png diff --git a/y9vue-interfacePlatform/src/assets/icons/png/file.png b/vue/y9vue-interfacePlatform/src/assets/icons/png/file.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/png/file.png rename to vue/y9vue-interfacePlatform/src/assets/icons/png/file.png diff --git a/y9vue-interfacePlatform/src/assets/icons/png/folder-open.png b/vue/y9vue-interfacePlatform/src/assets/icons/png/folder-open.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/png/folder-open.png rename to vue/y9vue-interfacePlatform/src/assets/icons/png/folder-open.png diff --git a/y9vue-interfacePlatform/src/assets/icons/png/metro.png b/vue/y9vue-interfacePlatform/src/assets/icons/png/metro.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/png/metro.png rename to vue/y9vue-interfacePlatform/src/assets/icons/png/metro.png diff --git a/y9vue-interfacePlatform/src/assets/icons/png/node_home.png b/vue/y9vue-interfacePlatform/src/assets/icons/png/node_home.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/png/node_home.png rename to vue/y9vue-interfacePlatform/src/assets/icons/png/node_home.png diff --git a/y9vue-interfacePlatform/src/assets/icons/png/node_system.png b/vue/y9vue-interfacePlatform/src/assets/icons/png/node_system.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/png/node_system.png rename to vue/y9vue-interfacePlatform/src/assets/icons/png/node_system.png diff --git a/y9vue-interfacePlatform/src/assets/icons/png/search.png b/vue/y9vue-interfacePlatform/src/assets/icons/png/search.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/png/search.png rename to vue/y9vue-interfacePlatform/src/assets/icons/png/search.png diff --git a/y9vue-interfacePlatform/src/assets/icons/png/user_female.png b/vue/y9vue-interfacePlatform/src/assets/icons/png/user_female.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/png/user_female.png rename to vue/y9vue-interfacePlatform/src/assets/icons/png/user_female.png diff --git a/y9vue-interfacePlatform/src/assets/icons/png/user_gray.png b/vue/y9vue-interfacePlatform/src/assets/icons/png/user_gray.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/png/user_gray.png rename to vue/y9vue-interfacePlatform/src/assets/icons/png/user_gray.png diff --git a/y9vue-interfacePlatform/src/assets/icons/png/user_male.png b/vue/y9vue-interfacePlatform/src/assets/icons/png/user_male.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/png/user_male.png rename to vue/y9vue-interfacePlatform/src/assets/icons/png/user_male.png diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/ask.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/ask.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/ask.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/ask.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/chart.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/chart.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/chart.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/chart.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/components.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/components.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/components.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/components.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/control.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/control.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/control.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/control.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/editor.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/editor.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/editor.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/editor.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/history.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/history.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/history.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/history.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/home.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/home.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/home.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/home.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/image-text.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/image-text.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/image-text.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/image-text.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/layers.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/layers.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/layers.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/layers.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/message.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/message.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/message.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/message.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/monitoring.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/monitoring.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/monitoring.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/monitoring.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/other.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/other.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/other.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/other.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/page.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/page.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/page.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/page.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/pagedetails.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/pagedetails.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/pagedetails.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/pagedetails.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/pageform.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/pageform.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/pageform.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/pageform.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/pagelist.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/pagelist.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/pagelist.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/pagelist.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/roles.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/roles.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/roles.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/roles.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/s-fold.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/s-fold.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/s-fold.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/s-fold.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/s-unfold.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/s-unfold.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/s-unfold.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/s-unfold.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/set.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/set.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/set.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/set.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/tree.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/tree.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/tree.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/tree.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/users.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/users.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/users.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/users.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/svg/y9-logo.svg b/vue/y9vue-interfacePlatform/src/assets/icons/svg/y9-logo.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/svg/y9-logo.svg rename to vue/y9vue-interfacePlatform/src/assets/icons/svg/y9-logo.svg diff --git a/y9vue-interfacePlatform/src/assets/icons/treeIcon/chart_organization.png b/vue/y9vue-interfacePlatform/src/assets/icons/treeIcon/chart_organization.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/treeIcon/chart_organization.png rename to vue/y9vue-interfacePlatform/src/assets/icons/treeIcon/chart_organization.png diff --git a/y9vue-interfacePlatform/src/assets/icons/treeIcon/folder_user.png b/vue/y9vue-interfacePlatform/src/assets/icons/treeIcon/folder_user.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/treeIcon/folder_user.png rename to vue/y9vue-interfacePlatform/src/assets/icons/treeIcon/folder_user.png diff --git a/y9vue-interfacePlatform/src/assets/icons/treeIcon/group.png b/vue/y9vue-interfacePlatform/src/assets/icons/treeIcon/group.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/treeIcon/group.png rename to vue/y9vue-interfacePlatform/src/assets/icons/treeIcon/group.png diff --git a/y9vue-interfacePlatform/src/assets/icons/treeIcon/user_female.png b/vue/y9vue-interfacePlatform/src/assets/icons/treeIcon/user_female.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/treeIcon/user_female.png rename to vue/y9vue-interfacePlatform/src/assets/icons/treeIcon/user_female.png diff --git a/y9vue-interfacePlatform/src/assets/icons/treeIcon/user_male.png b/vue/y9vue-interfacePlatform/src/assets/icons/treeIcon/user_male.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/icons/treeIcon/user_male.png rename to vue/y9vue-interfacePlatform/src/assets/icons/treeIcon/user_male.png diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/arrow-down.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/arrow-down.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/arrow-down.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/arrow-down.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/arrow-left.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/arrow-left.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/arrow-left.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/arrow-left.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/arrow-left2.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/arrow-left2.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/arrow-left2.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/arrow-left2.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/arrow-right.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/arrow-right.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/arrow-right.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/arrow-right.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/arrow-right2.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/arrow-right2.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/arrow-right2.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/arrow-right2.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/arrow-up.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/arrow-up.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/arrow-up.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/arrow-up.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/bnb-fill.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/bnb-fill.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/bnb-fill.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/bnb-fill.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/chart.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/chart.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/chart.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/chart.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/close.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/close.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/close.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/close.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/close2.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/close2.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/close2.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/close2.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/components.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/components.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/components.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/components.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/control.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/control.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/control.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/control.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/detail.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/detail.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/detail.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/detail.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/edit.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/edit.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/edit.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/edit.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/editor.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/editor.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/editor.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/editor.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/home.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/home.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/home.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/home.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/icon.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/icon.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/icon.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/icon.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/language-outline.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/language-outline.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/language-outline.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/language-outline.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/list.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/list.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/list.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/list.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/menu-fold.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/menu-fold.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/menu-fold.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/menu-fold.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/menu-unfold.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/menu-unfold.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/menu-unfold.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/menu-unfold.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/message.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/message.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/message.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/message.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/more.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/more.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/more.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/more.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/page.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/page.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/page.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/page.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/permissions.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/permissions.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/permissions.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/permissions.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/pwd.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/pwd.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/pwd.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/pwd.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/refresh.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/refresh.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/refresh.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/refresh.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/search.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/search.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/search.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/search.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/set.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/set.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/set.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/set.svg diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/svgo.yml b/vue/y9vue-interfacePlatform/src/assets/iconsvg/svgo.yml similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/svgo.yml rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/svgo.yml diff --git a/y9vue-interfacePlatform/src/assets/iconsvg/user.svg b/vue/y9vue-interfacePlatform/src/assets/iconsvg/user.svg similarity index 100% rename from y9vue-interfacePlatform/src/assets/iconsvg/user.svg rename to vue/y9vue-interfacePlatform/src/assets/iconsvg/user.svg diff --git a/y9vue-interfacePlatform/src/assets/images/app-icon.png b/vue/y9vue-interfacePlatform/src/assets/images/app-icon.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/images/app-icon.png rename to vue/y9vue-interfacePlatform/src/assets/images/app-icon.png diff --git a/y9vue-interfacePlatform/src/assets/images/bg-smooth.jpg b/vue/y9vue-interfacePlatform/src/assets/images/bg-smooth.jpg similarity index 100% rename from y9vue-interfacePlatform/src/assets/images/bg-smooth.jpg rename to vue/y9vue-interfacePlatform/src/assets/images/bg-smooth.jpg diff --git a/y9vue-interfacePlatform/src/assets/images/bg.jpg b/vue/y9vue-interfacePlatform/src/assets/images/bg.jpg similarity index 100% rename from y9vue-interfacePlatform/src/assets/images/bg.jpg rename to vue/y9vue-interfacePlatform/src/assets/images/bg.jpg diff --git a/y9vue-interfacePlatform/src/assets/images/logo.png b/vue/y9vue-interfacePlatform/src/assets/images/logo.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/images/logo.png rename to vue/y9vue-interfacePlatform/src/assets/images/logo.png diff --git a/y9vue-interfacePlatform/src/assets/images/meeting.jpg b/vue/y9vue-interfacePlatform/src/assets/images/meeting.jpg similarity index 100% rename from y9vue-interfacePlatform/src/assets/images/meeting.jpg rename to vue/y9vue-interfacePlatform/src/assets/images/meeting.jpg diff --git a/y9vue-interfacePlatform/src/assets/images/menu-bg1.png b/vue/y9vue-interfacePlatform/src/assets/images/menu-bg1.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/images/menu-bg1.png rename to vue/y9vue-interfacePlatform/src/assets/images/menu-bg1.png diff --git a/y9vue-interfacePlatform/src/assets/images/menu-bg10.png b/vue/y9vue-interfacePlatform/src/assets/images/menu-bg10.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/images/menu-bg10.png rename to vue/y9vue-interfacePlatform/src/assets/images/menu-bg10.png diff --git a/y9vue-interfacePlatform/src/assets/images/menu-bg5.png b/vue/y9vue-interfacePlatform/src/assets/images/menu-bg5.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/images/menu-bg5.png rename to vue/y9vue-interfacePlatform/src/assets/images/menu-bg5.png diff --git a/y9vue-interfacePlatform/src/assets/images/menu-bg7.png b/vue/y9vue-interfacePlatform/src/assets/images/menu-bg7.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/images/menu-bg7.png rename to vue/y9vue-interfacePlatform/src/assets/images/menu-bg7.png diff --git a/y9vue-interfacePlatform/src/assets/images/menu-bg8.png b/vue/y9vue-interfacePlatform/src/assets/images/menu-bg8.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/images/menu-bg8.png rename to vue/y9vue-interfacePlatform/src/assets/images/menu-bg8.png diff --git a/y9vue-interfacePlatform/src/assets/images/menu-bg9.png b/vue/y9vue-interfacePlatform/src/assets/images/menu-bg9.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/images/menu-bg9.png rename to vue/y9vue-interfacePlatform/src/assets/images/menu-bg9.png diff --git a/y9vue-interfacePlatform/src/assets/images/touxiang.png b/vue/y9vue-interfacePlatform/src/assets/images/touxiang.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/images/touxiang.png rename to vue/y9vue-interfacePlatform/src/assets/images/touxiang.png diff --git a/y9vue-interfacePlatform/src/assets/images/youshengyunLogo.png b/vue/y9vue-interfacePlatform/src/assets/images/youshengyunLogo.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/images/youshengyunLogo.png rename to vue/y9vue-interfacePlatform/src/assets/images/youshengyunLogo.png diff --git a/y9vue-interfacePlatform/src/assets/images/yun.png b/vue/y9vue-interfacePlatform/src/assets/images/yun.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/images/yun.png rename to vue/y9vue-interfacePlatform/src/assets/images/yun.png diff --git a/y9vue-interfacePlatform/src/assets/images/yunLogo.png b/vue/y9vue-interfacePlatform/src/assets/images/yunLogo.png similarity index 100% rename from y9vue-interfacePlatform/src/assets/images/yunLogo.png rename to vue/y9vue-interfacePlatform/src/assets/images/yunLogo.png diff --git a/y9vue-interfacePlatform/src/language/en.json b/vue/y9vue-interfacePlatform/src/language/en.json similarity index 100% rename from y9vue-interfacePlatform/src/language/en.json rename to vue/y9vue-interfacePlatform/src/language/en.json diff --git a/y9vue-interfacePlatform/src/language/index.ts b/vue/y9vue-interfacePlatform/src/language/index.ts similarity index 100% rename from y9vue-interfacePlatform/src/language/index.ts rename to vue/y9vue-interfacePlatform/src/language/index.ts diff --git a/y9vue-interfacePlatform/src/language/zh.json b/vue/y9vue-interfacePlatform/src/language/zh.json similarity index 100% rename from y9vue-interfacePlatform/src/language/zh.json rename to vue/y9vue-interfacePlatform/src/language/zh.json diff --git a/y9vue-interfacePlatform/src/layouts/Y9-default/Left.vue b/vue/y9vue-interfacePlatform/src/layouts/Y9-default/Left.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/Y9-default/Left.vue rename to vue/y9vue-interfacePlatform/src/layouts/Y9-default/Left.vue diff --git a/y9vue-interfacePlatform/src/layouts/Y9-default/RightTop.vue b/vue/y9vue-interfacePlatform/src/layouts/Y9-default/RightTop.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/Y9-default/RightTop.vue rename to vue/y9vue-interfacePlatform/src/layouts/Y9-default/RightTop.vue diff --git a/y9vue-interfacePlatform/src/layouts/Y9-default/index.vue b/vue/y9vue-interfacePlatform/src/layouts/Y9-default/index.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/Y9-default/index.vue rename to vue/y9vue-interfacePlatform/src/layouts/Y9-default/index.vue diff --git a/y9vue-interfacePlatform/src/layouts/Y9-horizontal/Navs.vue b/vue/y9vue-interfacePlatform/src/layouts/Y9-horizontal/Navs.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/Y9-horizontal/Navs.vue rename to vue/y9vue-interfacePlatform/src/layouts/Y9-horizontal/Navs.vue diff --git a/y9vue-interfacePlatform/src/layouts/Y9-horizontal/RightTop.vue b/vue/y9vue-interfacePlatform/src/layouts/Y9-horizontal/RightTop.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/Y9-horizontal/RightTop.vue rename to vue/y9vue-interfacePlatform/src/layouts/Y9-horizontal/RightTop.vue diff --git a/y9vue-interfacePlatform/src/layouts/Y9-horizontal/index.vue b/vue/y9vue-interfacePlatform/src/layouts/Y9-horizontal/index.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/Y9-horizontal/index.vue rename to vue/y9vue-interfacePlatform/src/layouts/Y9-horizontal/index.vue diff --git a/y9vue-interfacePlatform/src/layouts/Y9-mobile/Left.vue b/vue/y9vue-interfacePlatform/src/layouts/Y9-mobile/Left.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/Y9-mobile/Left.vue rename to vue/y9vue-interfacePlatform/src/layouts/Y9-mobile/Left.vue diff --git a/y9vue-interfacePlatform/src/layouts/Y9-mobile/RightTop.vue b/vue/y9vue-interfacePlatform/src/layouts/Y9-mobile/RightTop.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/Y9-mobile/RightTop.vue rename to vue/y9vue-interfacePlatform/src/layouts/Y9-mobile/RightTop.vue diff --git a/y9vue-interfacePlatform/src/layouts/Y9-mobile/index.vue b/vue/y9vue-interfacePlatform/src/layouts/Y9-mobile/index.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/Y9-mobile/index.vue rename to vue/y9vue-interfacePlatform/src/layouts/Y9-mobile/index.vue diff --git a/y9vue-interfacePlatform/src/layouts/components/ALink/index.vue b/vue/y9vue-interfacePlatform/src/layouts/components/ALink/index.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/ALink/index.vue rename to vue/y9vue-interfacePlatform/src/layouts/components/ALink/index.vue diff --git a/y9vue-interfacePlatform/src/layouts/components/BreadCrumbs/index.vue b/vue/y9vue-interfacePlatform/src/layouts/components/BreadCrumbs/index.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/BreadCrumbs/index.vue rename to vue/y9vue-interfacePlatform/src/layouts/components/BreadCrumbs/index.vue diff --git a/y9vue-interfacePlatform/src/layouts/components/Icon.vue b/vue/y9vue-interfacePlatform/src/layouts/components/Icon.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/Icon.vue rename to vue/y9vue-interfacePlatform/src/layouts/components/Icon.vue diff --git a/y9vue-interfacePlatform/src/layouts/components/IconSvg/index.ts b/vue/y9vue-interfacePlatform/src/layouts/components/IconSvg/index.ts similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/IconSvg/index.ts rename to vue/y9vue-interfacePlatform/src/layouts/components/IconSvg/index.ts diff --git a/y9vue-interfacePlatform/src/layouts/components/IconSvg/index.vue b/vue/y9vue-interfacePlatform/src/layouts/components/IconSvg/index.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/IconSvg/index.vue rename to vue/y9vue-interfacePlatform/src/layouts/components/IconSvg/index.vue diff --git a/y9vue-interfacePlatform/src/layouts/components/IconSvg/plugin.ts b/vue/y9vue-interfacePlatform/src/layouts/components/IconSvg/plugin.ts similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/IconSvg/plugin.ts rename to vue/y9vue-interfacePlatform/src/layouts/components/IconSvg/plugin.ts diff --git a/y9vue-interfacePlatform/src/layouts/components/Lock/index.vue b/vue/y9vue-interfacePlatform/src/layouts/components/Lock/index.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/Lock/index.vue rename to vue/y9vue-interfacePlatform/src/layouts/components/Lock/index.vue diff --git a/y9vue-interfacePlatform/src/layouts/components/Lock/pass.vue b/vue/y9vue-interfacePlatform/src/layouts/components/Lock/pass.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/Lock/pass.vue rename to vue/y9vue-interfacePlatform/src/layouts/components/Lock/pass.vue diff --git a/y9vue-interfacePlatform/src/layouts/components/RightTabNav.vue b/vue/y9vue-interfacePlatform/src/layouts/components/RightTabNav.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/RightTabNav.vue rename to vue/y9vue-interfacePlatform/src/layouts/components/RightTabNav.vue diff --git a/y9vue-interfacePlatform/src/layouts/components/RightTopMessage.vue b/vue/y9vue-interfacePlatform/src/layouts/components/RightTopMessage.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/RightTopMessage.vue rename to vue/y9vue-interfacePlatform/src/layouts/components/RightTopMessage.vue diff --git a/y9vue-interfacePlatform/src/layouts/components/RightTopUser.vue b/vue/y9vue-interfacePlatform/src/layouts/components/RightTopUser.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/RightTopUser.vue rename to vue/y9vue-interfacePlatform/src/layouts/components/RightTopUser.vue diff --git a/y9vue-interfacePlatform/src/layouts/components/SettingsMobile.vue b/vue/y9vue-interfacePlatform/src/layouts/components/SettingsMobile.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/SettingsMobile.vue rename to vue/y9vue-interfacePlatform/src/layouts/components/SettingsMobile.vue diff --git a/y9vue-interfacePlatform/src/layouts/components/SiderMenu.vue b/vue/y9vue-interfacePlatform/src/layouts/components/SiderMenu.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/SiderMenu.vue rename to vue/y9vue-interfacePlatform/src/layouts/components/SiderMenu.vue diff --git a/y9vue-interfacePlatform/src/layouts/components/SiderMenuItem.vue b/vue/y9vue-interfacePlatform/src/layouts/components/SiderMenuItem.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/SiderMenuItem.vue rename to vue/y9vue-interfacePlatform/src/layouts/components/SiderMenuItem.vue diff --git a/y9vue-interfacePlatform/src/layouts/components/Tabs/index.vue b/vue/y9vue-interfacePlatform/src/layouts/components/Tabs/index.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/Tabs/index.vue rename to vue/y9vue-interfacePlatform/src/layouts/components/Tabs/index.vue diff --git a/y9vue-interfacePlatform/src/layouts/components/search/index.vue b/vue/y9vue-interfacePlatform/src/layouts/components/search/index.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/search/index.vue rename to vue/y9vue-interfacePlatform/src/layouts/components/search/index.vue diff --git a/y9vue-interfacePlatform/src/layouts/components/selectuser/index.vue b/vue/y9vue-interfacePlatform/src/layouts/components/selectuser/index.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/selectuser/index.vue rename to vue/y9vue-interfacePlatform/src/layouts/components/selectuser/index.vue diff --git a/y9vue-interfacePlatform/src/layouts/components/selectuser/selectuserDialog.vue b/vue/y9vue-interfacePlatform/src/layouts/components/selectuser/selectuserDialog.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/selectuser/selectuserDialog.vue rename to vue/y9vue-interfacePlatform/src/layouts/components/selectuser/selectuserDialog.vue diff --git a/y9vue-interfacePlatform/src/layouts/components/useTopMenuWidth.ts b/vue/y9vue-interfacePlatform/src/layouts/components/useTopMenuWidth.ts similarity index 100% rename from y9vue-interfacePlatform/src/layouts/components/useTopMenuWidth.ts rename to vue/y9vue-interfacePlatform/src/layouts/components/useTopMenuWidth.ts diff --git a/y9vue-interfacePlatform/src/layouts/index.vue b/vue/y9vue-interfacePlatform/src/layouts/index.vue similarity index 100% rename from y9vue-interfacePlatform/src/layouts/index.vue rename to vue/y9vue-interfacePlatform/src/layouts/index.vue diff --git a/y9vue-interfacePlatform/src/main.ts b/vue/y9vue-interfacePlatform/src/main.ts similarity index 100% rename from y9vue-interfacePlatform/src/main.ts rename to vue/y9vue-interfacePlatform/src/main.ts diff --git a/y9vue-interfacePlatform/src/router/checkRole.js b/vue/y9vue-interfacePlatform/src/router/checkRole.js similarity index 100% rename from y9vue-interfacePlatform/src/router/checkRole.js rename to vue/y9vue-interfacePlatform/src/router/checkRole.js diff --git a/y9vue-interfacePlatform/src/router/checkRouter-backup.js b/vue/y9vue-interfacePlatform/src/router/checkRouter-backup.js similarity index 100% rename from y9vue-interfacePlatform/src/router/checkRouter-backup.js rename to vue/y9vue-interfacePlatform/src/router/checkRouter-backup.js diff --git a/y9vue-interfacePlatform/src/router/checkRouter.js b/vue/y9vue-interfacePlatform/src/router/checkRouter.js similarity index 100% rename from y9vue-interfacePlatform/src/router/checkRouter.js rename to vue/y9vue-interfacePlatform/src/router/checkRouter.js diff --git a/y9vue-interfacePlatform/src/router/getInitData.js b/vue/y9vue-interfacePlatform/src/router/getInitData.js similarity index 100% rename from y9vue-interfacePlatform/src/router/getInitData.js rename to vue/y9vue-interfacePlatform/src/router/getInitData.js diff --git a/y9vue-interfacePlatform/src/router/index.ts b/vue/y9vue-interfacePlatform/src/router/index.ts similarity index 100% rename from y9vue-interfacePlatform/src/router/index.ts rename to vue/y9vue-interfacePlatform/src/router/index.ts diff --git a/y9vue-interfacePlatform/src/router/modules/approveRouter.ts b/vue/y9vue-interfacePlatform/src/router/modules/approveRouter.ts similarity index 100% rename from y9vue-interfacePlatform/src/router/modules/approveRouter.ts rename to vue/y9vue-interfacePlatform/src/router/modules/approveRouter.ts diff --git a/y9vue-interfacePlatform/src/router/modules/authInfoRouter.ts b/vue/y9vue-interfacePlatform/src/router/modules/authInfoRouter.ts similarity index 100% rename from y9vue-interfacePlatform/src/router/modules/authInfoRouter.ts rename to vue/y9vue-interfacePlatform/src/router/modules/authInfoRouter.ts diff --git a/y9vue-interfacePlatform/src/router/modules/blacklistingRouter.ts b/vue/y9vue-interfacePlatform/src/router/modules/blacklistingRouter.ts similarity index 100% rename from y9vue-interfacePlatform/src/router/modules/blacklistingRouter.ts rename to vue/y9vue-interfacePlatform/src/router/modules/blacklistingRouter.ts diff --git a/y9vue-interfacePlatform/src/router/modules/flowInfoRouter.ts b/vue/y9vue-interfacePlatform/src/router/modules/flowInfoRouter.ts similarity index 100% rename from y9vue-interfacePlatform/src/router/modules/flowInfoRouter.ts rename to vue/y9vue-interfacePlatform/src/router/modules/flowInfoRouter.ts diff --git a/y9vue-interfacePlatform/src/router/modules/homeRouter.ts b/vue/y9vue-interfacePlatform/src/router/modules/homeRouter.ts similarity index 100% rename from y9vue-interfacePlatform/src/router/modules/homeRouter.ts rename to vue/y9vue-interfacePlatform/src/router/modules/homeRouter.ts diff --git a/y9vue-interfacePlatform/src/router/modules/interfaceRegister.ts b/vue/y9vue-interfacePlatform/src/router/modules/interfaceRegister.ts similarity index 100% rename from y9vue-interfacePlatform/src/router/modules/interfaceRegister.ts rename to vue/y9vue-interfacePlatform/src/router/modules/interfaceRegister.ts diff --git a/y9vue-interfacePlatform/src/router/modules/interfaceRouter.ts b/vue/y9vue-interfacePlatform/src/router/modules/interfaceRouter.ts similarity index 100% rename from y9vue-interfacePlatform/src/router/modules/interfaceRouter.ts rename to vue/y9vue-interfacePlatform/src/router/modules/interfaceRouter.ts diff --git a/y9vue-interfacePlatform/src/router/modules/logMonitoringRouter.ts b/vue/y9vue-interfacePlatform/src/router/modules/logMonitoringRouter.ts similarity index 100% rename from y9vue-interfacePlatform/src/router/modules/logMonitoringRouter.ts rename to vue/y9vue-interfacePlatform/src/router/modules/logMonitoringRouter.ts diff --git a/y9vue-interfacePlatform/src/router/modules/mangeInterfaceRouter.ts b/vue/y9vue-interfacePlatform/src/router/modules/mangeInterfaceRouter.ts similarity index 100% rename from y9vue-interfacePlatform/src/router/modules/mangeInterfaceRouter.ts rename to vue/y9vue-interfacePlatform/src/router/modules/mangeInterfaceRouter.ts diff --git a/y9vue-interfacePlatform/src/router/modules/systemidentifierRouter.ts b/vue/y9vue-interfacePlatform/src/router/modules/systemidentifierRouter.ts similarity index 100% rename from y9vue-interfacePlatform/src/router/modules/systemidentifierRouter.ts rename to vue/y9vue-interfacePlatform/src/router/modules/systemidentifierRouter.ts diff --git a/y9vue-interfacePlatform/src/router/modules/testInterfaceRouter.ts b/vue/y9vue-interfacePlatform/src/router/modules/testInterfaceRouter.ts similarity index 100% rename from y9vue-interfacePlatform/src/router/modules/testInterfaceRouter.ts rename to vue/y9vue-interfacePlatform/src/router/modules/testInterfaceRouter.ts diff --git a/y9vue-interfacePlatform/src/settings.ts b/vue/y9vue-interfacePlatform/src/settings.ts similarity index 100% rename from y9vue-interfacePlatform/src/settings.ts rename to vue/y9vue-interfacePlatform/src/settings.ts diff --git a/y9vue-interfacePlatform/src/store/index.ts b/vue/y9vue-interfacePlatform/src/store/index.ts similarity index 100% rename from y9vue-interfacePlatform/src/store/index.ts rename to vue/y9vue-interfacePlatform/src/store/index.ts diff --git a/y9vue-interfacePlatform/src/store/modules/routerStore.ts b/vue/y9vue-interfacePlatform/src/store/modules/routerStore.ts similarity index 100% rename from y9vue-interfacePlatform/src/store/modules/routerStore.ts rename to vue/y9vue-interfacePlatform/src/store/modules/routerStore.ts diff --git a/y9vue-interfacePlatform/src/store/modules/settingStore.ts b/vue/y9vue-interfacePlatform/src/store/modules/settingStore.ts similarity index 100% rename from y9vue-interfacePlatform/src/store/modules/settingStore.ts rename to vue/y9vue-interfacePlatform/src/store/modules/settingStore.ts diff --git a/y9vue-interfacePlatform/src/theme/blue/blue.scss b/vue/y9vue-interfacePlatform/src/theme/blue/blue.scss similarity index 100% rename from y9vue-interfacePlatform/src/theme/blue/blue.scss rename to vue/y9vue-interfacePlatform/src/theme/blue/blue.scss diff --git a/y9vue-interfacePlatform/src/theme/dark/dark.scss b/vue/y9vue-interfacePlatform/src/theme/dark/dark.scss similarity index 100% rename from y9vue-interfacePlatform/src/theme/dark/dark.scss rename to vue/y9vue-interfacePlatform/src/theme/dark/dark.scss diff --git a/y9vue-interfacePlatform/src/theme/default/default.scss b/vue/y9vue-interfacePlatform/src/theme/default/default.scss similarity index 100% rename from y9vue-interfacePlatform/src/theme/default/default.scss rename to vue/y9vue-interfacePlatform/src/theme/default/default.scss diff --git a/y9vue-interfacePlatform/src/theme/global-vars.scss b/vue/y9vue-interfacePlatform/src/theme/global-vars.scss similarity index 100% rename from y9vue-interfacePlatform/src/theme/global-vars.scss rename to vue/y9vue-interfacePlatform/src/theme/global-vars.scss diff --git a/y9vue-interfacePlatform/src/theme/global.scss b/vue/y9vue-interfacePlatform/src/theme/global.scss similarity index 100% rename from y9vue-interfacePlatform/src/theme/global.scss rename to vue/y9vue-interfacePlatform/src/theme/global.scss diff --git a/y9vue-interfacePlatform/src/theme/green/green.scss b/vue/y9vue-interfacePlatform/src/theme/green/green.scss similarity index 89% rename from y9vue-interfacePlatform/src/theme/green/green.scss rename to vue/y9vue-interfacePlatform/src/theme/green/green.scss index 2f0d8d7..a16ebe9 100644 --- a/y9vue-interfacePlatform/src/theme/green/green.scss +++ b/vue/y9vue-interfacePlatform/src/theme/green/green.scss @@ -5,7 +5,7 @@ ), ), $bg-color: ("":"#ffffff !default"), - $color-info: #ddd!default + $color-info: #ddd !default ); // .theme-test2:root { diff --git a/y9vue-interfacePlatform/src/utils/directive.ts b/vue/y9vue-interfacePlatform/src/utils/directive.ts similarity index 100% rename from y9vue-interfacePlatform/src/utils/directive.ts rename to vue/y9vue-interfacePlatform/src/utils/directive.ts diff --git a/y9vue-interfacePlatform/src/utils/echarts.ts b/vue/y9vue-interfacePlatform/src/utils/echarts.ts similarity index 100% rename from y9vue-interfacePlatform/src/utils/echarts.ts rename to vue/y9vue-interfacePlatform/src/utils/echarts.ts diff --git a/y9vue-interfacePlatform/src/utils/index.ts b/vue/y9vue-interfacePlatform/src/utils/index.ts similarity index 100% rename from y9vue-interfacePlatform/src/utils/index.ts rename to vue/y9vue-interfacePlatform/src/utils/index.ts diff --git a/y9vue-interfacePlatform/src/utils/object.ts b/vue/y9vue-interfacePlatform/src/utils/object.ts similarity index 100% rename from y9vue-interfacePlatform/src/utils/object.ts rename to vue/y9vue-interfacePlatform/src/utils/object.ts diff --git a/y9vue-interfacePlatform/src/utils/routes.ts b/vue/y9vue-interfacePlatform/src/utils/routes.ts similarity index 100% rename from y9vue-interfacePlatform/src/utils/routes.ts rename to vue/y9vue-interfacePlatform/src/utils/routes.ts diff --git a/y9vue-interfacePlatform/src/utils/storage.js b/vue/y9vue-interfacePlatform/src/utils/storage.js similarity index 100% rename from y9vue-interfacePlatform/src/utils/storage.js rename to vue/y9vue-interfacePlatform/src/utils/storage.js diff --git a/y9vue-interfacePlatform/src/utils/validate.ts b/vue/y9vue-interfacePlatform/src/utils/validate.ts similarity index 100% rename from y9vue-interfacePlatform/src/utils/validate.ts rename to vue/y9vue-interfacePlatform/src/utils/validate.ts diff --git a/y9vue-interfacePlatform/src/utils/watermark.ts b/vue/y9vue-interfacePlatform/src/utils/watermark.ts similarity index 100% rename from y9vue-interfacePlatform/src/utils/watermark.ts rename to vue/y9vue-interfacePlatform/src/utils/watermark.ts diff --git a/y9vue-interfacePlatform/src/views/401/index.vue b/vue/y9vue-interfacePlatform/src/views/401/index.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/401/index.vue rename to vue/y9vue-interfacePlatform/src/views/401/index.vue diff --git a/y9vue-interfacePlatform/src/views/404/index.vue b/vue/y9vue-interfacePlatform/src/views/404/index.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/404/index.vue rename to vue/y9vue-interfacePlatform/src/views/404/index.vue diff --git a/y9vue-interfacePlatform/src/views/approve/applyInfo.vue b/vue/y9vue-interfacePlatform/src/views/approve/applyInfo.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/approve/applyInfo.vue rename to vue/y9vue-interfacePlatform/src/views/approve/applyInfo.vue diff --git a/y9vue-interfacePlatform/src/views/approve/approve.vue b/vue/y9vue-interfacePlatform/src/views/approve/approve.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/approve/approve.vue rename to vue/y9vue-interfacePlatform/src/views/approve/approve.vue diff --git a/y9vue-interfacePlatform/src/views/approve/authDialog.vue b/vue/y9vue-interfacePlatform/src/views/approve/authDialog.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/approve/authDialog.vue rename to vue/y9vue-interfacePlatform/src/views/approve/authDialog.vue diff --git a/y9vue-interfacePlatform/src/views/approve/index.vue b/vue/y9vue-interfacePlatform/src/views/approve/index.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/approve/index.vue rename to vue/y9vue-interfacePlatform/src/views/approve/index.vue diff --git a/y9vue-interfacePlatform/src/views/auth/dictVal.vue b/vue/y9vue-interfacePlatform/src/views/auth/dictVal.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/auth/dictVal.vue rename to vue/y9vue-interfacePlatform/src/views/auth/dictVal.vue diff --git a/y9vue-interfacePlatform/src/views/auth/index.vue b/vue/y9vue-interfacePlatform/src/views/auth/index.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/auth/index.vue rename to vue/y9vue-interfacePlatform/src/views/auth/index.vue diff --git a/y9vue-interfacePlatform/src/views/auth/interfaceAuth.vue b/vue/y9vue-interfacePlatform/src/views/auth/interfaceAuth.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/auth/interfaceAuth.vue rename to vue/y9vue-interfacePlatform/src/views/auth/interfaceAuth.vue diff --git a/y9vue-interfacePlatform/src/views/auth/interfaceDictVal.vue b/vue/y9vue-interfacePlatform/src/views/auth/interfaceDictVal.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/auth/interfaceDictVal.vue rename to vue/y9vue-interfacePlatform/src/views/auth/interfaceDictVal.vue diff --git a/y9vue-interfacePlatform/src/views/blacklisting/blacklisting.vue b/vue/y9vue-interfacePlatform/src/views/blacklisting/blacklisting.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/blacklisting/blacklisting.vue rename to vue/y9vue-interfacePlatform/src/views/blacklisting/blacklisting.vue diff --git a/y9vue-interfacePlatform/src/views/flownode/flow.vue b/vue/y9vue-interfacePlatform/src/views/flownode/flow.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/flownode/flow.vue rename to vue/y9vue-interfacePlatform/src/views/flownode/flow.vue diff --git a/y9vue-interfacePlatform/src/views/flownode/flowChart.vue b/vue/y9vue-interfacePlatform/src/views/flownode/flowChart.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/flownode/flowChart.vue rename to vue/y9vue-interfacePlatform/src/views/flownode/flowChart.vue diff --git a/y9vue-interfacePlatform/src/views/flownode/flowNode.vue b/vue/y9vue-interfacePlatform/src/views/flownode/flowNode.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/flownode/flowNode.vue rename to vue/y9vue-interfacePlatform/src/views/flownode/flowNode.vue diff --git a/y9vue-interfacePlatform/src/views/flownode/flowNodeSort.vue b/vue/y9vue-interfacePlatform/src/views/flownode/flowNodeSort.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/flownode/flowNodeSort.vue rename to vue/y9vue-interfacePlatform/src/views/flownode/flowNodeSort.vue diff --git a/y9vue-interfacePlatform/src/views/home/home.vue b/vue/y9vue-interfacePlatform/src/views/home/home.vue similarity index 99% rename from y9vue-interfacePlatform/src/views/home/home.vue rename to vue/y9vue-interfacePlatform/src/views/home/home.vue index 909cb39..a9bd1d6 100644 --- a/y9vue-interfacePlatform/src/views/home/home.vue +++ b/vue/y9vue-interfacePlatform/src/views/home/home.vue @@ -182,10 +182,10 @@ const fetchTrendData = async () => { }; updateTrendChart(); } else { - // ElMessage.error('获取接口趋势图数据失败'); + ElMessage.error('获取接口趋势图数据失败'); } } catch (error) { - // console.error('获取接口趋势图数据失败:', error); + console.error('获取接口趋势图数据失败:', error); } }; @@ -194,7 +194,7 @@ async function fetchLogOverviewData() { try { const res = await getLogOverview(); if (res.code === '0') { - // logOverviewData.value.allTotal = res.data.allTotal || 0; + logOverviewData.value.allTotal = res.data.allTotal || 0; logOverviewData.value.allErrorTotal = res.data.allErrorTotal || 0; logOverviewData.value.todayAllTotal = res.data.todayAllTotal || 0; logOverviewData.value.todayAllErrorTotal = res.data.todayAllErrorTotal || 0; diff --git a/y9vue-interfacePlatform/src/views/interface/applyInfo.vue b/vue/y9vue-interfacePlatform/src/views/interface/applyInfo.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/interface/applyInfo.vue rename to vue/y9vue-interfacePlatform/src/views/interface/applyInfo.vue diff --git a/y9vue-interfacePlatform/src/views/interface/authApplyInfo.vue b/vue/y9vue-interfacePlatform/src/views/interface/authApplyInfo.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/interface/authApplyInfo.vue rename to vue/y9vue-interfacePlatform/src/views/interface/authApplyInfo.vue diff --git a/y9vue-interfacePlatform/src/views/interface/authDialog.vue b/vue/y9vue-interfacePlatform/src/views/interface/authDialog.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/interface/authDialog.vue rename to vue/y9vue-interfacePlatform/src/views/interface/authDialog.vue diff --git a/y9vue-interfacePlatform/src/views/interface/flowShow.vue b/vue/y9vue-interfacePlatform/src/views/interface/flowShow.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/interface/flowShow.vue rename to vue/y9vue-interfacePlatform/src/views/interface/flowShow.vue diff --git a/y9vue-interfacePlatform/src/views/interface/index.vue b/vue/y9vue-interfacePlatform/src/views/interface/index.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/interface/index.vue rename to vue/y9vue-interfacePlatform/src/views/interface/index.vue diff --git a/y9vue-interfacePlatform/src/views/interface/interfaceApply-back.vue b/vue/y9vue-interfacePlatform/src/views/interface/interfaceApply-back.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/interface/interfaceApply-back.vue rename to vue/y9vue-interfacePlatform/src/views/interface/interfaceApply-back.vue diff --git a/y9vue-interfacePlatform/src/views/interface/interfaceApply.vue b/vue/y9vue-interfacePlatform/src/views/interface/interfaceApply.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/interface/interfaceApply.vue rename to vue/y9vue-interfacePlatform/src/views/interface/interfaceApply.vue diff --git a/y9vue-interfacePlatform/src/views/interface/interfaceApplyDialog-back.vue b/vue/y9vue-interfacePlatform/src/views/interface/interfaceApplyDialog-back.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/interface/interfaceApplyDialog-back.vue rename to vue/y9vue-interfacePlatform/src/views/interface/interfaceApplyDialog-back.vue diff --git a/y9vue-interfacePlatform/src/views/interface/interfaceApplyDialog.vue b/vue/y9vue-interfacePlatform/src/views/interface/interfaceApplyDialog.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/interface/interfaceApplyDialog.vue rename to vue/y9vue-interfacePlatform/src/views/interface/interfaceApplyDialog.vue diff --git a/y9vue-interfacePlatform/src/views/interface/interfaceApplyInfo.vue b/vue/y9vue-interfacePlatform/src/views/interface/interfaceApplyInfo.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/interface/interfaceApplyInfo.vue rename to vue/y9vue-interfacePlatform/src/views/interface/interfaceApplyInfo.vue diff --git a/y9vue-interfacePlatform/src/views/interface/interfaceApplyTable.vue b/vue/y9vue-interfacePlatform/src/views/interface/interfaceApplyTable.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/interface/interfaceApplyTable.vue rename to vue/y9vue-interfacePlatform/src/views/interface/interfaceApplyTable.vue diff --git a/y9vue-interfacePlatform/src/views/interface/interfaceDialog.vue b/vue/y9vue-interfacePlatform/src/views/interface/interfaceDialog.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/interface/interfaceDialog.vue rename to vue/y9vue-interfacePlatform/src/views/interface/interfaceDialog.vue diff --git a/y9vue-interfacePlatform/src/views/interface/interfaceDialogApplyTable.vue b/vue/y9vue-interfacePlatform/src/views/interface/interfaceDialogApplyTable.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/interface/interfaceDialogApplyTable.vue rename to vue/y9vue-interfacePlatform/src/views/interface/interfaceDialogApplyTable.vue diff --git a/y9vue-interfacePlatform/src/views/interface/interfaceRegister-back-全局加载样式.vue b/vue/y9vue-interfacePlatform/src/views/interface/interfaceRegister-back-全局加载样式.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/interface/interfaceRegister-back-全局加载样式.vue rename to vue/y9vue-interfacePlatform/src/views/interface/interfaceRegister-back-全局加载样式.vue diff --git a/y9vue-interfacePlatform/src/views/interface/interfaceRegister.vue b/vue/y9vue-interfacePlatform/src/views/interface/interfaceRegister.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/interface/interfaceRegister.vue rename to vue/y9vue-interfacePlatform/src/views/interface/interfaceRegister.vue diff --git a/y9vue-interfacePlatform/src/views/interface/logMonitoringIndex.vue b/vue/y9vue-interfacePlatform/src/views/interface/logMonitoringIndex.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/interface/logMonitoringIndex.vue rename to vue/y9vue-interfacePlatform/src/views/interface/logMonitoringIndex.vue diff --git a/y9vue-interfacePlatform/src/views/interface/pubOrStop.vue b/vue/y9vue-interfacePlatform/src/views/interface/pubOrStop.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/interface/pubOrStop.vue rename to vue/y9vue-interfacePlatform/src/views/interface/pubOrStop.vue diff --git a/y9vue-interfacePlatform/src/views/interfaceTest/testDialog.vue b/vue/y9vue-interfacePlatform/src/views/interfaceTest/testDialog.vue similarity index 99% rename from y9vue-interfacePlatform/src/views/interfaceTest/testDialog.vue rename to vue/y9vue-interfacePlatform/src/views/interfaceTest/testDialog.vue index c409a89..a43f707 100644 --- a/y9vue-interfacePlatform/src/views/interfaceTest/testDialog.vue +++ b/vue/y9vue-interfacePlatform/src/views/interfaceTest/testDialog.vue @@ -904,7 +904,7 @@ function confirDialog(type) { async function addDialog() { ruleFormConfig.value.model = {} ruleFormConfig.value.model.networkAgreement = "http" - ruleFormConfig.value.model.interfaceUrl = "" + ruleFormConfig.value.model.interfaceUrl = "192.168.31.94:7055/interfacePlatform/openInterface/test" ruleFormConfig.value.model.interfaceType = "Rest" ruleFormConfig.value.model.interfaceMethod = "post" ruleFormConfig.value.model.isResponseFile = "false" diff --git a/y9vue-interfacePlatform/src/views/parameter/limitinfo.vue b/vue/y9vue-interfacePlatform/src/views/parameter/limitinfo.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/parameter/limitinfo.vue rename to vue/y9vue-interfacePlatform/src/views/parameter/limitinfo.vue diff --git a/y9vue-interfacePlatform/src/views/parameter/parameter.vue b/vue/y9vue-interfacePlatform/src/views/parameter/parameter.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/parameter/parameter.vue rename to vue/y9vue-interfacePlatform/src/views/parameter/parameter.vue diff --git a/y9vue-interfacePlatform/src/views/parameter/parameterTable.vue b/vue/y9vue-interfacePlatform/src/views/parameter/parameterTable.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/parameter/parameterTable.vue rename to vue/y9vue-interfacePlatform/src/views/parameter/parameterTable.vue diff --git a/y9vue-interfacePlatform/src/views/systemidentifier/dictVal.vue b/vue/y9vue-interfacePlatform/src/views/systemidentifier/dictVal.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/systemidentifier/dictVal.vue rename to vue/y9vue-interfacePlatform/src/views/systemidentifier/dictVal.vue diff --git a/y9vue-interfacePlatform/src/views/systemidentifier/index.vue b/vue/y9vue-interfacePlatform/src/views/systemidentifier/index.vue similarity index 100% rename from y9vue-interfacePlatform/src/views/systemidentifier/index.vue rename to vue/y9vue-interfacePlatform/src/views/systemidentifier/index.vue diff --git a/y9vue-interfacePlatform/tsconfig.json b/vue/y9vue-interfacePlatform/tsconfig.json similarity index 100% rename from y9vue-interfacePlatform/tsconfig.json rename to vue/y9vue-interfacePlatform/tsconfig.json diff --git a/y9vue-interfacePlatform/vite.config.js b/vue/y9vue-interfacePlatform/vite.config.js similarity index 98% rename from y9vue-interfacePlatform/vite.config.js rename to vue/y9vue-interfacePlatform/vite.config.js index 8da94e5..40911ba 100644 --- a/y9vue-interfacePlatform/vite.config.js +++ b/vue/y9vue-interfacePlatform/vite.config.js @@ -36,7 +36,7 @@ export default (serve) => { }, server: { port: 7070, - // host: '127.0.0.1', // 局域网内测试【填写你的当前IP】 + // host: '192.168.31.222', // 局域网内测试【填写你的当前IP】 proxy: { '/.*/sso': { target: process.env.VUE_APP_SSO, diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/pom.xml b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/pom.xml new file mode 100644 index 0000000..851576e --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + + net.risesoft + y9-digitalbase + v9.6.8-SNAPSHOT + + + + net.risesoft + risenet-y9boot-support-interface-jpa-repository + jar + + + 11 + 11 + true + UTF-8 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + com.mysql + mysql-connector-j + runtime + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + com.fasterxml.jackson.core + jackson-databind + 2.13.0 + + + + diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/ApproveDTO.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/ApproveDTO.java new file mode 100644 index 0000000..1f0ce56 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/ApproveDTO.java @@ -0,0 +1,68 @@ +package net.risesoft.y9public.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; +import net.risesoft.y9public.entity.Approve; +import net.risesoft.y9public.entity.BaseEntity; + +import java.io.Serializable; + +@Data +@NoArgsConstructor +public class ApproveDTO extends BaseEntity implements Serializable{ + + private static final long serialVersionUID = 3121652146259274217L; + + private String id; + + private String interfaceId; + + private String applyId; + + private String illustrate; + + private String approveStatus; + + private String notes; + + private String personName; + + private String personId; + + private String interfaceStatus; + + private String isOver; + + private String isNew; + + private String interfaceName; + + private String version; + + private String approveOption; + + private String flowNode; + + private String alreadyApproveUser; + + private String currentUserId; + + private String currentNode; + + public ApproveDTO(Approve dto) { + this.id = dto.getId(); + this.interfaceId = dto.getInterfaceId(); + this.illustrate = dto.getIllustrate(); + this.approveStatus = dto.getApproveStatus(); + this.notes = dto.getNotes(); + this.personName = dto.getPersonName(); + this.personId = dto.getPersonId(); + this.interfaceStatus = dto.getInterfaceStatus(); + this.isOver = dto.getIsOver(); + this.flowNode = dto.getFlowNode(); + this.alreadyApproveUser = dto.getAlreadyApproveUser(); + this.currentUserId = dto.getCurrentUserId(); + this.currentNode = dto.getCurrentNode(); + } +} + diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/AuthDictDTO.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/AuthDictDTO.java new file mode 100644 index 0000000..998aa3e --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/AuthDictDTO.java @@ -0,0 +1,66 @@ +package net.risesoft.y9public.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; +import net.risesoft.y9public.entity.AuthDict; +import net.risesoft.y9public.entity.BaseEntity; + +import java.io.Serializable; + +@Data +@NoArgsConstructor +public class AuthDictDTO extends BaseEntity implements Serializable{ + + private static final long serialVersionUID = 3121642144259272227L; + + private String id; + + private String interfaceId; + + private String parameterName; + + private String fieldName; + + private String fieldVal; + + private String showVal; + + private String parameterType; + + private String parameterId; + + private String isDelete; + + private String pid; + + private Integer sort; + + private String isTree; + + private String isPrimary; + + private String personId; + + private String personName; + + private Boolean hasChildren; + + public AuthDictDTO(AuthDict dto) { + this.id = dto.getId(); + this.interfaceId = dto.getInterfaceId(); + this.parameterName = dto.getParameterName(); + this.fieldName = dto.getFieldName(); + this.fieldVal = dto.getFieldVal(); + this.showVal = dto.getShowVal(); + this.parameterType = dto.getParameterType(); + this.parameterId = dto.getParameterId(); + this.isDelete = dto.getIsDelete(); + this.pid = dto.getPid(); + this.sort = dto.getSort(); + this.isTree = dto.getIsTree(); + this.isPrimary = dto.getIsPrimary(); + this.personId = dto.getPersonId(); + this.personName = dto.getPersonName(); + } +} + diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/InterfaceApplyDTO.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/InterfaceApplyDTO.java new file mode 100644 index 0000000..264fbf9 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/InterfaceApplyDTO.java @@ -0,0 +1,92 @@ +package net.risesoft.y9public.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; +import net.risesoft.y9public.entity.InterfaceApply; + +import java.io.Serializable; + +@Data +@NoArgsConstructor +public class InterfaceApplyDTO implements Serializable{ + + private static final long serialVersionUID = 3121642146259274227L; + + private String id; + + private String interfaceId; + + private String applyPersonName; + + private String applyPersonId; + + private String systemIdentifier; + + private String applySystemName; + + private String auth; + + private String applyPersonDeptName; + + private String applyPersonDeptId; + + private String usePersonResponsible; + + private String usePersonResponsiblePhone; + + private String notes; + + private String applyTime; + + private String applyReason; + + private String applyType; + + private String userKey; + + private String userSecret; + + private String ipWhitelist; + + private String applyStopTime; + + private String oldId; + + private String sameId; + + private String dataType; + + private String isEffective; + + private String flowId; + + private String userData; + + + public InterfaceApplyDTO(InterfaceApply dto) { + this.id = dto.getId(); + this.interfaceId = dto.getInterfaceId(); + this.applyPersonName = dto.getApplyPersonName(); + this.applyPersonId = dto.getApplyPersonId(); + this.systemIdentifier = dto.getSystemIdentifier(); + this.auth = dto.getAuth(); + this.applyPersonDeptName = dto.getApplyPersonDeptName(); + this.usePersonResponsible = dto.getUsePersonResponsible(); + this.usePersonResponsiblePhone = dto.getUsePersonResponsiblePhone(); + this.notes = dto.getNotes(); + this.applyTime = dto.getApplyTime(); + this.applyReason = dto.getApplyReason(); + this.applyType = dto.getApplyType(); + this.userKey = dto.getUserKey(); + this.userSecret = dto.getUserSecret(); + this.ipWhitelist = dto.getIpWhitelist(); + this.applyStopTime = dto.getApplyStopTime(); + this.oldId = dto.getOldId(); + this.sameId = dto.getSameId(); + this.dataType = dto.getDataType(); + this.isEffective = dto.getIsEffective(); + this.applySystemName = dto.getApplySystemName(); + this.applyPersonDeptId = dto.getApplyPersonDeptId(); + } +} + diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/InterfaceManageDTO.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/InterfaceManageDTO.java new file mode 100644 index 0000000..32d6467 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/InterfaceManageDTO.java @@ -0,0 +1,143 @@ +package net.risesoft.y9public.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; +import net.risesoft.y9public.entity.BaseEntity; +import net.risesoft.y9public.entity.InterfaceLimitInfo; +import net.risesoft.y9public.entity.InterfaceManage; +import net.risesoft.y9public.entity.Parameter; + +import java.io.Serializable; +import java.util.List; + +@Data +@NoArgsConstructor +public class InterfaceManageDTO extends BaseEntity implements Serializable{ + + private static final long serialVersionUID = 3226632145259274287L; + + + private String id; + + private String interfaceName; + + private String sameInterfaceId; + + private String interfaceUrl; + + private String parameterIds; + + private String isAuth; + + private String isLimit; + + private String isBack; + + private String illustrate; + + private String interfaceType; + + private String interfaceStatus; + + private String interfaceMethod; + + private String version; + + private String notes; + + private String personName; + + private String personId; + + private String deptInfo; + + private String deptId; + + private String systemName; + + private String systemId; + + private String head; + + private String isOverwrite; + + private String interfaceFileUrl; + + private String interfaceFileName; + + private String isDelete; + + private String isTest; + + private String networkAgreement; + + private String headPhone; + + private String overwriteInterfaceId; + + private String nameSpace; + + private String method; + + private String webSpecification; + + private Integer page; + + private Integer limit; + + private String parameters; + + private String resParameters; + + private String reqParameters; + + private String limitInfo; + + private String approveStatus; + + private String mayApply; + + private String isLimitData; + + private List parameterList; + + private InterfaceLimitInfo limitInfoEntity; + + private Boolean isResponseFile; + + public InterfaceManageDTO(InterfaceManage dto) { + this.id = dto.getId(); + this.interfaceName = dto.getInterfaceName(); + this.sameInterfaceId = dto.getSameInterfaceId(); + this.interfaceUrl = dto.getInterfaceUrl(); + this.parameterIds = dto.getParameterIds(); + this.isAuth = dto.getIsAuth(); + this.isLimit = dto.getIsLimit(); + this.illustrate = dto.getIllustrate(); + this.interfaceType = dto.getInterfaceType(); + this.interfaceStatus = dto.getInterfaceStatus(); + this.interfaceMethod = dto.getInterfaceMethod(); + this.version = dto.getVersion(); + this.notes = dto.getNotes(); + this.personName = dto.getPersonName(); + this.personId = dto.getPersonId(); + this.deptInfo = dto.getDeptInfo(); + this.head = dto.getHead(); + this.isOverwrite = dto.getIsOverwrite(); + this.interfaceFileUrl = dto.getInterfaceFileUrl(); + this.isDelete = dto.getIsDelete(); + this.isTest = dto.getIsTest(); + this.networkAgreement = dto.getNetworkAgreement(); + this.headPhone = dto.getHeadPhone(); + this.overwriteInterfaceId = dto.getOverwriteInterfaceId(); + this.nameSpace = dto.getNameSpace(); + this.method = dto.getMethod(); + this.webSpecification = dto.getWebSpecification(); + this.isLimitData = dto.getIsLimitData(); + this.deptId = dto.getDeptId(); + this.systemId = dto.getSystemId(); + this.systemName = dto.getSystemName(); + this.isResponseFile = dto.getIsResponseFile(); + } +} + diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/ParameterDTO.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/ParameterDTO.java new file mode 100644 index 0000000..0998b73 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/ParameterDTO.java @@ -0,0 +1,63 @@ +package net.risesoft.y9public.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; +import net.risesoft.y9public.entity.Parameter; + +import java.io.Serializable; +import java.util.List; + +@Data +@NoArgsConstructor +public class ParameterDTO implements Serializable{ + + private static final long serialVersionUID = 3821646146259274267L; + + private String id; + + private String interfaceId; + + private String parameterKey; + + private String val; + + private String defaultVal; + + private String parameterType; + + private String required; + + private String notes; + + private String personId; + + private String parameterStatus; + + private String pid; + + private Integer level; + + private Integer sort; + + private String isItems; + + private List children; + + public ParameterDTO(Parameter dto) { + this.id = dto.getId(); + this.interfaceId = dto.getInterfaceId(); + this.parameterKey = dto.getParameterKey(); + this.val = dto.getVal(); + this.defaultVal = dto.getDefaultVal(); + this.parameterType = dto.getParameterType(); + this.required = dto.getRequired(); + this.notes = dto.getNotes(); + this.personId = dto.getPersonId(); + this.parameterStatus = dto.getParameterStatus(); + this.pid = dto.getPid(); + this.level = dto.getLevel(); + this.isItems = dto.getIsItems(); + this.sort = dto.getSort(); + } +} + diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/ViewApproveDTO.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/ViewApproveDTO.java new file mode 100644 index 0000000..2062fac --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/dto/ViewApproveDTO.java @@ -0,0 +1,63 @@ +package net.risesoft.y9public.dto; + + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +@Data +@NoArgsConstructor +public class ViewApproveDTO implements Serializable{ + + private static final long serialVersionUID = 3121642145259274427L; + + + private String approveId; + + private String interfaceId; + + private String applyId; + + private String approveStatus; + + private String illustrate; + + private String applyType; + + private String notes; + + private String isOver; + + private String approveInterfaceStatus; + + private String approvePersonName; + + private String approvePersonId; + + private String applyPersonName; + + private String applyPersonId; + + private String interfaceName; + + private String interfaceStatus; + + private String version; + + private Integer page; + + private Integer limit; + private String statusSort; + + private Date createTime; + private Date applyTime; + + private String statusRole; + private String alreadyApproveUser; + private String currentUserId; + private String startDate; + private String endDate; +} + diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/Approve.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/Approve.java new file mode 100644 index 0000000..f142b8b --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/Approve.java @@ -0,0 +1,108 @@ +package net.risesoft.y9public.entity; + +import lombok.Data; +import lombok.NoArgsConstructor; +import net.risesoft.y9public.dto.ApproveDTO; +import org.hibernate.annotations.Comment; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import java.io.Serializable; + +@Data +@NoArgsConstructor +@Entity +@Table(name = "Y9_INTERFACE_APPROVE") +@org.hibernate.annotations.Table(comment = "接口审批表", appliesTo = "Y9_INTERFACE_APPROVE") +public class Approve extends BaseEntity implements Serializable{ + + private static final long serialVersionUID = 3121642146259274227L; + + @Id + @Column(name = "ID", columnDefinition = "varchar(36) default '' comment 'ID'") + private String id; + + @Column(name = "INTERFACE_ID", columnDefinition = "varchar(36) default '' comment '接口id'") + @Comment(value = "接口ID") + private String interfaceId; + + @Column(name = "APPLY_ID", columnDefinition = "varchar(36) default '' comment '申请ID'") + @Comment(value = "申请ID") + private String applyId; + + @Column(name = "PERSON_NAME", columnDefinition = "varchar(1000) default '' comment '审批人'") + @Comment(value = "审批人") + private String personName; + + @Column(name = "PERSON_ID", columnDefinition = "varchar(1000) default '' comment '审批人ID'") + @Comment(value = "审批人ID") + private String personId; + + @Column(name = "ILLUSTRATE", columnDefinition = "varchar(4000) default '' comment '审批说明'") + @Comment(value = "审批说明") + private String illustrate; + + @Column(name = "APPROVE_STATUS", columnDefinition = "varchar(10) default '' comment '审批意见'") + @Comment(value = "审批意见") + private String approveStatus; + + @Column(name = "NOTES", columnDefinition = "varchar(2000) default '' comment '备注'") + @Comment(value = "备注") + private String notes; + + @Column(name = "INTERFACE_STATUS", columnDefinition = "varchar(10) default '' comment '接口状态'") + @Comment(value = "接口状态") + private String interfaceStatus; + + @Column(name = "IS_OVER", columnDefinition = "varchar(10) default '' comment '是否结束(Y结束，N未结束)'") + @Comment(value = "是否结束") + private String isOver; + + @Column(name = "APPLY_TYPE", columnDefinition = "varchar(10) default '' comment '申请类型'") + @Comment(value = "申请类型") + private String applyType; + + @Column(name = "IS_NEW", columnDefinition = "varchar(10) default '' comment '是否最新数据'") + @Comment(value = "是否最新数据") + private String isNew; + + @Column(name = "FLOW_NODE", columnDefinition = "text comment '流程节点信息'") + @Comment(value = "流程节点信息") + private String flowNode; + + @Column(name = "ALREADY_APPROVE_USER", columnDefinition = "varchar(1000) default '' comment '已审批人员id'") + @Comment(value = "已审批人员id") + private String alreadyApproveUser; + + @Column(name = "CURRENT_USER_ID", columnDefinition = "varchar(100) default '' comment '当前审批人员'") + @Comment(value = "当前审批人员") + private String currentUserId; + + @Column(name = "CURRENT_NODE", columnDefinition = "varchar(500) default '' comment '当前节点信息'") + @Comment(value = "当前节点信息") + private String currentNode; + + @Column(name = "BUS_ID_JSON", columnDefinition = "text comment '业务关联id信息'") + @Comment(value = "当前节点信息") + private String busIdJson; + + public Approve(ApproveDTO dto) { + this.id = dto.getId(); + this.interfaceId = dto.getInterfaceId(); + this.applyId = dto.getApplyId(); + this.illustrate = dto.getIllustrate(); + this.approveStatus = dto.getApproveStatus(); + this.notes = dto.getNotes(); + this.personName = dto.getPersonName(); + this.personId = dto.getPersonId(); + this.interfaceStatus = dto.getInterfaceStatus(); + this.isOver = dto.getIsOver(); + this.flowNode = dto.getFlowNode(); + this.alreadyApproveUser = dto.getAlreadyApproveUser(); + this.currentUserId = dto.getCurrentUserId(); + this.currentNode = dto.getCurrentNode(); + } +} + diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/AuthDict.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/AuthDict.java new file mode 100644 index 0000000..57e1055 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/AuthDict.java @@ -0,0 +1,101 @@ +package net.risesoft.y9public.entity; + +import lombok.Data; +import lombok.NoArgsConstructor; +import net.risesoft.y9public.dto.AuthDictDTO; +import org.hibernate.annotations.Comment; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import java.io.Serializable; + +@Data +@NoArgsConstructor +@Entity +@Table(name = "Y9_INTERFACE_AUTH_DICT") +@org.hibernate.annotations.Table(comment = "接口鉴权字典", appliesTo = "Y9_INTERFACE_AUTH_DICT") +public class AuthDict extends BaseEntity implements Serializable{ + + private static final long serialVersionUID = 3121642144259272227L; + + @Id + @Column(name = "ID", columnDefinition = "varchar(36) default '' comment 'ID'") + private String id; + + @Column(name = "INTERFACE_ID", columnDefinition = "varchar(36) default '' comment '接口id'") + @Comment(value = "接口ID") + private String interfaceId; + + @Column(name = "PARAMETER_NAME", columnDefinition = "varchar(100) default '' comment '参数名'") + @Comment(value = "参数名") + private String parameterName; + + @Column(name = "FIELD_NAME", columnDefinition = "varchar(36) default '' comment '字段名'") + @Comment(value = "字段名") + private String fieldName; + + @Column(name = "FIELD_VAL", columnDefinition = "varchar(100) default '' comment '字段值'") + @Comment(value = "字段值") + private String fieldVal; + + @Column(name = "SHOW_VAL", columnDefinition = "varchar(100) default '' comment '显示值'") + @Comment(value = "显示值") + private String showVal; + + @Column(name = "PARAMETER_TYPE", columnDefinition = "varchar(100) default '' comment '参数类型（公有；私有；）'") + @Comment(value = "参数类型") + private String parameterType; + + @Column(name = "PARAMETER_ID", columnDefinition = "varchar(100) default '' comment '参数ID'") + @Comment(value = "参数ID") + private String parameterId; + + @Column(name = "IS_DELETE", columnDefinition = "varchar(100) default '' comment '参数类型（Y无效；N有效）'") + @Comment(value = "是否有效") + private String isDelete; + + @Column(name = "PID", columnDefinition = "varchar(36) default '' comment '父级id'") + @Comment(value = "父级id") + private String pid; + + @Column(name = "SORT", columnDefinition = "int comment '序号'") + @Comment(value = "序号") + private Integer sort; + + @Column(name = "IS_TREE", columnDefinition = "varchar(10) default '' comment '是否树形数据（是；否；）'") + @Comment(value = "是否树形") + private String isTree; + + @Column(name = "IS_PRIMARY", columnDefinition = "varchar(10) default '' comment '是否主表数据'") + @Comment(value = "是否主表数据") + private String isPrimary; + + @Column(name = "PERSON_ID", columnDefinition = "varchar(36) default '' comment '填写人ID'") + @Comment(value = "填写人ID") + private String personId; + + @Column(name = "PERSON_NAME", columnDefinition = "varchar(100) default '' comment '填写人名称'") + @Comment(value = "填写人名称") + private String personName; + + public AuthDict(AuthDictDTO dto) { + this.id = dto.getId(); + this.interfaceId = dto.getInterfaceId(); + this.parameterName = dto.getParameterName(); + this.fieldName = dto.getFieldName(); + this.fieldVal = dto.getFieldVal(); + this.showVal = dto.getShowVal(); + this.parameterType = dto.getParameterType(); + this.parameterId = dto.getParameterId(); + this.isDelete = dto.getIsDelete(); + this.pid = dto.getPid(); + this.sort = dto.getSort(); + this.isTree = dto.getIsTree(); + this.isPrimary = dto.getIsPrimary(); + this.personId = dto.getPersonId(); + this.personName = dto.getPersonName(); + } +} + diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/BaseEntity.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/BaseEntity.java similarity index 93% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/BaseEntity.java rename to y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/BaseEntity.java index 6d9ffbb..519badd 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/BaseEntity.java +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/BaseEntity.java @@ -1,25 +1,22 @@ package net.risesoft.y9public.entity; -import java.io.Serializable; -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; - +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.EqualsAndHashCode; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; -import com.fasterxml.jackson.annotation.JsonFormat; - -import lombok.EqualsAndHashCode; +import javax.persistence.Column; +import javax.persistence.MappedSuperclass; +import java.io.Serializable; +import java.util.Date; @MappedSuperclass @EqualsAndHashCode public class BaseEntity implements Serializable { - private static final long serialVersionUID = -882997958502745042L; + private static final long serialVersionUID = -882997958502745042L; - /** + /** * 创建时间 */ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -41,7 +38,7 @@ public class BaseEntity implements Serializable { /** * 创建时会自动设值 - * + * * @param createTime */ public void setCreateTime(Date createTime) { @@ -54,7 +51,7 @@ public class BaseEntity implements Serializable { /** * 更新时会自动设值 - * + * * @param updateTime */ public void setUpdateTime(Date updateTime) { diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/Blacklisting.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/Blacklisting.java new file mode 100644 index 0000000..012bebf --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/Blacklisting.java @@ -0,0 +1,55 @@ +package net.risesoft.y9public.entity; + +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.Comment; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import java.io.Serializable; + +@Data +@NoArgsConstructor +@Entity +@Table(name = "Y9_INTERFACE_BLACKLISTING") +@org.hibernate.annotations.Table(comment = "黑名单录入", appliesTo = "Y9_INTERFACE_BLACKLISTING") +public class Blacklisting extends BaseEntity implements Serializable{ + + private static final long serialVersionUID = 3121642146259214221L; + + @Id + @Column(name = "ID", columnDefinition = "varchar(50) default '' comment 'ID'") + private String id; + + @Column(name = "name", columnDefinition = "varchar(100) default '' comment '名称'") + @Comment(value = "名称") + private String name; + + @Column(name = "IP", columnDefinition = "varchar(300) default '' comment '黑名单IP'") + @Comment(value = "黑名单IP") + private String ip; + + @Column(name = "INTERFACE_IDS", columnDefinition = "varchar(1000) default '' comment '接口id'") + @Comment(value = "接口id") + private String interfaceIds; + + @Column(name = "notes", columnDefinition = "varchar(254) default '' comment '备注'") + @Comment(value = "备注") + private String notes; + + @Column(name = "SORT", columnDefinition = "int comment '排序'") + @Comment(value = "排序") + private Integer sort; + + @Column(name = "IS_DELETE", columnDefinition = "varchar(10) default 'N' comment '是否删除Y删除，N未删除'") + @Comment(value = "是否删除") + private String isDelete; + + @Column(name = "IS_ENABLE", columnDefinition = "varchar(10) default 'N' comment '参数类型（true启用；false停用）'") + @Comment(value = "是否启用") + private String isEnable; + +} + diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/CallApiRequestLogInfo.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/CallApiRequestLogInfo.java similarity index 98% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/CallApiRequestLogInfo.java rename to y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/CallApiRequestLogInfo.java index 59eb6b7..b39024a 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/entity/CallApiRequestLogInfo.java +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/CallApiRequestLogInfo.java @@ -173,14 +173,14 @@ public class CallApiRequestLogInfo implements Serializable { /** * 是否鉴权 */ - @Column(name = "AUTHENTIC", columnDefinition = "varchar(2) default '0' comment '是否鉴权;0表示否，1表示是'") + @Column(name = "AUTHENTIC", columnDefinition = "varchar(2) default '' comment '是否鉴权'") @Comment(value = "是否鉴权") private Integer authentic; /** * 是否限流 */ - @Column(name = "ISLIMIT", columnDefinition = "varchar(2) default '0' comment '是否限流;0表示否，1表示是'") + @Column(name = "ISLIMIT", columnDefinition = "varchar(2) default '' comment '是否限流'") @Comment(value = "是否限流") private Integer isLimit; diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/InterfaceApply.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/InterfaceApply.java new file mode 100644 index 0000000..3c064eb --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/InterfaceApply.java @@ -0,0 +1,141 @@ +package net.risesoft.y9public.entity; + +import lombok.Data; +import lombok.NoArgsConstructor; +import net.risesoft.y9public.dto.InterfaceApplyDTO; +import org.hibernate.annotations.Comment; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import java.io.Serializable; + +@Data +@NoArgsConstructor +@Entity +@Table(name = "Y9_INTERFACE_APPLY") +@org.hibernate.annotations.Table(comment = "接口申请表", appliesTo = "Y9_INTERFACE_APPLY") +public class InterfaceApply extends BaseEntity implements Serializable{ + + private static final long serialVersionUID = 3121642146259274227L; + + @Id + @Column(name = "ID", columnDefinition = "varchar(36) default '' comment 'ID'") + private String id; + + @Column(name = "INTERFACE_ID", columnDefinition = "varchar(36) default '' comment '接口id'") + @Comment(value = "接口ID") + private String interfaceId; + + @Column(name = "APPLY_PERSON_NAME", columnDefinition = "varchar(50) default '' comment '接口申请人'") + @Comment(value = "接口申请人") + private String applyPersonName; + + @Column(name = "APPLY_PERSON_ID", columnDefinition = "varchar(36) default '' comment '接口申请人ID'") + @Comment(value = "接口申请人ID") + private String applyPersonId; + + @Column(name = "SYSTEM_IDENTIFIER", columnDefinition = "varchar(254) default '' comment '系统标识'") + @Comment(value = "申请系统标识") + private String systemIdentifier; + + @Column(name = "APPLY_SYSTEM_NAME", columnDefinition = "varchar(254) default '' comment '申请系统名称'") + @Comment(value = "申请系统名称") + private String applySystemName; + + @Column(name = "AUTH", columnDefinition = "text comment '权限信息'") + @Comment(value = "权限信息") + private String auth; + + @Column(name = "APPLY_PERSON_DEPT_NAME", columnDefinition = "varchar(254) default '' comment '接口申请人单位名称'") + @Comment(value = "接口申请人单位名称") + private String applyPersonDeptName; + + @Column(name = "APPLY_PERSON_DEPT_ID", columnDefinition = "varchar(254) default '' comment '接口申请人单位id'") + @Comment(value = "接口申请人单位id") + private String applyPersonDeptId; + + @Column(name = "USE_PERSON_RESPONSIBLE", columnDefinition = "varchar(50) default '' comment '接口调用责任人'") + @Comment(value = "接口调用责任人") + private String usePersonResponsible; + + @Column(name = "USE_PERSON_RESPONSIBLE_PHONE", columnDefinition = "varchar(20) default '' comment '接口调用责任人联系方式'") + @Comment(value = "接口调用责任人联系方式") + private String usePersonResponsiblePhone; + + @Column(name = "NOTES", columnDefinition = "varchar(254) default '' comment '申请备注'") + @Comment(value = "申请备注") + private String notes; + + @Column(name = "APPLY_TIME", columnDefinition = "varchar(20) default '' comment '申请日期'") + @Comment(value = "申请日期") + private String applyTime; + + @Column(name = "APPLY_REASON", columnDefinition = "varchar(500) default '' comment '申请事由'") + @Comment(value = "申请事由") + private String applyReason; + + @Column(name = "APPLY_TYPE", columnDefinition = "varchar(10) default '' comment '申请类型'") + @Comment(value = "申请类型") + private String applyType; + + @Column(name = "USER_KEY", columnDefinition = "varchar(100) default '' comment '用户令牌'") + @Comment(value = "用户令牌") + private String userKey; + + @Column(name = "USER_SECRET", columnDefinition = "varchar(100) default '' comment '用户密钥'") + @Comment(value = "用户密钥") + private String userSecret; + + @Column(name = "IP_WHITELIST", columnDefinition = "varchar(100) default '' comment 'IP白名单'") + @Comment(value = "IP白名单") + private String ipWhitelist; + + @Column(name = "APPLY_STOP_TIME", columnDefinition = "varchar(20) default '' comment '申请停用时间'") + @Comment(value = "申请停用时间") + private String applyStopTime; + + @Column(name = "OLD_ID", columnDefinition = "varchar(36) default '' comment '关联回显之前的申请信息,目前只有接口调用申请会存'") + @Comment(value = "变更前旧id") + private String oldId; + + @Column(name = "SAME_ID", columnDefinition = "varchar(36) default '' comment '同一个申请变更id'") + @Comment(value = "同一个申请变更id") + private String sameId; + + @Column(name = "DATA_TYPE", columnDefinition = "varchar(10) default '新增' comment '数据类型-新增-变更'") + @Comment(value = "数据类型") + private String dataType; + + @Column(name = "IS_EFFECTIVE", columnDefinition = "varchar(2) default 'Y' comment '数据是否有效：Y有效-N无效'") + @Comment(value = "数据是否有效") + private String isEffective; + + public InterfaceApply(InterfaceApplyDTO dto) { + this.id = dto.getId(); + this.interfaceId = dto.getInterfaceId(); + this.applyPersonName = dto.getApplyPersonName(); + this.applyPersonId = dto.getApplyPersonId(); + this.systemIdentifier = dto.getSystemIdentifier(); + this.applySystemName = dto.getApplySystemName(); + this.auth = dto.getAuth(); + this.applyPersonDeptName = dto.getApplyPersonDeptName(); + this.applyPersonDeptId = dto.getApplyPersonDeptId(); + this.usePersonResponsible = dto.getUsePersonResponsible(); + this.usePersonResponsiblePhone = dto.getUsePersonResponsiblePhone(); + this.notes = dto.getNotes(); + this.applyTime = dto.getApplyTime(); + this.applyReason = dto.getApplyReason(); + this.applyType = dto.getApplyType(); + this.userKey = dto.getUserKey(); + this.userSecret = dto.getUserSecret(); + this.ipWhitelist = dto.getIpWhitelist(); + this.applyStopTime = dto.getApplyStopTime(); + this.oldId = dto.getOldId(); + this.sameId = dto.getSameId(); + this.dataType = dto.getDataType(); + this.isEffective = dto.getIsEffective(); + } +} + diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/InterfaceLimitInfo.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/InterfaceLimitInfo.java new file mode 100644 index 0000000..0618730 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/InterfaceLimitInfo.java @@ -0,0 +1,70 @@ +package net.risesoft.y9public.entity; + +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.Comment; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import java.io.Serializable; + +@Data +@NoArgsConstructor +@Entity +@Table(name = "Y9_INTERFACE_LIMIT") +@org.hibernate.annotations.Table(comment = "接口限流信息表", appliesTo = "Y9_INTERFACE_LIMIT") +public class InterfaceLimitInfo extends BaseEntity implements Serializable{ + + private static final long serialVersionUID = 3121642146259274227L; + + @Id + @Column(name = "ID", columnDefinition = "varchar(36) default '' comment 'ID'") + private String id; + + @Column(name = "INTERFACE_ID", columnDefinition = "varchar(36) default '' comment '接口id'") + @Comment(value = "接口ID") + private String interfaceId; + + @Column(name = "EFFECT", columnDefinition = "varchar(500) default '' comment '流控效果：快速失败（1）;Warm Up（2）;排队等候（3）;'") + @Comment(value = "流控效果") + private String effect; + + @Column(name = "WARM_TIME", columnDefinition = "varchar(500) default '' comment '预热时长（秒）'") + @Comment(value = "预热时长") + private String warmTime; + + @Column(name = "THRESHOLD_TYPE", columnDefinition = "varchar(500) default '' comment '阈值类型'") + @Comment(value = "阈值类型") + private String thresholdType; + + @Column(name = "THRESHOLD_VAL", columnDefinition = "varchar(500) default '' comment '阈值'") + @Comment(value = "阈值") + private String thresholdVal; + + @Column(name = "WAIT_TIME", columnDefinition = "varchar(500) default '' comment '超时时间（毫秒）'") + @Comment(value = "超时时间") + private String waitTime; + + @Column(name = "IS_COLONY", columnDefinition = "varchar(500) default '' comment '是否集群'") + @Comment(value = "是否集群") + private String isColony; + + @Column(name = "LIMIT_TIME", columnDefinition = "varchar(20) default '' comment '限定时间，单位：秒'") + @Comment(value = "限定时间") + private String limitTime; + + @Column(name = "LiMIT_COUNT", columnDefinition = "varchar(10) default '' comment '限定时间内总访问量'") + @Comment(value = "限定时间内总访问量") + private String limitCount; + + @Column(name = "PERSON_ID", columnDefinition = "varchar(36) default '' comment '填写人ID'") + @Comment(value = "填写人ID") + private String personId; + + @Column(name = "PERSON_NAME", columnDefinition = "varchar(36) default '' comment '填写人名称'") + @Comment(value = "填写人名称") + private String personName; +} + diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/InterfaceManage.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/InterfaceManage.java new file mode 100644 index 0000000..d8b15aa --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/InterfaceManage.java @@ -0,0 +1,195 @@ +package net.risesoft.y9public.entity; + +import lombok.Data; +import lombok.NoArgsConstructor; +import net.risesoft.y9public.dto.InterfaceManageDTO; +import org.hibernate.annotations.Comment; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import java.io.Serializable; + +@Data +@NoArgsConstructor +@Entity +@Table(name = "Y9_INTERFACE_MANAGE_INFO") +@org.hibernate.annotations.Table(comment = "接口管理信息", appliesTo = "Y9_INTERFACE_MANAGE_INFO") +public class InterfaceManage extends BaseEntity implements Serializable{ + + private static final long serialVersionUID = 3226632146259274287L; + + @Id + @Column(name = "ID", columnDefinition = "varchar(36) default '' comment 'ID'") + private String id; + + @Column(name = "INTERFACE_NAME", columnDefinition = "varchar(100) default '' comment '接口名称'") + @Comment(value = "接口名称") + private String interfaceName; + + @Column(name = "SAME_INTERFACE_ID", columnDefinition = "varchar(36) default '' comment '同一接口id'") + @Comment(value = "接口id") + private String sameInterfaceId; + + @Column(name = "INTERFACE_URL", columnDefinition = "varchar(500) default '' comment '接口调用地址'") + @Comment(value = "接口调用地址") + private String interfaceUrl; + + @Column(name = "IS_AUTH", columnDefinition = "varchar(10) default '' comment '是否鉴权'") + @Comment(value = "是否鉴权") + private String isAuth; + + @Column(name = "AUTH_INFO", columnDefinition = "varchar(1000) default '' comment '鉴权信息'") + @Comment(value = "鉴权信息") + private String authInfo; + + @Column(name = "IS_LIMIT", columnDefinition = "varchar(10) default '' comment '是否限流'") + @Comment(value = "是否限流") + private String isLimit; + + @Column(name = "IS_LIMIT_DATA", columnDefinition = "varchar(10) default '' comment '是否控制数据权限范围'") + @Comment(value = "是否控制数据权限范围") + private String isLimitData; + + @Column(name = "ILLUSTRATE", columnDefinition = "varchar(500) default '' comment '接口说明'") + @Comment(value = "接口说明") + private String illustrate; + + @Column(name = "INTERFACE_TYPE", columnDefinition = "varchar(50) default '' comment '接口类型'") + @Comment(value = "接口类型") + private String interfaceType; + + @Column(name = "NETWORK_AGREEMENT", columnDefinition = "varchar(50) default '' comment '网络协议'") + @Comment(value = "网络协议") + private String networkAgreement; + + @Column(name = "INTERFACE_STATUS", columnDefinition = "varchar(10) default '' comment '接口状态'") + @Comment(value = "接口状态") + private String interfaceStatus; + + @Column(name = "INTERFACE_METHOD", columnDefinition = "varchar(10) default '' comment '请求方式'") + @Comment(value = "请求方式") + private String interfaceMethod; + + @Column(name = "VERSION", columnDefinition = "varchar(50) default '' comment '接口版本'") + @Comment(value = "接口版本") + private String version; + + @Column(name = "NOTES", columnDefinition = "varchar(254) default '' comment '备注'") + @Comment(value = "备注") + private String notes; + + @Column(name = "PERSON_NAME", columnDefinition = "varchar(50) default '' comment '接口填报人'") + @Comment(value = "接口填报人") + private String personName; + + @Column(name = "PERSON_ID", columnDefinition = "varchar(36) default '' comment '接口填报人ID'") + @Comment(value = "接口填报人ID") + private String personId; + + @Column(name = "DEPT_INFO", columnDefinition = "varchar(254) default '' comment '接口提供公司名称'") + @Comment(value = "接口提供公司名称") + private String deptInfo; + + @Column(name = "DEPT_ID", columnDefinition = "varchar(50) default '' comment '接口提供公司id'") + @Comment(value = "接口提供公司id") + private String deptId; + + @Column(name = "SYSTEM_NAME", columnDefinition = "varchar(254) default '' comment '接口提供系统名称'") + @Comment(value = "接口提供系统名称") + private String systemName; + + @Column(name = "SYSTEM_ID", columnDefinition = "varchar(50) default '' comment '接口提供系统标识'") + @Comment(value = "接口提供系统标识") + private String systemId; + + @Column(name = "HEAD", columnDefinition = "varchar(50) default '' comment '接口负责人名称'") + @Comment(value = "接口负责人名称") + private String head; + + @Column(name = "HEAD_PHONE", columnDefinition = "varchar(50) default '' comment '接口负责人'") + @Comment(value = "接口负责人联系方式") + private String headPhone; + + @Column(name = "IS_OVERWRITE", columnDefinition = "varchar(10) default '' comment '是否覆盖更新Y覆盖，N未覆盖'") + @Comment(value = "是否覆盖更新") + private String isOverwrite; + + @Column(name = "OVERWRITE_INTERFACE_ID", columnDefinition = "varchar(36) default '' comment '覆盖更新接口id'") + @Comment(value = "覆盖更新接口id") + private String overwriteInterfaceId; + + @Column(name = "INTERFACE_FILE_URL", columnDefinition = "varchar(500) default '' comment '接口文档下载地址'") + @Comment(value = "接口文档下载地址") + private String interfaceFileUrl; + + @Column(name = "INTERFACE_FILE_NAME", columnDefinition = "varchar(100) default '' comment '接口文档名称'") + @Comment(value = "接口文档名称") + private String interfaceFileName; + + @Column(name = "IS_DELETE", columnDefinition = "varchar(50) default 'N' comment '是否删除，Y删除，N未删除'") + @Comment(value = "是否已经删除") + private String isDelete; + + @Column(name = "IS_TEST", columnDefinition = "varchar(10) default '' comment '是否测试接口'") + @Comment(value = "是否测试接口") + private String isTest; + + @Column(name = "PARAMETER_IDS", columnDefinition = "varchar(2000) default '' comment '鉴权参数id串'") + @Comment(value = "鉴权参数id串") + private String parameterIds; + + @Column(name = "NAME_SPACE", columnDefinition = "varchar(300) default '' comment '命名空间'") + @Comment(value = "命名空间") + private String nameSpace; + + @Column(name = "METHOD", columnDefinition = "varchar(300) default '' comment 'webService调用方法'") + @Comment(value = "webService调用方法") + private String method; + + @Column(name = "WEB_SPECIFICATION", columnDefinition = "varchar(20) default '' comment 'webService开发规范协议'") + @Comment(value = "webService开发规范协议") + private String webSpecification; + + @Column(name = "IS_RESPONSE_FILE", columnDefinition = "varchar(10) default 'false' comment '是否返回文件'") + @Comment(value = "是否返回文件") + private Boolean isResponseFile; + + + public InterfaceManage(InterfaceManageDTO dto) { + this.id = dto.getId(); + this.interfaceName = dto.getInterfaceName(); + this.sameInterfaceId = dto.getSameInterfaceId(); + this.interfaceUrl = dto.getInterfaceUrl(); + this.parameterIds = dto.getParameterIds(); + this.isAuth = dto.getIsAuth(); + this.isLimit = dto.getIsLimit(); + this.illustrate = dto.getIllustrate(); + this.interfaceType = dto.getInterfaceType(); + this.interfaceStatus = dto.getInterfaceStatus(); + this.interfaceMethod = dto.getInterfaceMethod(); + this.version = dto.getVersion(); + this.notes = dto.getNotes(); + this.personName = dto.getPersonName(); + this.personId = dto.getPersonId(); + this.deptInfo = dto.getDeptInfo(); + this.head = dto.getHead(); + this.isOverwrite = dto.getIsOverwrite(); + this.interfaceFileUrl = dto.getInterfaceFileUrl(); + this.isDelete = dto.getIsDelete(); + this.isTest = dto.getIsTest(); + this.networkAgreement = dto.getNetworkAgreement(); + this.headPhone = dto.getHeadPhone(); + this.overwriteInterfaceId = dto.getOverwriteInterfaceId(); + this.nameSpace = dto.getNameSpace(); + this.method = dto.getMethod(); + this.webSpecification = dto.getWebSpecification(); + this.isLimitData = dto.getIsLimitData(); + this.deptId = dto.getDeptId(); + this.systemId = dto.getSystemId(); + this.systemName = dto.getSystemName(); + this.isResponseFile = dto.getIsResponseFile(); + } +} + diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/Parameter.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/Parameter.java new file mode 100644 index 0000000..97fde96 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/Parameter.java @@ -0,0 +1,96 @@ +package net.risesoft.y9public.entity; + +import lombok.Data; +import lombok.NoArgsConstructor; +import net.risesoft.y9public.dto.ParameterDTO; +import org.hibernate.annotations.Comment; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import java.io.Serializable; + +@Data +@NoArgsConstructor +@Entity +@Table(name = "Y9_INTERFACE_PARAMETER") +@org.hibernate.annotations.Table(comment = "接口参数表", appliesTo = "Y9_INTERFACE_PARAMETER") +public class Parameter extends BaseEntity implements Serializable{ + + private static final long serialVersionUID = 3121642146259274227L; + + @Id + @Column(name = "ID", columnDefinition = "varchar(36) default '' comment 'ID'") + private String id; + + @Column(name = "INTERFACE_ID", columnDefinition = "varchar(36) default '' comment '接口id'") + @Comment(value = "接口ID") + private String interfaceId; + + @Column(name = "PARAMETER_KEY", columnDefinition = "varchar(500) default '' comment '参数key'") + @Comment(value = "参数key") + private String parameterKey; + + @Column(name = "VAL", columnDefinition = "varchar(500) default '' comment '参数值'") + @Comment(value = "参数值") + private String val; + + @Column(name = "DEFAULT_VAL", columnDefinition = "varchar(500) default '' comment '默认参数值'") + @Comment(value = "默认参数值") + private String defaultVal; + + @Column(name = "PARAMETER_TYPE", columnDefinition = "varchar(20) default '' comment '参数类型'") + @Comment(value = "参数类型") + private String parameterType; + + @Column(name = "REQUIRED", columnDefinition = "varchar(10) default '' comment '是否必填Y是，N否'") + @Comment(value = "是否必填") + private String required; + + @Column(name = "NOTES", columnDefinition = "varchar(254) default '' comment '参数说明'") + @Comment(value = "参数说明") + private String notes; + + @Column(name = "PERSON_ID", columnDefinition = "varchar(36) default '' comment '填写人ID'") + @Comment(value = "填写人ID") + private String personId; + + @Column(name = "PARAMETER_STATUS", columnDefinition = "varchar(10) default '' comment '参数状态（1请求头参数，2请求参数，3返回参数）'") + @Comment(value = "参数状态") + private String parameterStatus; + + @Column(name = "PID", columnDefinition = "varchar(36) default '' comment '父级id'") + @Comment(value = "父级id") + private String pid; + + @Column(name = "LEVEL", columnDefinition = "int comment '节点层级，根节点层级为1'") + @Comment(value = "节点层级") + private Integer level; + + @Column(name = "IS_ITEMS", columnDefinition = "varchar(10) default '' comment '是否数组'") + @Comment(value = "是否数组") + private String isItems; + + @Column(name = "SORT", columnDefinition = "int comment '序号'") + @Comment(value = "序号") + private Integer sort; + + public Parameter(ParameterDTO dto) { + this.id = dto.getId(); + this.interfaceId = dto.getInterfaceId(); + this.parameterKey = dto.getParameterKey(); + this.val = dto.getVal(); + this.defaultVal = dto.getDefaultVal(); + this.parameterType = dto.getParameterType(); + this.required = dto.getRequired(); + this.notes = dto.getNotes(); + this.personId = dto.getPersonId(); + this.parameterStatus = dto.getParameterStatus(); + this.pid = dto.getPid(); + this.level = dto.getLevel(); + this.isItems = dto.getIsItems(); + this.sort = dto.getSort(); + } +} + diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/SystemIdentifier.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/SystemIdentifier.java new file mode 100644 index 0000000..9174602 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/SystemIdentifier.java @@ -0,0 +1,51 @@ +package net.risesoft.y9public.entity; + +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.Comment; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import java.io.Serializable; + +@Data +@NoArgsConstructor +@Entity +@Table(name = "Y9_INTERFACE_SYSTEM_IDENTIFIER") +@org.hibernate.annotations.Table(comment = "系统标识录入", appliesTo = "Y9_INTERFACE_SYSTEM_IDENTIFIER") +public class SystemIdentifier extends BaseEntity implements Serializable{ + + private static final long serialVersionUID = 3121642146259274227L; + + @Id + @Column(name = "ID", columnDefinition = "varchar(36) default '' comment 'ID'") + private String id; + + @Column(name = "name", columnDefinition = "varchar(100) default '' comment 'name'") + @Comment(value = "名称") + private String name; + + @Column(name = "PARAMETER_TYPE", columnDefinition = "varchar(20) default '' comment '数据类型0是单位，1是系统'") + @Comment(value = "数据类型") + private String parameterType; + + @Column(name = "PID", columnDefinition = "varchar(36) default '' comment '父级id'") + @Comment(value = "父级id") + private String pid; + + @Column(name = "PNAME", columnDefinition = "varchar(100) default '' comment '父级名称'") + @Comment(value = "父级名称") + private String pname; + + @Column(name = "SORT", columnDefinition = "int comment '排序'") + @Comment(value = "排序") + private Integer sort; + + @Column(name = "IS_DELETE", columnDefinition = "varchar(10) default 'N' comment '是否删除Y删除，N未删除'") + @Comment(value = "是否删除") + private String isDelete; + +} + diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/ViewApprove.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/ViewApprove.java new file mode 100644 index 0000000..462b69a --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/entity/ViewApprove.java @@ -0,0 +1,120 @@ +package net.risesoft.y9public.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.Comment; +import org.hibernate.annotations.CreationTimestamp; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import java.io.Serializable; +import java.util.Date; + +@Data +@NoArgsConstructor +@Entity +@Table(name = "VIEW_APPROVE_LIST") +@org.hibernate.annotations.Table(comment = "接口审批视图表", appliesTo = "VIEW_APPROVE_LIST") +public class ViewApprove implements Serializable{ + + private static final long serialVersionUID = 3121642145259274427L; + + @Id + @Column(name = "APPROVE_ID") + private String approveId; + + @Column(name = "INTERFACE_ID") + @Comment(value = "接口ID") + private String interfaceId; + + @Column(name = "APPLY_ID") + @Comment(value = "申请ID") + private String applyId; + + @Column(name = "APPROVE_STATUS") + @Comment(value = "审批意见") + private String approveStatus; + + @Column(name = "ILLUSTRATE") + @Comment(value = "审批说明") + private String illustrate; + + @Column(name = "APPLY_TYPE") + @Comment(value = "申请类型") + private String applyType; + + @Column(name = "NOTES") + @Comment(value = "备注") + private String notes; + + @Column(name = "IS_OVER") + @Comment(value = "是否结束") + private String isOver; + + @Column(name = "APPROVE_INTERFACE_STATUS") + @Comment(value = "审批接口状态") + private String approveInterfaceStatus; + + @Column(name = "APPROVE_PERSON_NAME") + @Comment(value = "审批人") + private String approvePersonName; + + @Column(name = "APPROVE_PERSON_ID") + @Comment(value = "审批人ID") + private String approvePersonId; + + @Column(name = "APPLY_PERSON_NAME") + @Comment(value = "申请人名称") + private String applyPersonName; + + @Column(name = "APPLY_PERSON_ID") + @Comment(value = "申请人ID") + private String applyPersonId; + + @Column(name = "INTERFACE_NAME") + @Comment(value = "接口名称") + private String interfaceName; + + @Column(name = "INTERFACE_STATUS") + @Comment(value = "接口状态") + private String interfaceStatus; + + @Column(name = "VERSION") + @Comment(value = "接口版本") + private String version; + + @Column(name = "IS_LIMIT_DATA") + @Comment(value = "是否控制数据权限信息") + private String isLimitData; + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @CreationTimestamp + @Column(name = "CREATETIME") + private Date createTime; + + @Column(name = "ALREADY_APPROVE_USER", columnDefinition = "varchar(1000) default '' comment '已审批人员id'") + @Comment(value = "已审批人员id") + private String alreadyApproveUser; + + @Column(name = "CURRENT_USER_ID", columnDefinition = "varchar(100) default '' comment '当前审批人员'") + @Comment(value = "当前审批人员") + private String currentUserId; + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @CreationTimestamp + @Column(name = "APPLY_TIME") + private Date applyTime; + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @CreationTimestamp + @Column(name = "UPDATETIME") + private Date updateTime; + + @Column(name = "STATUS_SORT") + @Comment(value = "状态排序") + private String statusSort; +} + diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/ApproveRepository.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/ApproveRepository.java similarity index 100% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/ApproveRepository.java rename to y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/ApproveRepository.java diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/AuthDictRepository.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/AuthDictRepository.java similarity index 100% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/AuthDictRepository.java rename to y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/AuthDictRepository.java diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/BlacklistingRepository.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/BlacklistingRepository.java similarity index 100% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/BlacklistingRepository.java rename to y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/BlacklistingRepository.java diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/CallApiLogRepository.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/CallApiLogRepository.java similarity index 96% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/CallApiLogRepository.java rename to y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/CallApiLogRepository.java index 35be6d9..186e907 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/CallApiLogRepository.java +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/CallApiLogRepository.java @@ -1,5 +1,6 @@ package net.risesoft.y9public.repository; +import net.risesoft.y9public.entity.Blacklisting; import net.risesoft.y9public.entity.CallApiRequestLogInfo; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/InterfaceApplyRepository.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/InterfaceApplyRepository.java similarity index 57% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/InterfaceApplyRepository.java rename to y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/InterfaceApplyRepository.java index 1b1fb97..ea55ec6 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/InterfaceApplyRepository.java +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/InterfaceApplyRepository.java @@ -1,7 +1,7 @@ package net.risesoft.y9public.repository; -import net.risesoft.y9public.vo.ApplyVo; import net.risesoft.y9public.entity.InterfaceApply; +import net.risesoft.y9public.vo.ApplyVo; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; @@ -11,7 +11,7 @@ import org.springframework.data.repository.query.Param; import java.util.List; -public interface InterfaceApplyRepository extends JpaRepository, JpaSpecificationExecutor { +public interface InterfaceApplyRepository extends JpaRepository, JpaSpecificationExecutor{ //根据接口id和人员id，申请类型查询该接口的申请列表 List findByInterfaceIdAndApplyPersonIdAndApplyType(String interfaceId, String applyPersonId, String applyType); @@ -22,14 +22,14 @@ public interface InterfaceApplyRepository extends JpaRepository findByInterfaceIdAndApplyPersonIdAndApplyTypeOrderByCreateTimeDesc(String interfaceId, String applyPersonId, String applyType); //查询每个人的申请记录 - @Query(value = "select new net.risesoft.y9public.vo.ApplyVo(nia.id,nia.applyPersonName,nimi.approveStatus,nia.createTime,nia.applyReason,nia.interfaceId,nia.sameId,nimi.id) from InterfaceApply nia left join Approve nimi on nia.id = nimi.applyId where nia.applyType='0' and nia.isEffective='Y' and nia.applyPersonId = :personId and nia.interfaceId = :interfaceId order by nia.createTime desc") - Page findListPage(@Param("personId") String personId, @Param("interfaceId") String interfaceId, Pageable pageable); + @Query(value="select new net.risesoft.y9public.vo.ApplyVo(nia.id,nia.applyPersonName,nimi.approveStatus,nia.createTime,nia.applyReason,nia.interfaceId,nia.sameId,nimi.id) from InterfaceApply nia left join Approve nimi on nia.id = nimi.applyId where nia.applyType='0' and nia.isEffective='Y' and nia.applyPersonId = :personId and nia.interfaceId = :interfaceId order by nia.createTime desc") + Page findListPage(@Param("personId") String personId,@Param("interfaceId") String interfaceId, Pageable pageable); //根据userKey查询申请信息 - @Query(value = "select nia from InterfaceApply nia left join Approve nimi on nia.id = nimi.applyId where nia.applyType='0' and nia.userKey = :userKey and nimi.isNew='N' order by nia.createTime desc") + @Query(value="select nia from InterfaceApply nia left join Approve nimi on nia.id = nimi.applyId where nia.applyType='0' and nia.userKey = :userKey and nimi.isNew='N' order by nia.createTime desc") InterfaceApply findDataByUserKey(@Param("userKey") String userKey); //查询每个人的申请记录是否有通过的记录 - @Query(value = "select EXISTS(select nia.id,nimi.approve_status from Y9_INTERFACE_APPLY nia left join Y9_INTERFACE_APPROVE nimi on nia.id = nimi.apply_id where nia.apply_type='0' and nia.is_effective='Y' and nimi.approve_status = '通过' and nia.apply_person_id = ?1 and nia.interface_id = ?2 order by nia.createtime desc) as test", nativeQuery = true) - Integer findListIsPass(@Param("personId") String personId, @Param("interfaceId") String interfaceId); + @Query(value="select EXISTS(select nia.id,nimi.approve_status from Y9_INTERFACE_APPLY nia left join Y9_INTERFACE_APPROVE nimi on nia.id = nimi.apply_id where nia.apply_type='0' and nia.is_effective='Y' and nimi.approve_status = '通过' and nia.apply_person_id = ?1 and nia.interface_id = ?2 order by nia.createtime desc) as test",nativeQuery = true) + Integer findListIsPass(@Param("personId") String personId,@Param("interfaceId") String interfaceId); } diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/InterfaceLimitInfoRepository.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/InterfaceLimitInfoRepository.java similarity index 95% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/InterfaceLimitInfoRepository.java rename to y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/InterfaceLimitInfoRepository.java index ba4e0e1..5989172 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/InterfaceLimitInfoRepository.java +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/InterfaceLimitInfoRepository.java @@ -11,10 +11,10 @@ import javax.transaction.Transactional; import java.util.Collection; import java.util.List; -public interface InterfaceLimitInfoRepository extends JpaRepository, JpaSpecificationExecutor { +public interface InterfaceLimitInfoRepository extends JpaRepository, JpaSpecificationExecutor{ @Modifying @Transactional - @Query(value = "delete from Y9_INTERFACE_LIMIT where INTERFACE_ID = ?1 ", nativeQuery = true) + @Query(value = "delete from Y9_INTERFACE_LIMIT where INTERFACE_ID = ?1 " ,nativeQuery = true) void deleteByInterfaceId(String interfaceId); @Query("SELECT e FROM InterfaceLimitInfo e WHERE e.interfaceId IN :ids") diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/InterfaceManageRepository.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/InterfaceManageRepository.java similarity index 58% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/InterfaceManageRepository.java rename to y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/InterfaceManageRepository.java index b428499..5c3cf82 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/InterfaceManageRepository.java +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/InterfaceManageRepository.java @@ -1,8 +1,8 @@ package net.risesoft.y9public.repository; -import net.risesoft.y9public.entity.InterfaceManage; import net.risesoft.y9public.dto.InterfaceManageDTO; +import net.risesoft.y9public.entity.InterfaceManage; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; @@ -11,27 +11,27 @@ import org.springframework.data.jpa.repository.Query; import java.util.List; -public interface InterfaceManageRepository extends JpaRepository, JpaSpecificationExecutor { +public interface InterfaceManageRepository extends JpaRepository, JpaSpecificationExecutor{ - @Query(value = "select itf.*,apr.APPROVE_STATUS from Y9_INTERFACE_MANAGE_INFO itf left join Y9_INTERFACE_APPROVE apr on itf.id = apr.INTERFACE_ID and apr.IS_OVER='N' " + - "where itf.IS_DELETE='N' and itf.IS_TEST='N' and itf.IS_OVERWRITE='N' and itf.INTERFACE_NAME like '%'+?1+'%' and itf.PERSON_ID = ?2", nativeQuery = true) - Page findAllInterfaceAndApprove(String interfaceName, String personId, Pageable pageable); + @Query(value="select itf.*,apr.APPROVE_STATUS from Y9_INTERFACE_MANAGE_INFO itf left join Y9_INTERFACE_APPROVE apr on itf.id = apr.INTERFACE_ID and apr.IS_OVER='N' " + + "where itf.IS_DELETE='N' and itf.IS_TEST='N' and itf.IS_OVERWRITE='N' and itf.INTERFACE_NAME like '%'+?1+'%' and itf.PERSON_ID = ?2",nativeQuery = true) + Page findAllInterfaceAndApprove(String interfaceName, String personId,Pageable pageable); //获取审批通过且有申请调用的数据 - @Query(value = "select itf.* from Y9_INTERFACE_MANAGE_INFO itf left join Y9_INTERFACE_Apply nia on itf.id = nia.INTERFACE_ID " + - "where itf.IS_DELETE='N' and itf.IS_TEST='N' and itf.IS_OVERWRITE='N' and nia.APPROVE_STATUS = '审批通过' and itf.id = ?1 and nia.APPLY_PERSON_ID = ?2", nativeQuery = true) + @Query(value="select itf.* from Y9_INTERFACE_MANAGE_INFO itf left join Y9_INTERFACE_Apply nia on itf.id = nia.INTERFACE_ID " + + "where itf.IS_DELETE='N' and itf.IS_TEST='N' and itf.IS_OVERWRITE='N' and nia.APPROVE_STATUS = '审批通过' and itf.id = ?1 and nia.APPLY_PERSON_ID = ?2",nativeQuery = true) InterfaceManage findDataByIdAndApply(String id, String personId); List findByIdIn(List ids); - List findBySameInterfaceIdAndIsDelete(String sameId, String isDelete); + List findBySameInterfaceIdAndIsDelete(String sameId,String isDelete); - @Query(value = "select count(*) from Y9_INTERFACE_MANAGE_INFO itf where itf.INTERFACE_STATUS = ?1 and itf.IS_DELETE = 'N'", nativeQuery = true) + @Query(value="select count(*) from Y9_INTERFACE_MANAGE_INFO itf where itf.INTERFACE_STATUS = ?1",nativeQuery = true) long getStatusCount(String status); - @Query(value = "select itf.ID from Y9_INTERFACE_MANAGE_INFO itf where itf.INTERFACE_STATUS = ?1 and itf.IS_DELETE = 'N'", nativeQuery = true) + @Query(value="select itf.ID from Y9_INTERFACE_MANAGE_INFO itf where itf.INTERFACE_STATUS = ?1",nativeQuery = true) List getIdsByStatus(String status); - @Query(value = "select count(*) from Y9_INTERFACE_MANAGE_INFO where IS_DELETE = 'N'", nativeQuery = true) + @Query(value="select count(*) from Y9_INTERFACE_MANAGE_INFO",nativeQuery = true) long getAllCount(); } diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/ParameterRepository.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/ParameterRepository.java similarity index 89% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/ParameterRepository.java rename to y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/ParameterRepository.java index bdc9eff..f482fa0 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/ParameterRepository.java +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/ParameterRepository.java @@ -10,16 +10,15 @@ import org.springframework.data.repository.query.Param; import javax.transaction.Transactional; import java.util.List; -public interface ParameterRepository extends JpaRepository, JpaSpecificationExecutor { +public interface ParameterRepository extends JpaRepository, JpaSpecificationExecutor{ @Query(value = "select pa from Parameter pa where pa.interfaceId = :interfaceId order by pa.sort,pa.pid") List findAllByInterfaceId(@Param("interfaceId") String interfaceId); - @Modifying @Transactional - @Query(value = "delete from Y9_INTERFACE_PARAMETER where INTERFACE_ID = ?1 ", nativeQuery = true) + @Query(value = "delete from Y9_INTERFACE_PARAMETER where INTERFACE_ID = ?1 " ,nativeQuery = true) void deleteByInterfaceId(String interfaceId); - List findAllByInterfaceIdAndRequired(String interfaceId, String required); + List findAllByInterfaceIdAndRequired(String interfaceId,String required); List findAllByInterfaceIdIn(List interfaceIds); } diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/SystemIdentifierRepository.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/SystemIdentifierRepository.java similarity index 85% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/SystemIdentifierRepository.java rename to y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/SystemIdentifierRepository.java index 5c1c304..e5faefc 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/SystemIdentifierRepository.java +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/SystemIdentifierRepository.java @@ -9,14 +9,14 @@ import org.springframework.data.jpa.repository.Query; import javax.transaction.Transactional; import java.util.List; -public interface SystemIdentifierRepository extends JpaRepository, JpaSpecificationExecutor { +public interface SystemIdentifierRepository extends JpaRepository, JpaSpecificationExecutor{ @Modifying @Transactional - @Query(value = "update Y9_INTERFACE_SYSTEM_IDENTIFIER SET IS_DELETE = 'Y' from where ID = ?1 ", nativeQuery = true) + @Query(value = "update Y9_INTERFACE_SYSTEM_IDENTIFIER SET IS_DELETE = 'Y' from where ID = ?1 " ,nativeQuery = true) void deleteInfoByIdLogic(String Id); - List findByParameterTypeAndIsDelete(String type, String isDelete); + List findByParameterTypeAndIsDelete(String type,String isDelete); - List findByParameterTypeAndPidAndIsDelete(String type, String pid, String isDelete); + List findByParameterTypeAndPidAndIsDelete(String type,String pid,String isDelete); } diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/ViewApproveRepository.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/ViewApproveRepository.java similarity index 83% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/ViewApproveRepository.java rename to y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/ViewApproveRepository.java index 623bbc7..3248c3c 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/repository/ViewApproveRepository.java +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/repository/ViewApproveRepository.java @@ -5,6 +5,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -public interface ViewApproveRepository extends JpaRepository, JpaSpecificationExecutor { +public interface ViewApproveRepository extends JpaRepository, JpaSpecificationExecutor{ } diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/vo/ApplyVo.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/vo/ApplyVo.java new file mode 100644 index 0000000..3c437aa --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/vo/ApplyVo.java @@ -0,0 +1,48 @@ +package net.risesoft.y9public.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import net.risesoft.y9public.entity.BaseEntity; + +import java.io.Serializable; +import java.util.Date; + +@Data +@NoArgsConstructor +public class ApplyVo extends BaseEntity implements Serializable{ + + private static final long serialVersionUID = 3121652146259274217L; + + private String id; + + private String applyPersonName; + + private String approveStatus; + + private String applyReason; + + private String interfaceId; + + private String sameId; + + private String approveId; + + /** + * 创建时间 + */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + protected Date createTime; + + public ApplyVo(String id, String applyPersonName, String approveStatus, Date createTime,String applyReason,String interfaceId,String sameId,String approveId) { + this.id = id; + this.applyPersonName = applyPersonName; + this.approveStatus = approveStatus; + this.createTime = createTime; + this.applyReason = applyReason; + this.interfaceId = interfaceId; + this.sameId = sameId; + this.approveId = approveId; + } +} + diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/vo/AuthSelectVo.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/vo/AuthSelectVo.java similarity index 100% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/y9public/vo/AuthSelectVo.java rename to y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/vo/AuthSelectVo.java diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/vo/UserData.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/vo/UserData.java new file mode 100644 index 0000000..d7f5c54 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/vo/UserData.java @@ -0,0 +1,11 @@ +package net.risesoft.y9public.vo; + +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +public class UserData { + private String id; + private String name; +} diff --git a/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/vo/ViewApproveVo.java b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/vo/ViewApproveVo.java new file mode 100644 index 0000000..9ca3100 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-support-interface-jpa-repository/src/main/java/net/risesoft/y9public/vo/ViewApproveVo.java @@ -0,0 +1,86 @@ +package net.risesoft.y9public.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import net.risesoft.y9public.entity.ViewApprove; + +import java.io.Serializable; +import java.util.Date; + +@Data +@NoArgsConstructor +public class ViewApproveVo implements Serializable{ + + private static final long serialVersionUID = 3121644149259274427L; + + private String approveId; + + private String interfaceId; + + private String applyId; + + private String approveStatus; + + private String illustrate; + + private String applyType; + + private String notes; + + private String isOver; + + private String approveInterfaceStatus; + + private String approvePersonName; + + private String approvePersonId; + + private String applyPersonName; + + private String applyPersonId; + + private String interfaceName; + + private String interfaceStatus; + + private String version; + private String statusSort; + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date applyTime; + private String alreadyApproveUser; + + private String currentUserId; + + private String isNow; + private String isLimitData; + + public ViewApproveVo(ViewApprove dto) { + this.approveId = dto.getApproveId(); + this.interfaceId = dto.getInterfaceId(); + this.applyId = dto.getApplyId(); + this.approveStatus = dto.getApproveStatus(); + this.illustrate = dto.getIllustrate(); + this.applyType = dto.getApplyType(); + this.notes = dto.getNotes(); + this.isOver = dto.getIsOver(); + this.approveInterfaceStatus = dto.getApproveInterfaceStatus(); + this.approvePersonName = dto.getApprovePersonName(); + this.approvePersonId = dto.getApprovePersonId(); + this.applyPersonName = dto.getApplyPersonName(); + this.applyPersonId = dto.getApplyPersonId(); + this.interfaceName = dto.getInterfaceName(); + this.interfaceStatus = dto.getInterfaceStatus(); + this.version = dto.getVersion(); + this.createTime = dto.getCreateTime(); + this.alreadyApproveUser = dto.getAlreadyApproveUser(); + this.currentUserId = dto.getCurrentUserId(); + this.applyTime = dto.getApplyTime(); + this.isLimitData = dto.getIsLimitData(); + this.statusSort = dto.getStatusSort(); + } +} + diff --git a/risenet-y9boot-webapp-interface-platform/lombok.config b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/lombok.config similarity index 100% rename from risenet-y9boot-webapp-interface-platform/lombok.config rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/lombok.config diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/pom.xml b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/pom.xml new file mode 100644 index 0000000..56c8825 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/pom.xml @@ -0,0 +1,231 @@ + + + 4.0.0 + + risenet-y9boot-webapp-interface-platform-execute + war + + + net.risesoft + y9-digitalbase + v9.6.8-SNAPSHOT + + + + + 11 + 11 + true + UTF-8 + + + + + + + net.risesoft + risenet-y9boot-starter-sso-oauth2-resource + ${project.version} + + + + net.risesoft + risenet-y9boot-api-feignclient-platform + v9.6.4-SNAPSHOT + + + + net.risesoft + risenet-y9boot-starter-security + ${project.version} + + + + net.risesoft + risenet-y9boot-starter-log + ${project.version} + + + + + net.risesoft + risenet-y9boot-starter-jpa-public + ${project.version} + + + + net.risesoft + risenet-y9boot-starter-listener-redis + ${project.version} + + + + com.alibaba + fastjson + + + + commons-net + commons-net + + + com.alibaba + druid + + + + com.alibaba + druid-spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-web + + + + javax.servlet + javax.servlet-api + provided + + + + + cn.hutool + hutool-core + 5.3.5 + + + + com.belerweb + pinyin4j + 2.5.0 + + + + ws.schild + jave-all-deps + 2.6.0 + + + + org.redisson + redisson + 3.16.2 + + + org.apache.cxf + cxf-rt-frontend-jaxws + 3.4.5 + + + + org.apache.cxf + cxf-rt-transports-http + 3.4.5 + + + org.apache.cxf + cxf-rt-rs-client + 3.4.5 + + + org.apache.cxf + cxf-rt-rs-extension-providers + 3.4.5 + + + org.codehaus.jettison + jettison + 1.2 + + + + net.risesoft + risenet-y9boot-starter-idGenerator + ${project.version} + + + + javax.xml.bind + jaxb-api + 2.2.1 + + + javax.xml + jaxb-impl + 2.1 + + + com.sun.xml.bind + jaxb-xjc + 2.2.1.1 + + + net.risesoft + risenet-y9boot-support-interface-jpa-repository + ${project.version} + + + + + + releases + https://svn.youshengyun.com:9900/nexus/repository/maven-releases/ + + + snapshots + https://svn.youshengyun.com:9900/nexus/repository/maven-snapshots/ + + + + + + y9-repo + local private nexus + https://svn.youshengyun.com:9900/nexus/repository/maven-public/ + + true + + + true + always + + + + + + y9-repo-plugin + local private plugin nexus + https://svn.youshengyun.com:9900/nexus/repository/maven-public/ + + + + + interfaceExecute + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-deploy-plugin + + false + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/InterfaceExecuteApplication.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/InterfaceExecuteApplication.java new file mode 100644 index 0000000..4f9ce64 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/InterfaceExecuteApplication.java @@ -0,0 +1,16 @@ +package net.risesoft; + +import net.risesoft.y9.configuration.Y9Properties; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; + + +@SpringBootApplication +@EnableConfigurationProperties(Y9Properties.class) +public class InterfaceExecuteApplication { + + public static void main(String[] args) { + SpringApplication.run(InterfaceExecuteApplication.class, args); + } +} diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/InterfaceServletInitializer.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/InterfaceServletInitializer.java similarity index 84% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/InterfaceServletInitializer.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/InterfaceServletInitializer.java index 0a11844..e630697 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/InterfaceServletInitializer.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/InterfaceServletInitializer.java @@ -8,6 +8,6 @@ public class InterfaceServletInitializer extends SpringBootServletInitializer { @Override protected SpringApplicationBuilder configure(final SpringApplicationBuilder builder) { - return builder.sources(InterfacePlatformApplication.class); + return builder.sources(InterfaceExecuteApplication.class); } } \ No newline at end of file diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/config/CheckLoginFilter.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/config/CheckLoginFilter.java similarity index 100% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/config/CheckLoginFilter.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/config/CheckLoginFilter.java diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/config/RestConfig.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/config/RestConfig.java similarity index 100% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/config/RestConfig.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/config/RestConfig.java diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/config/WebMvcConfig.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/config/WebMvcConfig.java similarity index 100% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/config/WebMvcConfig.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/config/WebMvcConfig.java diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/controller/RestInterfaceManageController.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/controller/RestInterfaceManageController.java new file mode 100644 index 0000000..c90d3b4 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/controller/RestInterfaceManageController.java @@ -0,0 +1,40 @@ +package net.risesoft.controller; + +import net.risesoft.log.OperationTypeEnum; +import net.risesoft.log.annotation.RiseLog; +import net.risesoft.service.UseInterfaceService; +import net.risesoft.y9public.dto.InterfaceManageDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; +import java.util.Map; + +/** + * 接口管理 + * + * @author duanzhixin + */ +@Controller +@RequestMapping("/api/rest/interface") +public class RestInterfaceManageController { + + @Autowired + private UseInterfaceService useInterfaceService; + + //测试接口 + @PostMapping(value = "/testInterface") + @ResponseBody + @RiseLog(operationType = OperationTypeEnum.SEND, operationName = "接口测试") + public ResponseEntity testInterface(@RequestBody InterfaceManageDTO interfaceManageDTO, HttpServletRequest request,HttpServletResponse responseRt) { + Map map = new HashMap<>(); + return useInterfaceService.testForward(interfaceManageDTO,request,responseRt); + } +} diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/UseInterfaceController.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/controller/UseInterfaceController.java similarity index 64% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/UseInterfaceController.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/controller/UseInterfaceController.java index eeec0dd..355347a 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/UseInterfaceController.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/controller/UseInterfaceController.java @@ -1,15 +1,28 @@ package net.risesoft.controller; +import com.alibaba.fastjson.JSONArray; import net.risesoft.log.OperationTypeEnum; import net.risesoft.log.annotation.RiseLog; import net.risesoft.service.UseInterfaceService; +import net.risesoft.y9public.entity.Parameter; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.net.URLDecoder; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; /** * 外部调用 @@ -31,13 +44,13 @@ public class UseInterfaceController { */ @RiseLog(operationType = OperationTypeEnum.SEND, operationName = "接口转发") @RequestMapping("/forward") - public ResponseEntity personPage(HttpServletRequest request, String userKey) { + public ResponseEntity personPage(HttpServletRequest request, String userKey,HttpServletResponse responseRt) { if (StringUtils.isBlank(userKey)) { userKey = request.getHeader("userKey"); } - ResponseEntity responseEntity = ResponseEntity.ok(useInterfaceService.forward(userKey, request)); - return responseEntity; + return useInterfaceService.forward(userKey, request,responseRt); } + } diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/ApplyType.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/ApplyType.java new file mode 100644 index 0000000..8399695 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/ApplyType.java @@ -0,0 +1,29 @@ +package net.risesoft.model; + +/** + * 申请类型枚举类 + */ +public enum ApplyType { + //接口调用申请 + INVOKE("0", "调用"), + //接口停用申请 + PUB_INTERFACE("2", "发布"), + //接口发布申请 + STOP_INTERFACE("1", "停用"); + + private final String enName; + private final String name; + + ApplyType(String enName, String name) { + this.enName = enName; + this.name = name; + } + + public String getEnName() { + return enName; + } + + public String getName() { + return name; + } +} \ No newline at end of file diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/ApproveStatus.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/ApproveStatus.java new file mode 100644 index 0000000..66f797a --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/ApproveStatus.java @@ -0,0 +1,34 @@ +package net.risesoft.model; + + +/** + * 审批状态枚举类 + */ +public enum ApproveStatus { + //未提交审批（初始状态） + UN_SUBMIT_APPROVE("0", "未提交"), + //未审批 + SUBMIT_APPROVE("1", "未审批"), + //审批中 + NOW_APPROVE("2", "审批中"), + //通过 + APPROVE("3", "通过"), + //不通过 + UN_APPROVE("4", "不通过"); + + private final String enName; + private final String name; + + ApproveStatus(String enName, String name) { + this.enName = enName; + this.name = name; + } + + public String getEnName() { + return enName; + } + + public String getName() { + return name; + } +} \ No newline at end of file diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/Effect.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/Effect.java new file mode 100644 index 0000000..7f85ae2 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/Effect.java @@ -0,0 +1,29 @@ +package net.risesoft.model; + +/** + * 流控效果枚举类：快速失败（1）;Warm Up（2）;排队等候（3） + */ +public enum Effect { + //快速失败 + FAIL_FAST("1", "快速失败"), + //Warm Up + WARM_UP("2", "Warm Up"), + //排队等候 + WAIT("3", "排队等候"); + + private final String enName; + private final String name; + + Effect(String enName, String name) { + this.enName = enName; + this.name = name; + } + + public String getEnName() { + return enName; + } + + public String getName() { + return name; + } +} \ No newline at end of file diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/InterfaceStatus.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/InterfaceStatus.java new file mode 100644 index 0000000..37f2853 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/InterfaceStatus.java @@ -0,0 +1,29 @@ +package net.risesoft.model; + +/** + * 接口状态枚举类 + */ +public enum InterfaceStatus { + //申请发布 + SUBMIT_APPROVE("1", "待发布"), + //发布 + APPROVE("2", "发布"), + //停用 + UN_APPROVE("3", "停用"); + + private final String enName; + private final String name; + + InterfaceStatus(String enName, String name) { + this.enName = enName; + this.name = name; + } + + public String getEnName() { + return enName; + } + + public String getName() { + return name; + } +} \ No newline at end of file diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/ParameterType.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/ParameterType.java new file mode 100644 index 0000000..60868b4 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/ParameterType.java @@ -0,0 +1,31 @@ +package net.risesoft.model; + +/** + * 数据类型枚举类 + */ +public enum ParameterType { + //INT类型 + INTEGER("integer", "integer"), + //BOOLEAN + BOOLEAN("boolean", "boolean"), + //INT类型 + STRING("String", "String"), + //DOUBLE + DOUBLE("double", "double"); + + private final String enName; + private final String name; + + ParameterType(String enName, String name) { + this.enName = enName; + this.name = name; + } + + public String getEnName() { + return enName; + } + + public String getName() { + return name; + } +} \ No newline at end of file diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/ThresholdType.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/ThresholdType.java new file mode 100644 index 0000000..8db779d --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/model/ThresholdType.java @@ -0,0 +1,27 @@ +package net.risesoft.model; + +/** + * 限流类型枚举类 + */ +public enum ThresholdType { + //自定义 + TYPE_ZDY("0", "自定义"), + //QPS + QPS("1", "QPS"); + + private final String enName; + private final String name; + + ThresholdType(String enName, String name) { + this.enName = enName; + this.name = name; + } + + public String getEnName() { + return enName; + } + + public String getName() { + return name; + } +} \ No newline at end of file diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/service/UseInterfaceService.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/service/UseInterfaceService.java new file mode 100644 index 0000000..6a09cbe --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/service/UseInterfaceService.java @@ -0,0 +1,15 @@ +package net.risesoft.service; + +import net.risesoft.y9public.dto.InterfaceManageDTO; +import org.springframework.http.ResponseEntity; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public interface UseInterfaceService { + //接口转发 + ResponseEntity forward(String id, HttpServletRequest request,HttpServletResponse responseRt); + + //接口测试 + ResponseEntity testForward(InterfaceManageDTO interfaceManageDTO, HttpServletRequest request, HttpServletResponse responseRt); +} diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/UseInterfaceServiceImpl.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/service/impl/UseInterfaceServiceImpl.java similarity index 72% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/UseInterfaceServiceImpl.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/service/impl/UseInterfaceServiceImpl.java index 7a6411d..617c21f 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/UseInterfaceServiceImpl.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/service/impl/UseInterfaceServiceImpl.java @@ -2,7 +2,6 @@ package net.risesoft.service.impl; import com.alibaba.fastjson.JSONArray; import net.risesoft.model.user.UserInfo; -import net.risesoft.service.BlacklistingService; import net.risesoft.service.UseInterfaceService; import net.risesoft.util.*; import net.risesoft.y9.Y9Context; @@ -13,17 +12,26 @@ import net.risesoft.y9public.dto.InterfaceManageDTO; import net.risesoft.y9public.dto.ParameterDTO; import net.risesoft.y9public.entity.*; import net.risesoft.y9public.repository.*; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.InputStreamResource; +import org.springframework.core.io.Resource; import org.springframework.http.*; +import org.springframework.http.client.ClientHttpResponse; import org.springframework.stereotype.Service; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import org.springframework.web.client.RequestCallback; +import org.springframework.web.client.ResponseExtractor; import org.springframework.web.client.RestTemplate; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; -import java.io.BufferedReader; -import java.io.InputStreamReader; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.net.URI; +import java.net.URISyntaxException; import java.text.SimpleDateFormat; import java.util.*; @@ -49,12 +57,12 @@ public class UseInterfaceServiceImpl implements UseInterfaceService { @Autowired private CallLogUtil calllogUtil; @Autowired - private BlacklistingService blacklistingService; + private BlacklistingRepository blacklistingRepository; public static final String regx = "@-@"; @Override - public Map forward(String id, HttpServletRequest request) { + public ResponseEntity forward(String id, HttpServletRequest request,HttpServletResponse responseRt) { Calendar calendar = Calendar.getInstance(); String logId = Y9IdGenerator.genId(IdType.SNOWFLAKE); HashMap logMap = new HashMap<>(); @@ -75,7 +83,7 @@ public class UseInterfaceServiceImpl implements UseInterfaceService { logMap.put("status", "接口信息查询失败"); logMap.put("errMsg", "请求失败！申请信息已经过期请重新申请"); logMap.put("code", "401"); - return map; + return ResponseEntity.ok().body(map); } if (request.getHeader("userName") == null) { logMap.put("userName", interfaceApply.getUsePersonResponsible()); @@ -83,7 +91,7 @@ public class UseInterfaceServiceImpl implements UseInterfaceService { if (request.getHeader("userId") == null) { logMap.put("userId", interfaceApply.getApplyPersonId()); } - List blacklistingList = blacklistingService.getListByInterfaceId(interfaceApply.getInterfaceId()); + List blacklistingList = blacklistingRepository.findByInterfaceId("%,"+interfaceApply.getInterfaceId()+"%"); if (blacklistingList.size() != 0) { String hostIp = Y9Context.getIpAddr(request); for (Blacklisting blacklisting : blacklistingList) { @@ -93,7 +101,7 @@ public class UseInterfaceServiceImpl implements UseInterfaceService { logMap.put("status", "失败"); logMap.put("errMsg", "请求失败！该系统的IP已经拉入黑名单！"); logMap.put("code", "401"); - return map; + return ResponseEntity.ok().body(map); } } } @@ -106,7 +114,7 @@ public class UseInterfaceServiceImpl implements UseInterfaceService { logMap.put("errMsg", e.getMessage()); logMap.put("code", "501"); e.printStackTrace(); - return map; + return ResponseEntity.ok().body(map); } ResponseEntity response = null; if (interfaceManage == null) { @@ -114,7 +122,7 @@ public class UseInterfaceServiceImpl implements UseInterfaceService { logMap.put("status", "请求失败"); logMap.put("errMsg", "请求失败！无权限"); logMap.put("code", "501"); - return map; + return ResponseEntity.ok().body(map); } InterfaceManageDTO interfaceManageDTO = new InterfaceManageDTO(interfaceManage); //判断开启限流 @@ -135,7 +143,7 @@ public class UseInterfaceServiceImpl implements UseInterfaceService { calendar.setTime(new Date()); Long limitEndTime = calendar.getTimeInMillis(); logMap.put("limitWaitTime", String.valueOf(limitEndTime - limitStartTime)); - return map; + return ResponseEntity.ok().body(map); } logMap.put("limitMsg", "通过"); calendar.setTime(new Date()); @@ -148,7 +156,7 @@ public class UseInterfaceServiceImpl implements UseInterfaceService { logMap.put("errMsg", "请求失败！限流失败！"); logMap.put("code", "401"); logMap.put("limitMsg", "限流失败"); - return map; + return ResponseEntity.ok().body(map); } } } @@ -160,7 +168,7 @@ public class UseInterfaceServiceImpl implements UseInterfaceService { logMap.put("status", "请求失败"); logMap.put("errMsg", "请求失败！请求方式不支持！"); logMap.put("code", "401"); - return map; + return ResponseEntity.ok().body(map); } else { Enumeration parameterNames = request.getParameterNames(); if (!parameterNames.hasMoreElements()) { @@ -188,7 +196,7 @@ public class UseInterfaceServiceImpl implements UseInterfaceService { logMap.put("status", "请求失败"); logMap.put("errMsg", JSONArray.toJSONString(errList)); logMap.put("code", "401"); - return map; + return ResponseEntity.ok().body(map); } if (!"Rest".equals(interfaceManageDTO.getInterfaceType())) { Map resultMap = new HashMap<>(); @@ -198,7 +206,7 @@ public class UseInterfaceServiceImpl implements UseInterfaceService { logMap.put("errMsg", resultMap.get("msg").toString()); logMap.put("code", resultMap.get("status").toString()); logMap.put("authMsg", "失败"); - return map; + return ResponseEntity.ok().body(map); } logMap.put("status", "成功"); logMap.put("authMsg", "成功"); @@ -230,31 +238,41 @@ public class UseInterfaceServiceImpl implements UseInterfaceService { logMap.put("errMsg", resultMap.get("msg").toString()); logMap.put("code", resultMap.get("status").toString()); logMap.put("authMsg", "失败"); - return map; + return ResponseEntity.ok().body(map); } logMap.put("status", "成功"); logMap.put("authMsg", "成功"); logMap.put("forwardRequestParam", JSONArray.toJSONString(body)); logMap.put("forwardStartTime", sdf.format(calendar.getTime())); - if ("post".equals(interfaceManageDTO.getInterfaceMethod())) { - response = post(interfaceManageDTO, request, headers, body); - } else if ("get".equals(interfaceManageDTO.getInterfaceMethod())) { - response = get(interfaceManageDTO, headers, body); + if(interfaceManageDTO.getIsResponseFile()){ + ResponseEntity fileRes = null; + if ("post".equals(interfaceManageDTO.getInterfaceMethod())) { + postFile(interfaceManageDTO, headers, body,responseRt,logMap); + } else if ("get".equals(interfaceManageDTO.getInterfaceMethod())) { + getFile(interfaceManageDTO, headers, body,responseRt,logMap); + } + }else { + if ("post".equals(interfaceManageDTO.getInterfaceMethod())) { + response = post(interfaceManageDTO, request, headers, body); + } else if ("get".equals(interfaceManageDTO.getInterfaceMethod())) { + response = get(interfaceManageDTO, headers, body); + } + if (response.getStatusCodeValue() == 200) { + logMap.put("status", "成功"); + logMap.put("code", "200"); + logMap.put("forwardResponseMsg", "成功"); + } else { + logMap.put("status", "失败"); + logMap.put("code", "502"); + logMap.put("forwardResponseMsg", "失败"); + logMap.put("forwardErrMsg", response.getBody()); + } + logMap.put("forwardResponseCode", "" + response.getStatusCodeValue()); + logMap.put("forwardResponseData", response.getBody()); + Map dataMap = JSONArray.parseObject(response.getBody(), Map.class); + map.putAll(dataMap); + return ResponseEntity.ok().header(HttpHeaders.CONTENT_TYPE,"application/json").body(map); } - if (response.getStatusCodeValue() == 200) { - logMap.put("status", "成功"); - logMap.put("code", "200"); - logMap.put("forwardResponseMsg", "成功"); - } else { - logMap.put("status", "失败"); - logMap.put("code", "502"); - logMap.put("forwardResponseMsg", "失败"); - logMap.put("forwardErrMsg", response.getBody()); - } - logMap.put("forwardResponseCode", "" + response.getStatusCodeValue()); - logMap.put("forwardResponseData", response.getBody()); - Map dataMap = JSONArray.parseObject(response.getBody(), Map.class); - map.putAll(dataMap); } } catch (Exception e) { map.put("msg", e.getMessage()); @@ -266,11 +284,12 @@ public class UseInterfaceServiceImpl implements UseInterfaceService { logMap.put("requestEndTime", sdf.format(calendar.getTime())); calllogUtil.createLog(logId, interfaceApply, interfaceManage, logMap, request); } - return map; + return ResponseEntity.ok().body(map); } @Override - public Map testForward(InterfaceManageDTO interfaceManageDTO, HttpServletRequest request) { + public ResponseEntity testForward(InterfaceManageDTO interfaceManageDTO, HttpServletRequest request,HttpServletResponse responseRt) { + ResponseEntity res = null; Calendar calendar = Calendar.getInstance(); String logId = Y9IdGenerator.genId(IdType.SNOWFLAKE); HashMap logMap = new HashMap<>(); @@ -337,31 +356,46 @@ public class UseInterfaceServiceImpl implements UseInterfaceService { logMap.put("forwardResponseData", JSONArray.toJSONString(objectMap.get("data"))); map.putAll(objectMap); } else { - Map resultMap = new HashMap<>(); logMap.put("status", "成功"); logMap.put("authMsg", "成功"); logMap.put("forwardRequestParam", JSONArray.toJSONString(body)); logMap.put("forwardStartTime", sdf.format(calendar.getTime())); - if ("post".equals(interfaceManageDTO.getInterfaceMethod())) { - response = post(interfaceManageDTO, request, headers, body); - } else if ("get".equals(interfaceManageDTO.getInterfaceMethod())) { - response = get(interfaceManageDTO, headers, body); + if(interfaceManageDTO.getIsResponseFile()){ + if ("post".equals(interfaceManageDTO.getInterfaceMethod())) { + postFile(interfaceManageDTO, headers, body,responseRt,logMap); + } else if ("get".equals(interfaceManageDTO.getInterfaceMethod())) { + getFile(interfaceManageDTO, headers, body,responseRt,logMap); + } + }else { + if ("post".equals(interfaceManageDTO.getInterfaceMethod())) { + response = post(interfaceManageDTO, request, headers, body); + } else if ("get".equals(interfaceManageDTO.getInterfaceMethod())) { + response = get(interfaceManageDTO, headers, body); + } + if (response.getStatusCodeValue() == 200) { + logMap.put("status", "成功"); + logMap.put("code", "200"); + logMap.put("forwardResponseMsg", "成功"); + } else { + logMap.put("status", "失败"); + logMap.put("code", "502"); + logMap.put("forwardResponseMsg", "失败"); + logMap.put("forwardErrMsg", response.getBody()); + } + logMap.put("forwardResponseCode", "" + response.getStatusCodeValue()); + logMap.put("forwardResponseData", response.getBody()); + try { + map.put("data", JSONArray.parseArray(response.getBody(),Map.class)); + }catch (Exception e){ + map.put("data", response.getBody()); + } + map.put("resCode", response.getStatusCodeValue()); } - if (response.getStatusCodeValue() == 200) { - logMap.put("status", "成功"); - logMap.put("code", "200"); - logMap.put("forwardResponseMsg", "成功"); - } else { - logMap.put("status", "失败"); - logMap.put("code", "502"); - logMap.put("forwardResponseMsg", "失败"); - logMap.put("forwardErrMsg", response.getBody()); - } - logMap.put("forwardResponseCode", "" + response.getStatusCodeValue()); - logMap.put("forwardResponseData", response.getBody()); - map.put("data", response.getBody()); - map.put("code", response.getStatusCodeValue()); + } + if(!interfaceManageDTO.getIsResponseFile()){ + map.put("code","0"); + res = ResponseEntity.ok().header(HttpHeaders.CONTENT_TYPE,"application/json").body(map); } } catch (Exception e) { map.put("msg", e.getMessage()); @@ -369,6 +403,7 @@ public class UseInterfaceServiceImpl implements UseInterfaceService { logMap.put("status", "请求失败"); logMap.put("errMsg", e.getMessage()); logMap.put("code", "501"); + res = ResponseEntity.status(501).body(map); } finally { calendar.setTime(new Date()); logMap.put("requestEndTime", sdf.format(calendar.getTime())); @@ -376,7 +411,7 @@ public class UseInterfaceServiceImpl implements UseInterfaceService { logMap.put("userName", person.getName()); calllogUtil.createLog(logId, interfaceApply, interfaceManage, logMap, request); } - return map; + return res; } //get请求方法 @@ -415,6 +450,140 @@ public class UseInterfaceServiceImpl implements UseInterfaceService { return response; } + //get请求方法 + private ResponseEntity getFile(InterfaceManageDTO interfaceManageDTO, HttpHeaders headers, Map body) { + RestTemplate restTemplate = restUtil.restTemplate(5000, 300000); + HttpEntity> entity = new HttpEntity>(headers); + String url = interfaceManageDTO.getNetworkAgreement() + "://" + interfaceManageDTO.getInterfaceUrl(); + if (body.size() != 0) { + url += "?"; + } + for (String key : body.keySet()) { + String value = body.get(key).toString(); + url += key + "=" + value + "&"; + } + if (body.size() != 0) { + url = url.substring(0, url.length() - 1); + } + ResponseEntity response = restTemplate.exchange(url, HttpMethod.GET, entity, Resource.class); + return response; + } + + //get请求方法 + private void getFile(InterfaceManageDTO interfaceManageDTO, HttpHeaders headers, Map body,HttpServletResponse responseRt,HashMap logMap) { + RestTemplate restTemplate = restUtil.restTemplate(5000, 300000); + HttpEntity> entity = new HttpEntity>(headers); + String url = interfaceManageDTO.getNetworkAgreement() + "://" + interfaceManageDTO.getInterfaceUrl(); + if (body.size() != 0) { + url += "?"; + } + for (String key : body.keySet()) { + String value = body.get(key).toString(); + url += key + "=" + value + "&"; + } + if (body.size() != 0) { + url = url.substring(0, url.length() - 1); + } + responseRt.setHeader("Access-Control-Expose-Headers","content-disposition"); + RequestCallback requestCallback = restTemplate.httpEntityCallback(entity); + try { + HttpHeaders httpHeaders = new HttpHeaders(); + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + restTemplate.execute(new URI(url), HttpMethod.GET, requestCallback, new ResponseExtractor() { + @Override + public Void extractData(ClientHttpResponse response) throws IOException { + if (response.getStatusCode().value() == 200) { + logMap.put("status", "成功"); + logMap.put("code", "200"); + logMap.put("forwardResponseMsg", "成功"); + } else { + logMap.put("status", "失败"); + logMap.put("code", "502"); + logMap.put("forwardResponseMsg", "失败"); + logMap.put("forwardErrMsg", "传输为文件"); + } + logMap.put("forwardResponseCode", "" + response.getStatusCode().value()); + logMap.put("forwardResponseData", "传输为文件"); + + responseRt.setHeader("content-disposition",response.getHeaders().get("content-disposition").get(0)); + try (InputStream inputStream = response.getBody()) { + IOUtils.copy(inputStream,responseRt.getOutputStream()); + responseRt.getOutputStream().flush(); + } + return null; + } + }); + } catch (Exception e) { + e.printStackTrace(); + throw new RuntimeException(); + } + } + + //post请求方法 + private ResponseEntity postFile(InterfaceManageDTO interfaceManageDTO, HttpServletRequest request, HttpHeaders headers, Map requestBody) { + MultiValueMap body = new LinkedMultiValueMap<>(); + for (String key : requestBody.keySet()) { + body.set(key, requestBody.get(key)); + } + RestTemplate restTemplate = restUtil.restTemplate(5000, 300000); + HttpEntity entity; + if ("application/json".equals((headers.get("content-type") != null ? headers.get("content-type").get(0).toLowerCase() : ""))) { + entity = new HttpEntity<>(requestBody, headers); + } else { + entity = new HttpEntity<>(body, headers); + } + ResponseEntity response = restTemplate.postForEntity(interfaceManageDTO.getNetworkAgreement() + "://" + interfaceManageDTO.getInterfaceUrl(), entity, Resource.class); + return response; + } + + private void postFile(InterfaceManageDTO interfaceManageDTO,HttpHeaders headers, Map requestBody,HttpServletResponse responseRt,HashMap logMap) { + MultiValueMap body = new LinkedMultiValueMap<>(); + for (String key : requestBody.keySet()) { + body.set(key, requestBody.get(key)); + } + RestTemplate restTemplate = restUtil.restTemplate(5000, 300000); + HttpEntity entity; + if ("application/json".equals((headers.get("content-type") != null ? headers.get("content-type").get(0).toLowerCase() : ""))) { + entity = new HttpEntity<>(requestBody, headers); + } else { + entity = new HttpEntity<>(body, headers); + } + //ResponseEntity response = restTemplate.postForEntity(interfaceManageDTO.getNetworkAgreement() + "://" + interfaceManageDTO.getInterfaceUrl(), entity, Resource.class); + responseRt.setHeader("Access-Control-Expose-Headers","content-disposition"); + RequestCallback requestCallback = restTemplate.httpEntityCallback(entity); + try { + HttpHeaders httpHeaders = new HttpHeaders(); + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + String url = interfaceManageDTO.getNetworkAgreement() + "://" + interfaceManageDTO.getInterfaceUrl(); + restTemplate.execute(new URI(url), HttpMethod.POST, requestCallback, new ResponseExtractor() { + @Override + public Void extractData(ClientHttpResponse response) throws IOException { + if (response.getStatusCode().value() == 200) { + logMap.put("status", "成功"); + logMap.put("code", "200"); + logMap.put("forwardResponseMsg", "成功"); + } else { + logMap.put("status", "失败"); + logMap.put("code", "502"); + logMap.put("forwardResponseMsg", "失败"); + logMap.put("forwardErrMsg", "传输为文件"); + } + logMap.put("forwardResponseCode", "" + response.getStatusCode().value()); + logMap.put("forwardResponseData", "传输为文件"); + + responseRt.setHeader("content-disposition",response.getHeaders().get("content-disposition").get(0)); + try (InputStream inputStream = response.getBody()) { + IOUtils.copy(inputStream,responseRt.getOutputStream()); + responseRt.getOutputStream().flush(); + } + return null; + } + }); + } catch (Exception e) { + e.printStackTrace(); + throw new RuntimeException(); + } + } //获取头参数 private HttpHeaders getHeaders(HttpServletRequest request, List list, List errList) { HttpHeaders headers = new HttpHeaders(); diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/AuthCheckUtil.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/AuthCheckUtil.java new file mode 100644 index 0000000..4da76c2 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/AuthCheckUtil.java @@ -0,0 +1,233 @@ +package net.risesoft.util; + +import cn.hutool.crypto.digest.DigestAlgorithm; +import cn.hutool.crypto.digest.Digester; +import com.alibaba.fastjson.JSONArray; +import net.risesoft.y9public.entity.InterfaceApply; +import net.risesoft.y9public.entity.InterfaceManage; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; + +import static net.risesoft.service.impl.UseInterfaceServiceImpl.regx; + +@Component +public class AuthCheckUtil { + + //sql注入正则 + private static final String badStrReg = "\\b(and|or)\\b.{1,6}?(=|>|<|\\bin\\b|\\blike\\b)|\\/\\*.+?\\*\\/|<\\s*script\\b|" + + "\\bEXEC\\b|UNION.+?SELECT|UPDATE.+?SET|INSERT\\s+INFO.+?VALUES|(SELECT|DELETE).+?FROM|(CREATE|ALTER|DROP|TRUNCATE)\\s+(TABLE|DATABASE)"; + + //xss脚本正则 + private final static Pattern[] scriptPatterns = { + Pattern.compile("",Pattern.CASE_INSENSITIVE), + Pattern.compile("src[\r\n]*=[\r\n]*\\'(.*?)\\'",Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL), + Pattern.compile("",Pattern.CASE_INSENSITIVE), + Pattern.compile("",Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL), + Pattern.compile("eval\\((.*?)\\)",Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL), + Pattern.compile("expression\\((.*?)\\)",Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL), + Pattern.compile("javascript:",Pattern.CASE_INSENSITIVE), + Pattern.compile("vbscript:",Pattern.CASE_INSENSITIVE), + Pattern.compile("onload(.*?)=",Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL) + }; + + public static String getIp(HttpServletRequest request){ + String ip=request.getHeader("X-Real-IP"); + if(ip == null || ip.length()==0|| "unknown".equalsIgnoreCase(ip)){ + ip = request.getHeader("X-Forwarded-For"); + } + if(ip == null || ip.length()==0 || "unknown".equalsIgnoreCase(ip)){ + ip = request.getHeader("Proxy-Client-Ip"); + } + if(ip ==null || ip.length()==0 || "unknown".equalsIgnoreCase(ip)){ + ip =request.getHeader("WL-Proxy-Client-Ip"); + } + if(ip == null || ip.length()==0 || "unknown".equalsIgnoreCase(ip)){ + ip = request.getRemoteAddr(); + } + return ip; + } + /** + * 过滤sql注入 + * @param src 单个参数值 + */ + public String checkSQLInject(String src,String key){ + if (StringUtils.isBlank(src)){ + return src; + } + + //非法sql注入正则 + Pattern sqlPattern = Pattern.compile(badStrReg,Pattern.CASE_INSENSITIVE); + if (sqlPattern.matcher(src.toLowerCase()).find()){ + throw new BizException("sql注入检查，参数"+key+"含有非法攻击字符，请检查"); + } + return src; + } + + /** + * 清除xss + * @param src 单个参数值 + */ + public String checkXSS(String src,String key){ + if (StringUtils.isBlank(src)){ + return src; + } + String temp = src; + for (Pattern pattern : scriptPatterns){ + temp = pattern.matcher(temp).replaceAll(""); + } + temp = temp.replaceAll("<","<").replaceAll(">",">"); + if (!temp.equals(src)){ + throw new BizException("xss攻击检查，参数"+key+"含有非法攻击字符"); + } + return src; + } + + /** + * 参数类型校验 + * @param parameter 参数值 + * @param type 参数类型 + */ + private Boolean checkParameterType(String parameter,String type){ + switch (type){ + case "String": return true; + case "integer": + String regx = "\\d+"; + if (Pattern.matches(regx,parameter)){ + try { + int num = Integer.parseInt(parameter); + return true; + }catch (NumberFormatException e){ + return false; + } + }else { + return false; + } + case "boolean": + return "true".equalsIgnoreCase(parameter) || "false".equalsIgnoreCase(parameter); + case "number": + return StringUtils.isNumeric(parameter); + default:return false; + } + } + + //数据基础校验 + public Boolean checkData(String val, String key,String type,List errList){ + int len = errList.size(); + try { + //检查xss攻击和sql注入 + checkXSS(checkSQLInject(val,key),key); + //类型校验 + if (StringUtils.isNotBlank(val)){ + if (!checkParameterType(val,type)){ + errList.add("参数类型检查，参数："+key+"数据类型不正确，不是"+type); + } + } + }catch (BizException e){ + errList.add(e.getMessage()); + } + return errList.size() != len; + } + + //权限校验 + public Boolean checkAki(HttpServletRequest request, Map querymap,InterfaceManage interfaceManage,InterfaceApply apply, Map resultmap,Map valMap) { + + String accessKey = request.getHeader("userKey"); + + if(apply==null ) { + resultmap.put("status", 401); + resultmap.put("msg", "无权限访问该接口,非法调用者或您的唯一标识不正确"); + return false; + } + List ipList = Arrays.asList(apply.getIpWhitelist().split(",")); + if (!ipList.contains(getIp(request))) { + resultmap.put("status", 401); + resultmap.put("msg", "无权限访问该接口,未开通此ip"); + return false; + } + + //检测参数范围是否正确 + if("是".equals(interfaceManage.getIsLimitData())){ + List booleanList = new ArrayList<>(); + if (StringUtils.isNotBlank(apply.getAuth())){ + Map authMap = JSONArray.parseObject(apply.getAuth(),Map.class); + for (String key : authMap.keySet()){ + booleanList.add(checkParameter(valMap.get(key),authMap.get(key),regx)); + } + } + if (booleanList.contains(false)) { + resultmap.put("status", 401); + resultmap.put("msg", "无权限访问该接口,参数超出范围"); + return false; + } + } + + if ("是".equals(interfaceManage.getIsAuth())){ + if (querymap.get("userGetSign")!=null){ + String userGetSign = querymap.get("userGetSign").toString(); + querymap.remove("userGetSign"); + + String sign2 = getSign(querymap, apply.getUserSecret()); + + if(!sign2.equals(userGetSign)) { + resultmap.put("status", 401); + resultmap.put("msg", "无权限访问该接口,秘钥错误"); + return false; + } + }else{ + resultmap.put("status", 401); + resultmap.put("msg", "无权限访问该接口,未带权限校验值"); + return false; + } + } + + return true; + } + + /** + * 校验权限范围值 + */ + private Boolean checkParameter(Object obj,String parameterRange,String regx){ + if (obj==null){ + return true; + } + String parameter = obj.toString(); + if (StringUtils.isBlank(parameter)&&StringUtils.isBlank(parameterRange)){ + return true; + } + if(StringUtils.isBlank(parameterRange)){ + return false; + } + if(StringUtils.isBlank(parameter)){ + return true; + } + String[] parameters = parameter.split(regx); + String val = ","+parameterRange+","; + for (String str : parameters){ + if(StringUtils.isNotBlank(str)){ + if(val.indexOf(","+str+",")==-1){ + return false; + } + } + } + return true; + } + + /** + * 获取sign值 + * @param map + * @param secretKry + * @return + */ + private static String getSign(Map map, String secretKry) { + Digester md5 = new Digester(DigestAlgorithm.SHA256); + String content = map.toString()+"."+secretKry; + return md5.digestHex(content); + } +} diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/BizException.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/BizException.java similarity index 82% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/BizException.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/BizException.java index b89d0d2..c39ecb8 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/BizException.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/BizException.java @@ -1,6 +1,8 @@ package net.risesoft.util; public class BizException extends RuntimeException { + public BizException() { + } public BizException(String message) { super(message); diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/CallLogUtil.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/CallLogUtil.java similarity index 74% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/CallLogUtil.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/CallLogUtil.java index 08755de..132922b 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/CallLogUtil.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/CallLogUtil.java @@ -14,9 +14,9 @@ import org.springframework.kafka.core.KafkaTemplate; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.BufferedReader; import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -26,69 +26,13 @@ public class CallLogUtil { @Autowired private Environment environment; - @Autowired private CallApiLogRepository callApiLogRepository; private KafkaTemplate y9KafkaTemplate; - - public void requestStartLog(String logId, HttpServletRequest request){ - Date startDate = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(startDate); - Long startTime = calendar.getTimeInMillis(); - try { - if (this.y9KafkaTemplate == null && Boolean.valueOf(environment.getProperty("y9.app.log.kafkaEnabled"))) { - this.y9KafkaTemplate = Y9Context.getBean("y9KafkaTemplate"); - } - } catch (Exception e) { - e.printStackTrace(); - } - String serverIp = InetAddressUtil.getLocalAddress().getHostAddress(); - CallApiRequestLogInfo log = new CallApiRequestLogInfo(); - log.setId(logId); -// log.setRequestStartTime(startTime); - String success = "成功"; - String hostIp = ""; - HttpServletResponse response = null; - try { - hostIp = Y9Context.getIpAddr(request); - } catch (Exception e) { - e.printStackTrace(); - } - log.setRequestIP(hostIp); - log.setServerIP(serverIp); - log.setUserKey(request.getHeader("userKey")); - log.setRequestUserId(request.getHeader("userId")); - log.setRequestUserName(request.getHeader("userName")); - //获取请求参数 - Map body = new HashMap<>(); - Enumeration parameterNames = request.getParameterNames(); - if (!parameterNames.hasMoreElements()){ - body = readBody(request); - } - while (parameterNames.hasMoreElements()){ - String key = parameterNames.nextElement(); - String value = request.getParameter(key); - body.put(key,value); - } - log.setRequestParam(JSONArray.toJSONString(body)); - } - - - public void requestEndLog(String logId, Map msgData){ - long startTime = System.nanoTime(); - String serverIp = InetAddressUtil.getLocalAddress().getHostAddress(); - CallApiRequestLogInfo log = new CallApiRequestLogInfo(); - log.setId(logId); -// log.setRequestEndTime(startTime); -// System.out.println(startTime); - } - - //finally进入的日志记录 - public void createLog(String logId, InterfaceApply apply, InterfaceManage entity, Map msgData, HttpServletRequest request) { + public void createLog(String logId, InterfaceApply apply, InterfaceManage entity, Map msgData,HttpServletRequest request){ try { if (this.y9KafkaTemplate == null && Boolean.valueOf(environment.getProperty("y9.app.log.kafkaEnabled"))) { this.y9KafkaTemplate = Y9Context.getBean("y9KafkaTemplate"); @@ -137,7 +81,7 @@ public class CallLogUtil { String value = request.getParameter(key); body.put(key, value); } - if (body == null || body.size() == 0) { + if (body!=null && body.size()!=0) { log.setRequestParam(msgData.get("requestParam")); } else { log.setRequestParam(JSONArray.toJSONString(body)); @@ -204,7 +148,11 @@ public class CallLogUtil { log.setForwardResponseData(msgData.get("forwardResponseData")); log.setForwardErrMsg(msgData.get("forwardErrMsg")); log.setForwardResponseMsg(msgData.get("forwardResponseMsg")); - callApiLogRepository.save(log); + if (this.y9KafkaTemplate == null && Boolean.valueOf(environment.getProperty("y9.app.log.kafkaEnabled"))) { + y9KafkaTemplate.send("interface-management",JSONArray.toJSONString(log)); + }else { + callApiLogRepository.save(log); + } } //application/json读取数据 diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/JaxRsUtil.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/JaxRsUtil.java new file mode 100644 index 0000000..c770893 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/JaxRsUtil.java @@ -0,0 +1,70 @@ +package net.risesoft.util; + +import net.risesoft.y9public.entity.InterfaceManage; +import org.springframework.stereotype.Component; + +import javax.ws.rs.client.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Component +public class JaxRsUtil { + public Map JaxRsForward(InterfaceManage interfaceManage, List> list, Map headers){ + Map map = new HashMap<>(); + try{ + Client client = ClientBuilder.newClient(); + String url = interfaceManage.getNetworkAgreement()+"://" + interfaceManage.getInterfaceUrl(); + WebTarget target; + if (url.indexOf("/{")!=-1 && url.indexOf("}")!=-1){ + //替换restful风格url + for (Map map1 : list){ + for(String key : map1.keySet()){ + url = url.replace("{"+key+"}",map1.get(key)); + } + } + target = client.target(url); + }else { + target = client.target(url); + for (Map map1 : list){ + for(String key : map1.keySet()){ + target = target.queryParam(key,map1.get(key)); + } + } + } + Invocation.Builder builder = target.request(); + if (headers.size()!=0){ + for (String key : headers.keySet()){ + builder = builder.header(key,headers.get(key)); + } + } + if ("get".equals(interfaceManage.getInterfaceMethod())){ + Response response = builder.get(); + if (response.getStatus()!=200){ + map.put("status",false); + }else { + map.put("status",true); + } + map.put("code",response.getStatus()); + map.put("data",response.readEntity(String.class)); + }else if ("post".equals(interfaceManage.getInterfaceMethod())){ + Response response = builder.post(Entity.entity("param", MediaType.TEXT_PLAIN_TYPE)); + if (response.getStatus()!=200){ + map.put("status",false); + }else { + map.put("status",true); + } + map.put("code",response.getStatus()); + map.put("data",response.readEntity(String.class)); + } + }catch (Exception e){ + map.put("status",false); + map.put("msg",e.getMessage()); + } + + return map; + } + +} diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/JaxWsUtil.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/JaxWsUtil.java new file mode 100644 index 0000000..90c42fc --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/JaxWsUtil.java @@ -0,0 +1,164 @@ +package net.risesoft.util; + +import net.risesoft.y9public.entity.InterfaceManage; +import org.apache.commons.lang3.StringUtils; +import org.apache.cxf.endpoint.Client; +import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory; +import org.apache.cxf.transport.http.HTTPConduit; +import org.apache.cxf.transports.http.configuration.HTTPClientPolicy; +import org.springframework.stereotype.Component; + +import javax.xml.namespace.QName; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Component +public class JaxWsUtil { + public Map JaxWsForward(InterfaceManage interfaceManage, List list){ + Map map = new HashMap<>(); + try { + JaxWsDynamicClientFactory clientFactory = JaxWsDynamicClientFactory.newInstance(); + Client client = clientFactory.createClient(interfaceManage.getNetworkAgreement()+"://"+interfaceManage.getInterfaceUrl()); + HTTPConduit conduit = (HTTPConduit)client.getConduit(); + HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy(); + httpClientPolicy.setConnectionTimeout(6000000); + httpClientPolicy.setReceiveTimeout(6000000); + conduit.setClient(httpClientPolicy); + Object[] objects = new Object[0]; + if (StringUtils.isNotBlank(interfaceManage.getNameSpace())){ + QName operationName = new QName(interfaceManage.getNameSpace(),interfaceManage.getMethod()); + objects = getData(client,operationName,list); + }else { + QName operationName = new QName(interfaceManage.getMethod()); + objects = getData(client,operationName,list); + } + if (objects!=null){ + map.put("status",true); + map.put("data",objects[0]); + }else { + map.put("status",false); + } + }catch (Exception e){ + map.put("status",false); + map.put("msg","对方系统请求失败！"); + e.printStackTrace(); + } + return map; + } + + private Object[] getData(Client client,QName operationName,List list) throws Exception{ + switch (list.size()){ + case 1: + return client.invoke(operationName,list.get(0)); + case 2: + return client.invoke(operationName,list.get(0),list.get(1)); + case 3: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2)); + case 4: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3)); + case 5: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4)); + case 6: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4),list.get(5)); + case 7: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4),list.get(5),list.get(6)); + case 8: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4),list.get(5),list.get(6),list.get(7)); + case 9: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4),list.get(5),list.get(6),list.get(7),list.get(8)); + case 10: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9)); + case 11: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10)); + case 12: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11)); + case 13: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12)); + case 14: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12) + ,list.get(13)); + case 15: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12) + ,list.get(13),list.get(14)); + case 16: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12) + ,list.get(13),list.get(14),list.get(15)); + case 17: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12) + ,list.get(13),list.get(14),list.get(15),list.get(16)); + case 18: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12) + ,list.get(13),list.get(14),list.get(15),list.get(16),list.get(17)); + case 19: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12) + ,list.get(13),list.get(14),list.get(15),list.get(16),list.get(17),list.get(18)); + case 20: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12) + ,list.get(13),list.get(14),list.get(15),list.get(16),list.get(17),list.get(18),list.get(19)); + case 21: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12) + ,list.get(13),list.get(14),list.get(15),list.get(16),list.get(17),list.get(18),list.get(19),list.get(20)); + case 22: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12) + ,list.get(13),list.get(14),list.get(15),list.get(16),list.get(17),list.get(18),list.get(19),list.get(20) + ,list.get(21)); + case 23: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12) + ,list.get(13),list.get(14),list.get(15),list.get(16),list.get(17),list.get(18),list.get(19),list.get(20) + ,list.get(21),list.get(22)); + case 24: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12) + ,list.get(13),list.get(14),list.get(15),list.get(16),list.get(17),list.get(18),list.get(19),list.get(20) + ,list.get(21),list.get(22),list.get(23)); + case 25: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12) + ,list.get(13),list.get(14),list.get(15),list.get(16),list.get(17),list.get(18),list.get(19),list.get(20) + ,list.get(21),list.get(22),list.get(23),list.get(24)); + case 26: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12) + ,list.get(13),list.get(14),list.get(15),list.get(16),list.get(17),list.get(18),list.get(19),list.get(20) + ,list.get(21),list.get(22),list.get(23),list.get(24),list.get(25)); + case 27: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12) + ,list.get(13),list.get(14),list.get(15),list.get(16),list.get(17),list.get(18),list.get(19),list.get(20) + ,list.get(21),list.get(22),list.get(23),list.get(24),list.get(25),list.get(26)); + case 28: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12) + ,list.get(13),list.get(14),list.get(15),list.get(16),list.get(17),list.get(18),list.get(19),list.get(20) + ,list.get(21),list.get(22),list.get(23),list.get(24),list.get(25),list.get(26),list.get(27)); + case 29: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12) + ,list.get(13),list.get(14),list.get(15),list.get(16),list.get(17),list.get(18),list.get(19),list.get(20) + ,list.get(21),list.get(22),list.get(23),list.get(24),list.get(25),list.get(26),list.get(27),list.get(28)); + case 30: + return client.invoke(operationName,list.get(0),list.get(1),list.get(2),list.get(3),list.get(4) + ,list.get(5),list.get(6),list.get(7),list.get(8),list.get(9),list.get(10),list.get(11),list.get(12) + ,list.get(13),list.get(14),list.get(15),list.get(16),list.get(17),list.get(18),list.get(19),list.get(20) + ,list.get(21),list.get(22),list.get(23),list.get(24),list.get(25),list.get(26),list.get(27),list.get(28) + ,list.get(29)); + default: + return null; + } + } +} diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/RedissonUtil.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/RedissonUtil.java new file mode 100644 index 0000000..552f180 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/RedissonUtil.java @@ -0,0 +1,103 @@ +package net.risesoft.util; + +import net.risesoft.model.Effect; +import net.risesoft.model.ThresholdType; +import net.risesoft.y9.Y9Context; +import net.risesoft.y9public.entity.InterfaceLimitInfo; +import org.apache.commons.lang3.StringUtils; +import org.redisson.Redisson; +import org.redisson.api.RRateLimiter; +import org.redisson.api.RateIntervalUnit; +import org.redisson.api.RateType; +import org.redisson.api.RedissonClient; +import org.redisson.config.Config; +import org.springframework.stereotype.Component; + + + +import java.util.concurrent.TimeUnit; + + +@Component +public class RedissonUtil { + private static final RedissonClient redissonClient; + static { + Config config = new Config(); + config.useSingleServer() + .setAddress("redis://"+ Y9Context.getProperty("spring.redis.host")+":"+Y9Context.getProperty("spring.redis.port")) + .setPassword(Y9Context.getProperty("spring.redis.password")) + .setDatabase(9); + redissonClient = Redisson.create(config); + } + + //返回redis中的限流器 + public RRateLimiter getRateLimiter(String key){ + return redissonClient.getRateLimiter(key); + } + //初始化一个限流器 + public void init(InterfaceLimitInfo interfaceLimitInfo,String personId){ + RRateLimiter rRateLimiter = redissonClient.getRateLimiter("rateLimiter_"+interfaceLimitInfo.getInterfaceId()); + //生产令牌数 + Long count = 10l; + //多长时间内，单位：秒 + Long time = 1l; + + if (ThresholdType.TYPE_ZDY.getEnName().equals(interfaceLimitInfo.getThresholdType())) { + if (StringUtils.isNotBlank(interfaceLimitInfo.getLimitCount())){ + try { + count = Long.parseLong(interfaceLimitInfo.getLimitCount()); + if (StringUtils.isNotBlank(interfaceLimitInfo.getLimitTime())){ + time = Long.parseLong(interfaceLimitInfo.getLimitTime()); + } + }catch (Exception e){ + count = 10l; + time = 1l; + } + } + rRateLimiter.trySetRate(RateType.OVERALL,count,time, RateIntervalUnit.SECONDS); + }else if (ThresholdType.QPS.getEnName().equals(interfaceLimitInfo.getThresholdType())){ + if (StringUtils.isNotBlank(interfaceLimitInfo.getThresholdVal())){ + try { + count = Long.parseLong(interfaceLimitInfo.getThresholdVal()); + time=1l; + }catch (Exception e){ + count = 10l; + time = 1l; + } + rRateLimiter.trySetRate(RateType.OVERALL,count,time, RateIntervalUnit.SECONDS); + } + } + } + + //调用方法判断当前请求是否允许通过(注意：这里约定调用此方法的应当是开启限流的接口) + public boolean isPass(InterfaceLimitInfo interfaceLimitInfo,String personId){ + RRateLimiter rRateLimiter = redissonClient.getRateLimiter("rateLimiter_"+interfaceLimitInfo.getInterfaceId()); + //判断限流器是否存在，不存在初始化限流器 + if (!rRateLimiter.isExists()){ + init(interfaceLimitInfo,personId); + rRateLimiter = redissonClient.getRateLimiter("rateLimiter_"+interfaceLimitInfo.getInterfaceId()); + } + + //判断流控效果 + if (Effect.FAIL_FAST.getEnName().equals(interfaceLimitInfo.getEffect())){ + boolean effect = rRateLimiter.tryAcquire(1l); + return effect; + }else if (Effect.WAIT.getEnName().equals(interfaceLimitInfo.getEffect())){ + Long time = 100l; + try { + time = Long.parseLong(interfaceLimitInfo.getWaitTime()); + }catch (Exception e){ + time = 100l; + } + //等待时间为0，则一直等待直到获取到令牌 + if ("0".equals(interfaceLimitInfo.getWaitTime())){ + rRateLimiter.acquire(1l); + return true; + } + //在指定时间是否可以取到令牌 + boolean effect = rRateLimiter.tryAcquire(1l,time, TimeUnit.MILLISECONDS); + return effect; + } + return true; + } +} diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/RestUtil.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/RestUtil.java new file mode 100644 index 0000000..af596b3 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/RestUtil.java @@ -0,0 +1,31 @@ +package net.risesoft.util; + +import org.apache.http.impl.client.HttpClients; +import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; +import org.springframework.stereotype.Component; +import org.springframework.web.client.RestTemplate; + + + +@Component +public class RestUtil { + /** + * + * @param connectTimeout 连接服务器超时时间 + * @param readTimeout 读取数据超时时间 + * @return + */ + public RestTemplate restTemplate(int connectTimeout,int readTimeout){ + HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory(); + // 设置连接管理器参数，例如连接超时、读取超时等 + factory.setHttpClient(HttpClients.custom() + .setMaxConnTotal(20) // 最大连接数 + .setMaxConnPerRoute(10) // 每个路由的最大连接数 + .build()); + factory.setConnectTimeout(connectTimeout); + factory.setReadTimeout(readTimeout); + factory.setConnectionRequestTimeout(3000); + factory.setBufferRequestBody(false); + return new RestTemplate(factory); + } +} diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/WebServiceForwardUtil.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/WebServiceForwardUtil.java similarity index 60% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/WebServiceForwardUtil.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/WebServiceForwardUtil.java index 3a64a96..d1b268f 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/WebServiceForwardUtil.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/java/net/risesoft/util/WebServiceForwardUtil.java @@ -16,20 +16,20 @@ public class WebServiceForwardUtil { @Autowired private JaxWsUtil jaxWsUtil; - public Map forward(InterfaceManage interfaceManage, List parameters, Map headers) { - Map map = new HashMap<>(); - if ("JAX-WS".equals(interfaceManage.getWebSpecification())) { + public Map forward(InterfaceManage interfaceManage, List parameters,Map headers){ + Map map = new HashMap<>(); + if ("JAX-WS".equals(interfaceManage.getWebSpecification())){ map = jaxWsUtil.JaxWsForward(interfaceManage, parameters); } - if ("JAX-RS".equals(interfaceManage.getWebSpecification())) { - List> data = new ArrayList<>(); - for (Object obj : parameters) { - if (obj instanceof Map) { - Map map1 = (Map) obj; + if ("JAX-RS".equals(interfaceManage.getWebSpecification())){ + List> data = new ArrayList<>(); + for (Object obj:parameters){ + if (obj instanceof Map){ + Map map1 = (Map)obj; data.add(map1); } } - map = jaxRsUtil.JaxRsForward(interfaceManage, data, headers); + map = jaxRsUtil.JaxRsForward(interfaceManage,data,headers); } return map; } diff --git a/risenet-y9boot-webapp-interface-platform/src/main/resources/application.yml b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/resources/application.yml similarity index 99% rename from risenet-y9boot-webapp-interface-platform/src/main/resources/application.yml rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/resources/application.yml index 106d060..ed0d533 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/resources/application.yml +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/resources/application.yml @@ -56,7 +56,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/y9_interface?serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&useUnicode=true&characterEncoding=utf-8&rewriteBatchedStatements=true&useCompression=true&useSSL=false username: root - password: '111111' + password: 'root' initialSize: 1 maxActive: 20 maxPoolPreparedStatementPerConnectionSize: 100 diff --git a/risenet-y9boot-webapp-interface-platform/src/main/resources/banner.txt b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/resources/banner.txt similarity index 52% rename from risenet-y9boot-webapp-interface-platform/src/main/resources/banner.txt rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/resources/banner.txt index 9ecdab6..08a25ce 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/resources/banner.txt +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/resources/banner.txt @@ -1,5 +1,5 @@ - _____ _ __ ___ _ _ __ - \_ \_ __ | |_ ___ _ __ / _| __ _ ___ ___ / _ \ | __ _| |_ / _| ___ _ __ _ __ ___ - / /\/ '_ \| __/ _ \ '__| |_ / _` |/ __/ _ \/ /_)/ |/ _` | __| |_ / _ \| '__| '_ ` _ \ -/\/ /_ | | | | || __/ | | _| (_| | (_| __/ ___/| | (_| | |_| _| (_) | | | | | | | | -\____/ |_| |_|\__\___|_| |_| \__,_|\___\___\/ |_|\__,_|\__|_| \___/|_| |_| |_| |_| + _____ _ __ ___ _ _ __ __ _ + \_ \_ __ | |_ ___ _ __ / _| __ _ ___ ___ / _ \ | __ _| |_ / _| ___ _ __ _ __ ___ /__\_ _____ ___ _ _| |_ ___ + / /\/ '_ \| __/ _ \ '__| |_ / _` |/ __/ _ \/ /_)/ |/ _` | __| |_ / _ \| '__| '_ ` _ \ /_\ \ \/ / _ \/ __| | | | __/ _ \ +/\/ /_ | | | | || __/ | | _| (_| | (_| __/ ___/| | (_| | |_| _| (_) | | | | | | | //__ > < __/ (__| |_| | || __/ +\____/ |_| |_|\__\___|_| |_| \__,_|\___\___\/ |_|\__,_|\__|_| \___/|_| |_| |_| |_\__/ /_/\_\___|\___|\__,_|\__\___| \ No newline at end of file diff --git a/risenet-y9boot-webapp-interface-platform/src/main/resources/logback.xml b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/resources/logback.xml similarity index 79% rename from risenet-y9boot-webapp-interface-platform/src/main/resources/logback.xml rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/resources/logback.xml index e0ea37a..deabc3e 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/resources/logback.xml +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-execute/src/main/resources/logback.xml @@ -1,10 +1,12 @@ - + + + diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/lombok.config b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/lombok.config new file mode 100644 index 0000000..c5830a5 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/lombok.config @@ -0,0 +1,9 @@ +lombok.toString.doNotUseGetters=true +lombok.toString.callSuper=call + +lombok.equalsAndHashCode.doNotUseGetters=true +lombok.equalsAndHashCode.callSuper=call + +lombok.addLombokGeneratedAnnotation=true + +config.stopBubbling=true diff --git a/risenet-y9boot-webapp-interface-platform/pom.xml b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/pom.xml similarity index 92% rename from risenet-y9boot-webapp-interface-platform/pom.xml rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/pom.xml index 30e6342..a586aef 100644 --- a/risenet-y9boot-webapp-interface-platform/pom.xml +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - risenet-y9boot-webapp-interface-platform + risenet-y9boot-webapp-interface-platform-manager war net.risesoft y9-digitalbase v9.6.8-SNAPSHOT - ../y9-digitalbase/pom.xml + @@ -21,6 +21,8 @@ + + net.risesoft risenet-y9boot-starter-sso-oauth2-resource @@ -30,7 +32,7 @@ net.risesoft risenet-y9boot-api-feignclient-platform - ${project.version} + v9.6.4-SNAPSHOT @@ -44,6 +46,7 @@ risenet-y9boot-starter-log ${project.version} + net.risesoft @@ -56,7 +59,7 @@ risenet-y9boot-starter-listener-redis ${project.version} - + com.alibaba fastjson @@ -75,7 +78,7 @@ com.alibaba druid-spring-boot-starter - + org.springframework.boot spring-boot-starter-web @@ -115,13 +118,12 @@ jave-all-deps 2.6.0 - + org.redisson redisson 3.16.2 - org.apache.cxf cxf-rt-frontend-jaxws @@ -133,19 +135,16 @@ cxf-rt-transports-http 3.4.5 - org.apache.cxf cxf-rt-rs-client 3.4.5 - org.apache.cxf cxf-rt-rs-extension-providers 3.4.5 - org.codehaus.jettison jettison @@ -157,30 +156,35 @@ risenet-y9boot-starter-idGenerator ${project.version} - + javax.xml.bind jaxb-api 2.2.1 - javax.xml jaxb-impl 2.1 - com.sun.xml.bind jaxb-xjc 2.2.1.1 + com.fasterxml.jackson.core jackson-databind 2.13.0 + + + net.risesoft + risenet-y9boot-support-interface-jpa-repository + ${project.version} + @@ -208,7 +212,6 @@ - y9-repo-plugin @@ -218,7 +221,7 @@ - interfacePlatform + Y9-interfaceManagementPlatform org.apache.maven.plugins @@ -243,17 +246,4 @@ - - - build-docker-image - - - - com.google.cloud.tools - jib-maven-plugin - - - - - diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/InterfacePlatformApplication.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/InterfaceManagementPlatformApplication.java similarity index 78% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/InterfacePlatformApplication.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/InterfaceManagementPlatformApplication.java index 008f570..49c3b01 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/InterfacePlatformApplication.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/InterfaceManagementPlatformApplication.java @@ -10,9 +10,9 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @SpringBootApplication @EnableTransactionManagement @EnableConfigurationProperties(Y9Properties.class) -public class InterfacePlatformApplication { +public class InterfaceManagementPlatformApplication { public static void main(String[] args) { - SpringApplication.run(InterfacePlatformApplication.class, args); + SpringApplication.run(InterfaceManagementPlatformApplication.class, args); } } diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/InterfaceServletInitializer.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/InterfaceServletInitializer.java new file mode 100644 index 0000000..6975fe5 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/InterfaceServletInitializer.java @@ -0,0 +1,13 @@ +package net.risesoft; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + + +public class InterfaceServletInitializer extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure(final SpringApplicationBuilder builder) { + return builder.sources(InterfaceManagementPlatformApplication.class); + } +} \ No newline at end of file diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/OnApplicationReady.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/OnApplicationReady.java similarity index 100% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/OnApplicationReady.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/OnApplicationReady.java diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/config/CheckLoginFilter.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/config/CheckLoginFilter.java new file mode 100644 index 0000000..ac78510 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/config/CheckLoginFilter.java @@ -0,0 +1,32 @@ +package net.risesoft.config; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +public class CheckLoginFilter implements Filter { + protected final Logger log = LoggerFactory.getLogger(CheckLoginFilter.class); + + @Override + public void destroy() { + } + + @Override + public void init(final FilterConfig filterConfig) throws ServletException { + } + + @Override + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain chain) throws IOException, ServletException { + chain.doFilter(servletRequest, servletResponse); + } + +} diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/config/RestConfig.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/config/RestConfig.java new file mode 100644 index 0000000..51676d4 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/config/RestConfig.java @@ -0,0 +1,50 @@ +package net.risesoft.config; + +import org.apache.http.client.HttpClient; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.config.Registry; +import org.apache.http.config.RegistryBuilder; +import org.apache.http.conn.socket.ConnectionSocketFactory; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.client.ClientHttpRequestFactory; +import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; +import org.springframework.web.client.RestTemplate; + +/** + * 采用连接池的配置方法 + */ +@Configuration +public class RestConfig { + @Bean + public RestTemplate restTemplate(){ + return new RestTemplate(httpRequestFactory()); + } + @Bean + public ClientHttpRequestFactory httpRequestFactory(){ + return new HttpComponentsClientHttpRequestFactory(httpClient()); + } + @Bean + public HttpClient httpClient(){ + Registry registry = RegistryBuilder.create() + .register("http", PlainConnectionSocketFactory.getSocketFactory()) + .register("https", SSLConnectionSocketFactory.getSocketFactory()) + .build(); + PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(registry); + connectionManager.setMaxTotal(400); + connectionManager.setDefaultMaxPerRoute(100); + RequestConfig requestConfig = RequestConfig.custom() + .setSocketTimeout(30000)//返回数据的超时时间 + .setConnectTimeout(20000)//连接上服务器的超时时间 + .setConnectionRequestTimeout(1000)//从连接池中获取连接的超时时间 + .build(); + return HttpClientBuilder.create() + .setDefaultRequestConfig(requestConfig) + .setConnectionManager(connectionManager) + .build(); + } +} diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/config/WebMvcConfig.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/config/WebMvcConfig.java new file mode 100644 index 0000000..5718cd5 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/config/WebMvcConfig.java @@ -0,0 +1,73 @@ +package net.risesoft.config; + +import java.util.ArrayList; +import java.util.List; + +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.boot.web.servlet.filter.OrderedRequestContextFilter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; +import org.springframework.http.MediaType; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.web.filter.RequestContextFilter; +import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer; +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import net.risesoft.y9.Y9Context; +/** + * + * @author 乌力吉 + * + */ +@Configuration +public class WebMvcConfig implements WebMvcConfigurer { + + @Override + public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) { + configurer.enable(); + } + + /* + * starter-log工程用到了RequestContextHolder + * https://github.com/spring-projects/spring-boot/issues/2637 + * https://github.com/spring-projects/spring-boot/issues/4331 + */ + @Bean + public static RequestContextFilter requestContextFilter() { + return new OrderedRequestContextFilter(); + } + + @Override + public void addViewControllers(ViewControllerRegistry registry) { + registry.addRedirectViewController("/", "/index"); + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @DependsOn("y9Context") + @Bean + public FilterRegistrationBean checkUserLoginFilter() { + FilterRegistrationBean filterBean = new FilterRegistrationBean(); + filterBean.setFilter(new CheckLoginFilter()); + filterBean.setAsyncSupported(false); + filterBean.setOrder(50); + filterBean.addUrlPatterns("/*"); + return filterBean; + } + + @Bean + public Y9Context y9Context() { + return new Y9Context(); + } + + @Bean + public MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter() { + MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(); + List supportedMediaTypes = new ArrayList(); + supportedMediaTypes.add(MediaType.parseMediaType("text/html;charset=UTF-8")); + converter.setSupportedMediaTypes(supportedMediaTypes); + return converter; + } + +} \ No newline at end of file diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestApproveController.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestApproveController.java similarity index 100% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestApproveController.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestApproveController.java diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestAuthController.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestAuthController.java similarity index 98% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestAuthController.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestAuthController.java index 13cea1e..7975d42 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestAuthController.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestAuthController.java @@ -159,9 +159,9 @@ public class RestAuthController { Map map = new HashMap<>(); UserInfo person = Y9LoginUserHolder.getUserInfo(); //判断登录人是否有管理员权限 - if (person.getManagerLevel().getValue() == ManagerLevelEnum.SYSTEM_MANAGER.getValue()) { + if(person.getManagerLevel().getValue() == ManagerLevelEnum.SYSTEM_MANAGER.getValue()){ map.put("haveRole", true); - } else { + }else { map.put("haveRole", false); } map.put("personId", person.getPersonId()); diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestBlacklistingController.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestBlacklistingController.java new file mode 100644 index 0000000..d8d5411 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestBlacklistingController.java @@ -0,0 +1,99 @@ +package net.risesoft.controller.rest; + +import net.risesoft.log.OperationTypeEnum; +import net.risesoft.log.annotation.RiseLog; +import net.risesoft.service.BlacklistingService; +import net.risesoft.y9public.entity.Blacklisting; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.Map; + +/** + * 黑名单录入 + * @author duanzhixin + * + */ +@Controller +@RequestMapping("/api/rest/blacklisting") +public class RestBlacklistingController { + + + @Autowired + private BlacklistingService blacklistingService; + + //获取系统标识列表信息 + @RequestMapping("/getPage") + @ResponseBody + @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "黑名单录入管理-获取黑名单列表信息") + public Map getPage(String name,int page,int limit){ + Blacklisting blacklisting = new Blacklisting(); + blacklisting.setName(name); + Map map = new HashMap<>(); + Page page1 = blacklistingService.getPage(blacklisting, page, limit); + map.put("data",page1.getContent()); + map.put("count",page1.getTotalElements()); + map.put("code","0"); + return map; + } + + + //保存信息 + @PostMapping("/saveInfo") + @ResponseBody + @RiseLog(operationType = OperationTypeEnum.ADD, operationName = "黑名单录入管理-保存黑名单信息") + public Map saveInterfaceInfo(Blacklisting blacklisting){ + Map map = new HashMap<>(); + Map dataMap = blacklistingService.saveInfo(blacklisting); + map.putAll(dataMap); + map.put("code","0"); + return map; + } + + //根据id获取信息 + @RequestMapping("/getInfoById") + @ResponseBody + @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "黑名单录入管理-获取黑名单详细信息") + public Map getAuthInfoById(String id){ + Map map = new HashMap<>(); + Blacklisting identifier = blacklistingService.getInfoById(id); + map.put("data",identifier); + map.put("code","0"); + return map; + } + + //根据id删除黑名单信息 + @RequestMapping("/delInfoById") + @ResponseBody + @RiseLog(operationType = OperationTypeEnum.DELETE, operationName = "系统标识管理-删除系统标识信息") + public Map delAuthInfoById(String id){ + Map map = new HashMap<>(); + Map isOk = blacklistingService.delInfo(id); + map.putAll(isOk); + map.put("code","0"); + return map; + } + + //修改黑名单启停用 + @PostMapping("/updateEnable") + @ResponseBody + @RiseLog(operationType = OperationTypeEnum.MODIFY, operationName = "流程管理-修改流程启用停用状态") + public Map updateEnable(Blacklisting blacklisting){ + Map map = new HashMap<>(); + Map dataMap = blacklistingService.updateEnable(blacklisting); + if ((boolean)dataMap.get("status")){ + map.put("status","success"); + }else { + map.put("status","err"); + map.put("msg",dataMap.get("msg")); + } + map.put("code","0"); + return map; + } + +} diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestInterfaceApplyController.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestInterfaceApplyController.java similarity index 98% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestInterfaceApplyController.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestInterfaceApplyController.java index ce49e4e..ed69c17 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestInterfaceApplyController.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestInterfaceApplyController.java @@ -107,7 +107,7 @@ public class RestInterfaceApplyController { @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "接口调用申请-获取个人当前接口的调用是否通过") public Map findIsPass(String id, Integer page, Integer limit) { Map map = new HashMap<>(); - map.put("isPass", interfaceApplyService.findIsPass(id)); + map.put("isPass",interfaceApplyService.findIsPass(id)); map.put("status", "success"); return map; } diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestInterfaceManageController.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestInterfaceManageController.java similarity index 95% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestInterfaceManageController.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestInterfaceManageController.java index 4cc634f..319532c 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestInterfaceManageController.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestInterfaceManageController.java @@ -7,7 +7,6 @@ import net.risesoft.log.annotation.RiseLog; import net.risesoft.model.InterfaceStatus; import net.risesoft.model.user.UserInfo; import net.risesoft.service.InterfaceManageService; -import net.risesoft.service.UseInterfaceService; import net.risesoft.y9.Y9LoginUserHolder; import net.risesoft.y9public.dto.InterfaceApplyDTO; import net.risesoft.y9public.dto.InterfaceManageDTO; @@ -22,7 +21,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.transaction.Transactional; import java.util.Arrays; @@ -44,9 +42,6 @@ public class RestInterfaceManageController { @Autowired private InterfaceManageService interfaceManageService; - @Autowired - private UseInterfaceService useInterfaceService; - //获取已接入接口列表信息 @RequestMapping("/getInterfaceListByPersonId") @@ -160,6 +155,17 @@ public class RestInterfaceManageController { return map; } + //保存接口文档 + @RequestMapping("/saveInterfaceFile") + @ResponseBody + @RiseLog(operationType = OperationTypeEnum.ADD, operationName = "保存接口文档") + public Map saveInterfaceFile(MultipartFile file) { + Map map = new HashMap<>(); + map.putAll(interfaceManageService.saveInterfaceFile(file)); + map.put("code", "0"); + return map; + } + //发布接口信息 @RequestMapping("/pubInterface") @@ -301,25 +307,13 @@ public class RestInterfaceManageController { } map.put("code", "0"); if (StringUtils.isNotBlank(applyInfo.getUserSecret())) { - String secret = applyInfo.getUserSecret().substring(0, 4) + "******" + applyInfo.getUserSecret().substring(applyInfo.getUserSecret().length() - 5); + String secret = applyInfo.getUserSecret().substring(0, 4) + "******" + applyInfo.getUserSecret().substring(applyInfo.getUserSecret().length() - 5, applyInfo.getUserSecret().length()); applyInfo.setUserSecret(secret); } map.put("data", applyInfo); return map; } - //测试接口 - @PostMapping(value = "/testInterface") - @ResponseBody - @RiseLog(operationType = OperationTypeEnum.SEND, operationName = "接口测试") - public Map testInterface(@RequestBody InterfaceManageDTO interfaceManageDTO, HttpServletRequest request) { - Map map = new HashMap<>(); - Map dataMap = useInterfaceService.testForward(interfaceManageDTO, request); - map.put("data", dataMap); - map.put("code", "0"); - return map; - } - //上传接口文档 @RequestMapping(value = "/uploadInterfaceFile") @ResponseBody diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestStatisticsController.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestStatisticsController.java new file mode 100644 index 0000000..4c89640 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestStatisticsController.java @@ -0,0 +1,112 @@ +package net.risesoft.controller.rest; + +import net.risesoft.log.OperationTypeEnum; +import net.risesoft.log.annotation.RiseLog; +import net.risesoft.service.StatisticsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author : lxd + * @description : 用于统计首页可视化的统计数据 + * @createDate : 2024/10/30 14:48 + */ +@RestController +@RequestMapping("/api/rest/statistics") +public class RestStatisticsController { + @Autowired + private StatisticsService statisticsService; + + /** + * 接口概况：注册数、发布数、停用数 + * @return + */ + @GetMapping("/interfaceOverview") + @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "获取接口概况：注册数、发布数、停用数") + public Map getInterfaceOverview(){ + return statisticsService.getInterfaceOverview(); + } + + /** + * 获取接口运行正常、异常数 + * @return + */ + @GetMapping("/runningCount") + @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "获取接口运行正常、异常数") + public Map getRunningCount(){ + return statisticsService.getRunningCount(); + } + + /** + * 接口调用趋势图 + * @param type 当天、近一周、近一月、近一年 + * @return + */ + @GetMapping("/trend") + @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "获取接口调用趋势图") + public Map getCallTrend(String type){ + return statisticsService.getCallTrend(type); + } + + /** + * 日志概况 : 总调用量、今日调用量、总异常量、今日异常量 + * @return + */ + @GetMapping("/logOverview") + @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "获取日志概况统计数：总调用量、今日调用量、总异常量、今日异常量") + public Map getLogOverview(){ + return statisticsService.getLogOverview(); + } + + /** + * 异常情况列表 + * @param page 页码 + * @param limit 每页大小 + * @return + */ + @GetMapping("/exception") + @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "获取接口调用异常情况列表") + public Map getException(int page, int limit){ + return statisticsService.getException(page, limit); + } + + /** + * 接口日志情况列表 + * @param conditionMap 筛选条件 + * @return + */ + @PostMapping("/logMonitoring") + @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "获取接口调用日志情况列表") + public Map getLogMonitoringInfo(@RequestBody Map conditionMap){ + if (conditionMap == null){ + Map res = new HashMap(); + res.put("code", "1"); + return res; + } + return statisticsService.getLogMonitoringInfo(conditionMap); + } + + /** + * 获取接口日志检索选项值 + * @return + */ + @GetMapping("/logMonitoring/options") + public Map getLogMonitoringOptions(){ + return statisticsService.getLogMonitoringOptions(); + } + + /** + * 接口实时日志播报 + * @param page 页码 + * @param limit 每页大小 + * @return + */ + @GetMapping("/realTimeLog") + @RiseLog(operationType = OperationTypeEnum.BROWSE, operationName = "接口实时日志播报") + public Map getRealTimeLog(int page, int limit){ + return statisticsService.getRealTimeLog(page, limit); + } +} diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestSystemIdentifierController.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestSystemIdentifierController.java similarity index 100% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/controller/rest/RestSystemIdentifierController.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/controller/rest/RestSystemIdentifierController.java diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/ApplyType.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/ApplyType.java new file mode 100644 index 0000000..0af52f5 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/ApplyType.java @@ -0,0 +1,29 @@ +package net.risesoft.model; + +/** + * 申请类型枚举类 + */ +public enum ApplyType { + //接口调用申请 + INVOKE("0", "调用"), + //接口停用申请 + PUB_INTERFACE("2", "发布"), + //接口发布申请 + STOP_INTERFACE("1", "停用"); + + private final String enName; + private final String name; + + private ApplyType(String enName, String name) { + this.enName = enName; + this.name = name; + } + + public String getEnName() { + return enName; + } + + public String getName() { + return name; + } +} \ No newline at end of file diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/ApproveStatus.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/ApproveStatus.java similarity index 100% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/ApproveStatus.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/ApproveStatus.java diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/Effect.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/Effect.java similarity index 100% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/Effect.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/Effect.java diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/InterfaceStatus.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/InterfaceStatus.java similarity index 100% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/model/InterfaceStatus.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/InterfaceStatus.java diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/ParameterType.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/ParameterType.java new file mode 100644 index 0000000..35098f3 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/ParameterType.java @@ -0,0 +1,31 @@ +package net.risesoft.model; + +/** + * 数据类型枚举类 + */ +public enum ParameterType { + //INT类型 + INTEGER("integer", "integer"), + //BOOLEAN + BOOLEAN("boolean", "boolean"), + //INT类型 + STRING("String", "String"), + //DOUBLE + DOUBLE("double", "double"); + + private final String enName; + private final String name; + + private ParameterType(String enName, String name) { + this.enName = enName; + this.name = name; + } + + public String getEnName() { + return enName; + } + + public String getName() { + return name; + } +} \ No newline at end of file diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/ThresholdType.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/ThresholdType.java new file mode 100644 index 0000000..f029534 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/model/ThresholdType.java @@ -0,0 +1,27 @@ +package net.risesoft.model; + +/** + * 限流类型枚举类 + */ +public enum ThresholdType { + //自定义 + TYPE_ZDY("0", "自定义"), + //QPS + QPS("1", "QPS"); + + private final String enName; + private final String name; + + private ThresholdType(String enName, String name) { + this.enName = enName; + this.name = name; + } + + public String getEnName() { + return enName; + } + + public String getName() { + return name; + } +} \ No newline at end of file diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/ApproveService.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/ApproveService.java similarity index 73% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/ApproveService.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/ApproveService.java index d731353..e760619 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/ApproveService.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/ApproveService.java @@ -14,7 +14,6 @@ public interface ApproveService { /** * 获取page数据 - * * @param interfaceManageDTO * @return */ @@ -22,14 +21,13 @@ public interface ApproveService { /** * 获取page数据 - * * @param viewApproveDTO * @return */ Page getViewApproveList(ViewApproveDTO viewApproveDTO); //保存接口信息 - Map saveApproveInfo(Approve approve); + Map saveApproveInfo(Approve approve); //根据id查询服务器信息 ApproveDTO getApproveById(String id); @@ -38,17 +36,17 @@ public interface ApproveService { Approve findApproveById(String id); //审批通过接口信息 - Map agreeApproveInfo(Approve approve); + Map agreeApproveInfo(Approve approve); //审批拒绝接口信息 - Map refuseApproveInfo(Approve approve); + Map refuseApproveInfo(Approve approve); //审批通过接口信息 - Map submitData(Approve approve); + Map submitData(Approve approve); //根据接口id获取审批进度 - List getApproveByInterfaceId(String id, Boolean applyType); + List getApproveByInterfaceId(String id,Boolean applyType); //构建审批记录 - Map buildApprove(Approve approve, String flowId); + Map buildApprove(Approve approve,String flowId); } diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/AuthDictService.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/AuthDictService.java similarity index 65% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/AuthDictService.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/AuthDictService.java index 02dbd3b..534fcc8 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/AuthDictService.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/AuthDictService.java @@ -11,41 +11,38 @@ public interface AuthDictService { /** * 获取page数据 - * * @param authDict * @return */ - Page getAuthDictList(AuthDict authDict, int page, int limit); + Page getAuthDictList(AuthDict authDict,int page ,int limit); /** * 获取树形构造数据 - * * @param authDict * @return */ List getAuthDictTreeList(AuthDict authDict); //删除信息 - Map delInfo(String id); + Map delInfo(String id); //删除信息个人 - Map delInfoPerson(String id); + Map delInfoPerson(String id); //根据参数id查询服务器信息 AuthDict getAuthDictInfoById(String id); - Map saveAuthDictInfo(AuthDict authDict); + Map saveAuthDictInfo(AuthDict authDict); /** * 获取page数据 - * * @param authDict * @return */ - Page getDictKeyList(AuthDict authDict, int page, int limit); + Page getDictKeyList(AuthDict authDict,int page,int limit); /** * 版本维护升级时复制一份鉴权数据 */ - Map copyAuthDictListByInterfaceId(String oldId, String newId); + Map copyAuthDictListByInterfaceId(String oldId,String newId); } diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/BlacklistingService.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/BlacklistingService.java similarity index 74% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/BlacklistingService.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/BlacklistingService.java index ff40e2b..26d2b0f 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/BlacklistingService.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/BlacklistingService.java @@ -10,20 +10,19 @@ public interface BlacklistingService { /** * 获取page数据 - * * @param blacklisting * @return */ Page getPage(Blacklisting blacklisting, int page, int limit); //删除信息 - Map delInfo(String id); + Map delInfo(String id); - Map saveInfo(Blacklisting blacklisting); + Map saveInfo(Blacklisting blacklisting); Blacklisting getInfoById(String id); - Map updateEnable(Blacklisting blacklisting); + Map updateEnable(Blacklisting blacklisting); List getListByInterfaceId(String interfaceId); } diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/InterfaceApplyService.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/InterfaceApplyService.java similarity index 83% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/InterfaceApplyService.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/InterfaceApplyService.java index 9a4fd8f..a27595a 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/InterfaceApplyService.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/InterfaceApplyService.java @@ -13,24 +13,23 @@ public interface InterfaceApplyService { /** * 获取page数据 - * * @param interfaceManageDTO * @return */ Page getApproveList(InterfaceManageDTO interfaceManageDTO); //保存接口信息 - Map saveInfo(InterfaceApply apply); + Map saveInfo(InterfaceApply apply); //生成接口调用申请审批信息 - Map createData(InterfaceApply apply, String interfaceStatus); + Map createData(InterfaceApply apply,String interfaceStatus); //审批通过接口信息 - Map agreeApproveInfo(Approve approve); + Map agreeApproveInfo(Approve approve); //审批拒绝接口信息 - Map refuseApproveInfo(Approve approve); + Map refuseApproveInfo(Approve approve); //根据id查询申请信息 InterfaceApply getApplyInfoById(String id); diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/InterfaceManageService.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/InterfaceManageService.java similarity index 97% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/InterfaceManageService.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/InterfaceManageService.java index 4306667..bba3909 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/InterfaceManageService.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/InterfaceManageService.java @@ -37,6 +37,8 @@ public interface InterfaceManageService { Map saveInterfaceInfo(InterfaceManageDTO interfaceManageDTO); + Map saveInterfaceFile(MultipartFile file); + Map updateVersionInfo(InterfaceManageDTO interfaceManageDTO); //根据id查询权限信息 diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/ParameterService.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/ParameterService.java similarity index 77% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/ParameterService.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/ParameterService.java index 758dd57..28356c6 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/ParameterService.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/ParameterService.java @@ -8,10 +8,9 @@ import java.util.Map; public interface ParameterService { //根据接口id组装数据,并转为JSON - Map getParameterData(String interfaceId, String method, String interfaceType); - + Map getParameterData(String interfaceId,String method,String interfaceType); //保存参数数据 - Map saveParameterData(InterfaceManageDTO interfaceManageDTO); + Map saveParameterData(InterfaceManageDTO interfaceManageDTO); //根据接口id组装数据,获取必填参数 List getRequiredParameterData(String interfaceId); diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/StatisticsService.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/StatisticsService.java similarity index 100% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/StatisticsService.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/StatisticsService.java diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/SystemIdentifierService.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/SystemIdentifierService.java similarity index 85% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/SystemIdentifierService.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/SystemIdentifierService.java index 12d1588..89abeca 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/SystemIdentifierService.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/SystemIdentifierService.java @@ -10,7 +10,6 @@ public interface SystemIdentifierService { /** * 获取page数据 - * * @param systemIdentifier * @return */ @@ -18,7 +17,6 @@ public interface SystemIdentifierService { /** * 获取对应数据类型数据 - * * @param type * @return */ @@ -26,16 +24,15 @@ public interface SystemIdentifierService { /** * 根据父级id获取数据列表 - * * @param id * @return */ List getSystemIdentifierListByPid(String id); //删除信息 - Map delInfo(String id); + Map delInfo(String id); - Map saveInfo(SystemIdentifier systemIdentifier); + Map saveInfo(SystemIdentifier systemIdentifier); SystemIdentifier getInfoById(String id); } diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/ApproveServiceImpl.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/ApproveServiceImpl.java similarity index 100% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/ApproveServiceImpl.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/ApproveServiceImpl.java diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/AuthDictServiceImpl.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/AuthDictServiceImpl.java similarity index 92% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/AuthDictServiceImpl.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/AuthDictServiceImpl.java index 3208e09..4c4ed83 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/AuthDictServiceImpl.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/AuthDictServiceImpl.java @@ -84,6 +84,9 @@ public class AuthDictServiceImpl implements AuthDictService { }; Pageable pageable = PageRequest.of(page - 1, limit, Sort.by("sort").ascending()); Page page1 = authDictRepository.findAll(spec, pageable); + List interfaceIds = new ArrayList<>(); + List list = new ArrayList<>(); + Map map = new HashMap<>(); return page1; } @@ -123,20 +126,19 @@ public class AuthDictServiceImpl implements AuthDictService { Map map = new HashMap<>(); AuthDict authDict = authDictRepository.findById(id).orElse(null); InterfaceManage interfaceManage = null; - if (authDict != null) { - if (StringUtils.isNotBlank(authDict.getInterfaceId())) { - interfaceManage = interfaceManageRepository.findById(authDict.getInterfaceId()).orElse(null); - } - if (interfaceManage != null) { - if (!"Y".equals(interfaceManage.getIsDelete())) { - if (interfaceManage.getParameterIds().indexOf(authDict.getParameterId()) != -1) { - map.put("status", "error"); - map.put("msg", "删除失败，有接口正在使用该参数"); - return map; - } + if (StringUtils.isNotBlank(authDict.getInterfaceId())) { + interfaceManage = interfaceManageRepository.findById(authDict.getInterfaceId()).orElse(null); + } + if (interfaceManage != null) { + if (!"Y".equals(interfaceManage.getIsDelete())) { + if (interfaceManage.getParameterIds().indexOf(authDict.getParameterId()) != -1) { + map.put("status", "error"); + map.put("msg", "删除失败，有接口正在使用该参数"); + return map; } } - + } + if (authDict != null) { if ("Y".equals(authDict.getIsPrimary())) { List list = authDictRepository.findByParameterId(authDict.getParameterId()); for (AuthDict authDict1 : list) { @@ -151,7 +153,7 @@ public class AuthDictServiceImpl implements AuthDictService { } } else { map.put("status", "error"); - map.put("msg", "未查询到该条数据，请刷新重试！！！"); + map.put("msg", "id为空不能删除"); } return map; } diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/BlacklistingServiceImpl.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/BlacklistingServiceImpl.java similarity index 100% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/BlacklistingServiceImpl.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/BlacklistingServiceImpl.java diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/InterfaceApplyServiceImpl.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/InterfaceApplyServiceImpl.java similarity index 73% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/InterfaceApplyServiceImpl.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/InterfaceApplyServiceImpl.java index 26e4f75..935e291 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/InterfaceApplyServiceImpl.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/InterfaceApplyServiceImpl.java @@ -45,64 +45,64 @@ public class InterfaceApplyServiceImpl implements InterfaceApplyService { public Page getApproveList(InterfaceManageDTO interfaceManageDTO) { Page page = null; Page page1 = null; - Pageable pageable = PageRequest.of(interfaceManageDTO.getPage() - 1, interfaceManageDTO.getLimit()); + Pageable pageable = PageRequest.of(interfaceManageDTO.getPage()-1,interfaceManageDTO.getLimit()); List list = approveRepository.findList(); - if (StringUtils.isNotBlank(interfaceManageDTO.getInterfaceName())) { - page = approveRepository.findListPage("%" + interfaceManageDTO.getInterfaceName() + "%", pageable); - } else { - page = approveRepository.findListPage("%" + "%", pageable); + if (StringUtils.isNotBlank(interfaceManageDTO.getInterfaceName())){ + page = approveRepository.findListPage("%"+interfaceManageDTO.getInterfaceName()+"%",pageable); + }else { + page = approveRepository.findListPage("%"+"%",pageable); } List listIds = new ArrayList<>(); List dtoList = new ArrayList<>(); - Map map = new HashMap<>(); - for (Approve approve : page.getContent()) { + Map map = new HashMap<>(); + for (Approve approve : page.getContent()){ listIds.add(approve.getInterfaceId()); ApproveDTO approveDTO = new ApproveDTO(approve); dtoList.add(approveDTO); } List manageList = new ArrayList<>(); - if (listIds.size() != 0) { + if (listIds.size()!=0){ manageList = interfaceManageRepository.findByIdIn(listIds); - for (InterfaceManage interfaceManage : manageList) { - map.put(interfaceManage.getId(), interfaceManage); + for (InterfaceManage interfaceManage:manageList){ + map.put(interfaceManage.getId(),interfaceManage); } - for (ApproveDTO approveDTO : dtoList) { - if (map.get(approveDTO.getInterfaceId()) != null) { + for (ApproveDTO approveDTO : dtoList){ + if (map.get(approveDTO.getInterfaceId())!=null){ approveDTO.setInterfaceName(map.get(approveDTO.getInterfaceId()).getInterfaceName()); approveDTO.setVersion(map.get(approveDTO.getInterfaceId()).getVersion()); } } } - page1 = new PageImpl(dtoList, pageable, page.getTotalElements()); + page1 = new PageImpl(dtoList,pageable,page.getTotalElements()); return page1; } @Override public Map saveInfo(InterfaceApply apply) { - Map map = new HashMap<>(); + Map map = new HashMap<>(); UserInfo person = Y9LoginUserHolder.getUserInfo(); InterfaceApply interfaceApply = interfaceApplyRepository.save(apply); - if (interfaceApply != null) { - map.put("status", "true"); - map.put("interfaceId", interfaceApply.getInterfaceId()); - } else { - map.put("status", "false"); + if (interfaceApply!=null){ + map.put("status","true"); + map.put("interfaceId",interfaceApply.getInterfaceId()); + }else { + map.put("status","false"); } return map; } //接口调用申请数据生成 @Override - public Map createData(InterfaceApply apply, String interfaceStatus) { - Map map = new HashMap<>(); + public Map createData(InterfaceApply apply,String interfaceStatus) { + Map map = new HashMap<>(); UserInfo person = Y9LoginUserHolder.getUserInfo(); apply.setId(Y9IdGenerator.genId(IdType.SNOWFLAKE)); apply.setApplyPersonId(person.getPersonId()); apply.setApplyPersonName(person.getName()); - if (StringUtils.isBlank(apply.getIsEffective())) { + if(StringUtils.isBlank(apply.getIsEffective())){ apply.setIsEffective("Y"); } - if (StringUtils.isBlank(apply.getApplyType())) { + if (StringUtils.isBlank(apply.getApplyType())){ apply.setApplyType(ApplyType.INVOKE.getEnName()); } InterfaceApply apply1 = interfaceApplyRepository.save(apply); @@ -119,15 +119,15 @@ public class InterfaceApplyServiceImpl implements InterfaceApplyService { //处理多个申请信息审批无法获取最新审批的问题 - if (ApplyType.INVOKE.getEnName().equals(apply1.getApplyType())) { - List listApply = interfaceApplyRepository.findByInterfaceIdAndApplyPersonIdAndApplyType(apply1.getInterfaceId(), person.getPersonId(), ApplyType.INVOKE.getEnName()); + if (ApplyType.INVOKE.getEnName().equals(apply1.getApplyType())){ + List listApply = interfaceApplyRepository.findByInterfaceIdAndApplyPersonIdAndApplyType(apply1.getInterfaceId(),person.getPersonId(),ApplyType.INVOKE.getEnName()); List ids = new ArrayList<>(); - for (InterfaceApply apply2 : listApply) { + for(InterfaceApply apply2 : listApply){ ids.add(apply2.getId()); } - List list = approveRepository.findByApplyIdInAndApplyTypeAndIsNew(ids, ApplyType.INVOKE.getEnName(), "N"); - if (list != null && list.size() != 0) { - for (Approve approve1 : list) { + List list = approveRepository.findByApplyIdInAndApplyTypeAndIsNew(ids,ApplyType.INVOKE.getEnName(),"N"); + if (list!=null && list.size()!=0){ + for (Approve approve1: list){ approve1.setIsNew("Y"); } approveRepository.saveAll(list); @@ -135,19 +135,19 @@ public class InterfaceApplyServiceImpl implements InterfaceApplyService { } Approve approve1 = approveRepository.save(approve); - if (approve1 != null) { - map.put("status", true); + if (approve1!=null){ + map.put("status",true); } return map; } @Override public Map agreeApproveInfo(Approve approve) { - Map map = new HashMap<>(); + Map map = new HashMap<>(); UserInfo person = Y9LoginUserHolder.getUserInfo(); - if (StringUtils.isNotBlank(approve.getId())) { + if (StringUtils.isNotBlank(approve.getId())){ Approve approve1 = approveRepository.findById(approve.getId()).orElse(null); - if (ApproveStatus.SUBMIT_APPROVE.getName().equals(approve1.getApproveStatus())) { + if (ApproveStatus.SUBMIT_APPROVE.getName().equals(approve1.getApproveStatus())){ approve1.setIsOver("Y"); approve1.setApproveStatus(ApproveStatus.APPROVE.getName()); approve1.setPersonId(person.getPersonId()); @@ -159,14 +159,14 @@ public class InterfaceApplyServiceImpl implements InterfaceApplyService { interfaceManageRepository.save(interfaceManage); approveRepository.save(approve1); //初始化限流器 - if ("是".equals(interfaceManage.getIsLimit())) { + if ("是".equals(interfaceManage.getIsLimit())){ InterfaceLimitInfo interfaceLimitInfo = interfaceLimitInfoRepository.findAllByInterfaceId(interfaceManage.getId()); - redissonUtil.init(interfaceLimitInfo, person.getPersonId()); + redissonUtil.init(interfaceLimitInfo,person.getPersonId()); } - map.put("status", "true"); - } else { - map.put("status", "false"); - map.put("msg", "审批状态不正确，审批已经结束"); + map.put("status","true"); + }else { + map.put("status","false"); + map.put("msg","审批状态不正确，审批已经结束"); } } return map; @@ -174,11 +174,11 @@ public class InterfaceApplyServiceImpl implements InterfaceApplyService { @Override public Map refuseApproveInfo(Approve approve) { - Map map = new HashMap<>(); + Map map = new HashMap<>(); UserInfo person = Y9LoginUserHolder.getUserInfo(); - if (StringUtils.isNotBlank(approve.getId())) { + if (StringUtils.isNotBlank(approve.getId())){ Approve approve1 = approveRepository.findById(approve.getId()).orElse(null); - if (ApproveStatus.SUBMIT_APPROVE.getName().equals(approve1.getApproveStatus())) { + if (ApproveStatus.SUBMIT_APPROVE.getName().equals(approve1.getApproveStatus())){ approve1.setIsOver("Y"); approve1.setApproveStatus(ApproveStatus.UN_APPROVE.getName()); approve1.setPersonId(person.getPersonId()); @@ -186,10 +186,10 @@ public class InterfaceApplyServiceImpl implements InterfaceApplyService { approve1.setNotes(approve.getNotes()); approve1.setIllustrate(approve.getIllustrate()); approveRepository.save(approve1); - map.put("status", "true"); - } else { - map.put("status", "false"); - map.put("msg", "审批状态不正确，审批已经结束"); + map.put("status","true"); + }else { + map.put("status","false"); + map.put("msg","审批状态不正确，审批已经结束"); } } return map; @@ -203,9 +203,9 @@ public class InterfaceApplyServiceImpl implements InterfaceApplyService { @Override public List getInterfaceIdsByPersonId() { UserInfo person = Y9LoginUserHolder.getUserInfo(); - List list = interfaceApplyRepository.findByApplyPersonIdAndApplyType(person.getPersonId(), ApplyType.INVOKE.getEnName()); + List list = interfaceApplyRepository.findByApplyPersonIdAndApplyType(person.getPersonId(),ApplyType.INVOKE.getEnName()); Set set = new HashSet<>(); - for (InterfaceApply apply : list) { + for(InterfaceApply apply : list){ set.add(apply.getInterfaceId()); } return new ArrayList<>(set); @@ -214,9 +214,9 @@ public class InterfaceApplyServiceImpl implements InterfaceApplyService { @Override public List getApplyIdsByPersonIdAndInterfaceId(String interfaceId) { UserInfo person = Y9LoginUserHolder.getUserInfo(); - List list = interfaceApplyRepository.findByInterfaceIdAndApplyPersonIdAndApplyType(interfaceId, person.getPersonId(), ApplyType.INVOKE.getEnName()); + List list = interfaceApplyRepository.findByInterfaceIdAndApplyPersonIdAndApplyType(interfaceId,person.getPersonId(),ApplyType.INVOKE.getEnName()); Set set = new HashSet<>(); - for (InterfaceApply apply : list) { + for(InterfaceApply apply : list){ set.add(apply.getId()); } return new ArrayList<>(set); @@ -225,24 +225,24 @@ public class InterfaceApplyServiceImpl implements InterfaceApplyService { @Override public InterfaceApply getApplyInfoByPersonIdAndInterfaceId(String interfaceId) { UserInfo person = Y9LoginUserHolder.getUserInfo(); - List list = interfaceApplyRepository.findByInterfaceIdAndApplyPersonIdAndApplyTypeOrderByCreateTimeDesc(interfaceId, person.getPersonId(), ApplyType.INVOKE.getEnName()); + List list = interfaceApplyRepository.findByInterfaceIdAndApplyPersonIdAndApplyTypeOrderByCreateTimeDesc(interfaceId,person.getPersonId(),ApplyType.INVOKE.getEnName()); return list.get(0); } @Override public Page getApplyListById(String id, Integer page, Integer limit) { UserInfo person = Y9LoginUserHolder.getUserInfo(); - Pageable pageable = PageRequest.of(page - 1, limit); - return interfaceApplyRepository.findListPage(person.getPersonId(), id, pageable); + Pageable pageable = PageRequest.of(page-1,limit); + return interfaceApplyRepository.findListPage(person.getPersonId(),id,pageable); } @Override public Boolean findIsPass(String id) { UserInfo person = Y9LoginUserHolder.getUserInfo(); Integer pass = interfaceApplyRepository.findListIsPass(person.getPersonId(), id); - if (pass > 0) { + if(pass>0){ return true; - } else { + }else { return false; } } @@ -254,21 +254,21 @@ public class InterfaceApplyServiceImpl implements InterfaceApplyService { interfaceApply.setUserSecret(Y9IdGenerator.genId(IdType.SNOWFLAKE)); } - private Page page(InterfaceApply dto, Integer page, Integer limit) { - Specification spec = new Specification() { + private Page page(InterfaceApply dto,Integer page,Integer limit){ + Specification spec= new Specification(){ @Override public Predicate toPredicate(Root root, CriteriaQuery query, CriteriaBuilder criteriaBuilder) { List predicates = new ArrayList<>(); - if (StringUtils.isNotBlank(dto.getApplyPersonId())) { - predicates.add(criteriaBuilder.equal(root.get("applyPersonId"), dto.getApplyPersonId())); + if (StringUtils.isNotBlank(dto.getApplyPersonId())){ + predicates.add(criteriaBuilder.equal(root.get("applyPersonId"),dto.getApplyPersonId())); } - if (StringUtils.isNotBlank(dto.getInterfaceId())) { - predicates.add(criteriaBuilder.equal(root.get("interfaceId"), dto.getInterfaceId())); + if (StringUtils.isNotBlank(dto.getInterfaceId())){ + predicates.add(criteriaBuilder.equal(root.get("interfaceId"),dto.getInterfaceId())); } return criteriaBuilder.and(predicates.toArray(new Predicate[0])); } }; - Pageable pageable = PageRequest.of(page - 1, limit, Sort.by("createTime").descending()); - return interfaceApplyRepository.findAll(spec, pageable); + Pageable pageable = PageRequest.of(page-1,limit, Sort.by("createTime").descending()); + return interfaceApplyRepository.findAll(spec,pageable); } } diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/InterfaceManageServiceImpl.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/InterfaceManageServiceImpl.java similarity index 93% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/InterfaceManageServiceImpl.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/InterfaceManageServiceImpl.java index 9dbfd16..722623d 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/InterfaceManageServiceImpl.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/InterfaceManageServiceImpl.java @@ -20,6 +20,9 @@ import net.risesoft.y9public.entity.*; import net.risesoft.y9public.repository.*; import net.risesoft.y9public.vo.AuthSelectVo; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.net.ftp.FTP; +import org.apache.commons.net.ftp.FTPClient; +import org.apache.commons.net.ftp.FTPReply; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.*; import org.springframework.data.jpa.domain.Specification; @@ -38,6 +41,7 @@ import java.io.*; import java.lang.reflect.Field; import java.net.URL; import java.nio.charset.Charset; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; import java.util.zip.ZipEntry; @@ -85,7 +89,9 @@ public class InterfaceManageServiceImpl implements InterfaceManageService { for (String it : ids) { interfaceIds.value(it); } - if (!"发布".equals(interfaceManageDTO.getMayApply())) { + if ("发布".equals(interfaceManageDTO.getMayApply())) { +// predicates.add(criteriaBuilder.not(interfaceIds)); + } else { predicates.add(interfaceIds); } } else { @@ -179,8 +185,12 @@ public class InterfaceManageServiceImpl implements InterfaceManageService { } InterfaceManage interfaceManage1 = interfaceManageRepository.save(interfaceManage); - map.put("id", interfaceManage1.getId()); - map.put("status", true); + if (interfaceManage1 == null) { + map.put("status", false); + } else { + map.put("id", interfaceManage1.getId()); + map.put("status", true); + } return map; } @@ -226,8 +236,10 @@ public class InterfaceManageServiceImpl implements InterfaceManageService { Map map = new HashMap<>(); if (StringUtils.isNotBlank(id)) { InterfaceManage interfaceManage = interfaceManageRepository.findById(id).orElse(null); - //如果接口不存在，则清理废弃数据 - if (interfaceManage == null) { + //如果接口存在不清理废数据 + if (interfaceManage != null) { + + } else { authDictRepository.deleteInfoByInterfaceId(id); map.put("status", "true"); } @@ -255,6 +267,7 @@ public class InterfaceManageServiceImpl implements InterfaceManageService { @Override public Map pubInterface(InterfaceApplyDTO apply) { + Y9Context.getProperty("y9.interfaceManage.manageRole"); Map map = new HashMap<>(); map.put("status", false); if (StringUtils.isNotBlank(apply.getInterfaceId())) { @@ -270,7 +283,7 @@ public class InterfaceManageServiceImpl implements InterfaceManageService { if (interfaceManage != null) { apply.setApplyType(ApplyType.PUB_INTERFACE.getEnName()); interfaceManage.setInterfaceStatus(InterfaceStatus.SUBMIT_APPROVE.getName()); - Map applyMap = interfaceApplyService.createData(new InterfaceApply(apply), InterfaceStatus.APPROVE.getName()); + Map applyMap = interfaceApplyService.createData(new InterfaceApply(apply),InterfaceStatus.APPROVE.getName()); if (applyMap.get("status") != null && (boolean) applyMap.get("status")) { InterfaceManage interfaceManage1 = interfaceManageRepository.save(interfaceManage); if (interfaceManage1 != null) { @@ -363,6 +376,19 @@ public class InterfaceManageServiceImpl implements InterfaceManageService { return dataMap; } + @Override + public Map saveInterfaceFile(MultipartFile file) { + Map map = new HashMap<>(); + Map dataMap = upload(file); + if (StringUtils.isNotBlank(dataMap.get("path"))) { + map.putAll(dataMap); + map.put("status", true); + return map; + } else { + map.put("status", false); + } + return map; + } @Override public Map updateVersionInfo(InterfaceManageDTO interfaceManageDTO) { @@ -463,6 +489,7 @@ public class InterfaceManageServiceImpl implements InterfaceManageService { @Override public Map useInterfaceApply(InterfaceApplyDTO apply, Boolean flag) { + Y9Context.getProperty("y9.interfaceManage.manageRole"); Map map = new HashMap<>(); map.put("status", false); if (StringUtils.isNotBlank(apply.getInterfaceId())) { @@ -608,6 +635,7 @@ public class InterfaceManageServiceImpl implements InterfaceManageService { public Map uploadFile(MultipartFile file, Boolean isOverWrite) { HashMap map = new HashMap<>(); String fileSuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Date nowDate = new Date(); List requiredFileds = Arrays.asList( "interfaceName", "interfaceUrl", @@ -861,7 +889,7 @@ public class InterfaceManageServiceImpl implements InterfaceManageService { public void downLoadInterfaceFile(String sameId, String version, String fileName, HttpServletResponse response) { String path = Y9Context.getProperty("y9.interfacePath") + File.separator + sameId + File.separator + version + File.separator + fileName; try { - URL u = new URL("file://" + "file.pdf"); + URL u = new URL("file://"+"file.pdf"); response.setContentType(u.openConnection().getContentType()); } catch (Exception e) { e.printStackTrace(); @@ -928,6 +956,44 @@ public class InterfaceManageServiceImpl implements InterfaceManageService { } } + public Map upload(MultipartFile file) { + Map map = new HashMap<>(); + String path = ""; + try { + Date date = new Date(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String datePath = sdf.format(date); + String ftp_risesoft_url = Y9Context.getProperty("y9.common.ftpURL"); + String ftp_risesoft_user = Y9Context.getProperty("y9.common.ftpUser"); + String ftp_risesoft_pwd = Y9Context.getProperty("y9.common.ftpPassword"); + FTPClient ftp_risesoft = new FTPClient(); + ftp_risesoft.connect(ftp_risesoft_url, 9021); + ftp_risesoft.login(ftp_risesoft_user, ftp_risesoft_pwd); + int reply_risesoft = ftp_risesoft.getReplyCode(); + if (!FTPReply.isPositiveCompletion(reply_risesoft)) { + ftp_risesoft.disconnect(); + System.out.println("FTP连接失败"); + } + ftp_risesoft.setFileType(FTP.BINARY_FILE_TYPE); + boolean isCreateZipRoot = true; + path += "fileStorage/" + datePath + "/"; + isCreateZipRoot = ftp_risesoft.makeDirectory(path); + String fileName = Y9IdGenerator.genId(IdType.SNOWFLAKE) + "_" + file.getName(); + path += fileName; + if (isCreateZipRoot) { + boolean isUpload = ftp_risesoft.storeFile(path, file.getInputStream()); + if (isUpload) { + map.put("path", path); + map.put("fileName", fileName); + } else { + System.out.println("存储risesoft：" + file.getName() + "失败！"); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + return map; + } //第一个值大于第二个值返回1，第一个值等于第二个值返回0，第一个值小于第二个值返回-1 private int compareVersion(String str1, String str2) { diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/ParameterServiceImpl.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/ParameterServiceImpl.java similarity index 61% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/ParameterServiceImpl.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/ParameterServiceImpl.java index bf0b490..cea5b64 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/ParameterServiceImpl.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/ParameterServiceImpl.java @@ -21,75 +21,75 @@ public class ParameterServiceImpl implements ParameterService { private ParameterRepository parameterRepository; @Override - public Map getParameterData(String interfaceId, String method, String interfaceType) { - Map map = new HashMap<>(); + public Map getParameterData(String interfaceId,String method,String interfaceType) { + Map map = new HashMap<>(); List list = parameterRepository.findAllByInterfaceId(interfaceId); List parameters = new ArrayList<>(); List reqDatas = new ArrayList<>(); List resDatas = new ArrayList<>(); - for (Parameter p : list) { - if ("1".equals(p.getParameterStatus())) { + for(Parameter p : list){ + if ("1".equals(p.getParameterStatus())){ parameters.add(p); } - if ("2".equals(p.getParameterStatus())) { - if ("get".equals(method) || "webService".equals(interfaceType)) { + if ("2".equals(p.getParameterStatus())){ + if ("get".equals(method)||"webService".equals(interfaceType)){ parameters.add(p); reqDatas.add(p); - } else { + }else { reqDatas.add(p); } } - if ("3".equals(p.getParameterStatus())) { + if ("3".equals(p.getParameterStatus())){ resDatas.add(p); } } - map.put("parameters", JSONArray.toJSONString(parameters)); - map.put("reqParameters", JSONArray.toJSONString(integraTreeData(reqDatas))); - map.put("resParameters", JSONArray.toJSONString(integraTreeData(resDatas))); + map.put("parameters",JSONArray.toJSONString(parameters)); + map.put("reqParameters",JSONArray.toJSONString(integraTreeData(reqDatas))); + map.put("resParameters",JSONArray.toJSONString(integraTreeData(resDatas))); return map; } @Transactional(rollbackOn = RuntimeException.class) @Override public Map saveParameterData(InterfaceManageDTO dto) { - Map map = new HashMap<>(); + Map map = new HashMap<>(); List list = new ArrayList<>(); - if (StringUtils.isNotBlank(dto.getParameters())) { - List lists = JSONArray.parseArray(dto.getParameters(), Parameter.class); - for (Parameter parameter : lists) { + if(StringUtils.isNotBlank(dto.getParameters())){ + List lists = JSONArray.parseArray(dto.getParameters(),Parameter.class); + for (Parameter parameter : lists){ parameter.setId(Y9IdGenerator.genId(IdType.SNOWFLAKE)); parameter.setInterfaceId(dto.getId()); parameter.setPersonId(dto.getPersonId()); } list.addAll(lists); } - if (StringUtils.isNotBlank(dto.getReqParameters())) { - List lists = JSONArray.parseArray(dto.getReqParameters(), ParameterDTO.class); - list.addAll(integraData(lists, dto.getPersonId(), dto.getId())); + if (StringUtils.isNotBlank(dto.getReqParameters())){ + List lists = JSONArray.parseArray(dto.getReqParameters(),ParameterDTO.class); + list.addAll(integraData(lists,dto.getPersonId(),dto.getId())); } - if (StringUtils.isNotBlank(dto.getResParameters())) { - List lists = JSONArray.parseArray(dto.getResParameters(), ParameterDTO.class); - list.addAll(integraData(lists, dto.getPersonId(), dto.getId())); + if (StringUtils.isNotBlank(dto.getResParameters())){ + List lists = JSONArray.parseArray(dto.getResParameters(),ParameterDTO.class); + list.addAll(integraData(lists,dto.getPersonId(),dto.getId())); } - if (StringUtils.isNotBlank(dto.getId())) { + if (StringUtils.isNotBlank(dto.getId())){ try { parameterRepository.deleteByInterfaceId(dto.getId()); - if (list.size() != 0) { + if (list.size()!=0){ parameterRepository.saveAll(list); } - } catch (Exception e) { - map.put("status", false); + }catch (Exception e){ + map.put("status",false); e.printStackTrace(); return map; } } - map.put("status", true); + map.put("status",true); return map; } @Override public List getRequiredParameterData(String interfaceId) { - return parameterRepository.findAllByInterfaceIdAndRequired(interfaceId, "是"); + return parameterRepository.findAllByInterfaceIdAndRequired(interfaceId,"是"); } @Override @@ -99,58 +99,58 @@ public class ParameterServiceImpl implements ParameterService { @Override public void saveAllParameterData(List list) { - if (list.size() < 30) { + if(list.size()<30){ parameterRepository.saveAll(list); - } else { - int i = 0; + }else { + int i=0; int batch = 0; List> group = new ArrayList<>(); - for (Parameter parameter : list) { - if (i / 30 != batch) { + for(Parameter parameter : list){ + if (i/30!=batch){ List newList = new ArrayList<>(); group.add(newList); - batch = i / 30; + batch = i/30; } group.get(batch).add(parameter); i++; } - for (List itemList : group) { + for(List itemList : group){ parameterRepository.saveAll(itemList); } } } //递归遍历数据，将多层结构转为一层结构 - private void selectChildren(List list, List arrData) { - for (ParameterDTO dto : list) { - if (dto.getChildren() != null && dto.getChildren().size() != 0) { - selectChildren(dto.getChildren(), arrData); + private void selectChildren(List list,List arrData){ + for(ParameterDTO dto:list){ + if(dto.getChildren()!=null && dto.getChildren().size()!=0){ + selectChildren(dto.getChildren(),arrData); } arrData.add(dto); } } //保存转化树形数据 - private List integraData(List lists, String personId, String interfaceId) { + private List integraData(List lists,String personId,String interfaceId){ List list = new ArrayList<>(); List arrData = new ArrayList<>(); - selectChildren(lists, arrData); + selectChildren(lists,arrData); //changeIdMap用来置换id，将前端的零时id置换为唯一id - Map changeIdMap = new HashMap<>(); - for (ParameterDTO dtoIt : arrData) { - changeIdMap.put(dtoIt.getId(), Y9IdGenerator.genId(IdType.SNOWFLAKE)); + Map changeIdMap = new HashMap<>(); + for (ParameterDTO dtoIt : arrData){ + changeIdMap.put(dtoIt.getId(),Y9IdGenerator.genId(IdType.SNOWFLAKE)); dtoIt.setId(changeIdMap.get(dtoIt.getId())); dtoIt.setPersonId(personId); dtoIt.setInterfaceId(interfaceId); } //置换pid - for (ParameterDTO dtoIt : arrData) { - if (!"0".equals(dtoIt.getPid())) { + for (ParameterDTO dtoIt : arrData){ + if (!"0".equals(dtoIt.getPid())){ dtoIt.setPid(changeIdMap.get(dtoIt.getPid())); } } //统一保存 - for (ParameterDTO dtoIt : arrData) { + for (ParameterDTO dtoIt : arrData){ Parameter entity = new Parameter(dtoIt); list.add(entity); } @@ -158,13 +158,13 @@ public class ParameterServiceImpl implements ParameterService { } //递归组装树形数据 - private void assembleData(ParameterDTO node, Map> pidMaps) { - if (pidMaps.get(node.getId()) != null) { + private void assembleData(ParameterDTO node,Map> pidMaps){ + if(pidMaps.get(node.getId())!=null){ List list = new ArrayList<>(); - if (pidMaps.get(node.getId()).size() != 0) { - for (Parameter parameter : pidMaps.get(node.getId())) { + if(pidMaps.get(node.getId()).size()!=0){ + for (Parameter parameter : pidMaps.get(node.getId())){ ParameterDTO parameterDTO = new ParameterDTO(parameter); - assembleData(parameterDTO, pidMaps); + assembleData(parameterDTO,pidMaps); list.add(parameterDTO); } } @@ -173,25 +173,25 @@ public class ParameterServiceImpl implements ParameterService { } //外层组装树形数据 - private List integraTreeData(List lists) { + private List integraTreeData(List lists){ List list = new ArrayList<>(); - Map> pidMaps = new HashMap<>(); - for (Parameter parameter : lists) { - if ("0".equals(parameter.getPid())) { + Map> pidMaps = new HashMap<>(); + for(Parameter parameter : lists){ + if("0".equals(parameter.getPid())){ ParameterDTO parameterDTO = new ParameterDTO(parameter); list.add(parameterDTO); - } else { - if (pidMaps.get(parameter.getPid()) != null) { + }else { + if(pidMaps.get(parameter.getPid())!=null){ pidMaps.get(parameter.getPid()).add(parameter); - } else { + }else { List parameters = new ArrayList<>(); parameters.add(parameter); - pidMaps.put(parameter.getPid(), parameters); + pidMaps.put(parameter.getPid(),parameters); } } } - for (ParameterDTO dto : list) { - assembleData(dto, pidMaps); + for(ParameterDTO dto : list){ + assembleData(dto,pidMaps); } return list; } diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/StatisticsServiceImpl.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/StatisticsServiceImpl.java similarity index 82% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/StatisticsServiceImpl.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/StatisticsServiceImpl.java index 66fbf56..51d9b1f 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/StatisticsServiceImpl.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/StatisticsServiceImpl.java @@ -78,56 +78,38 @@ public class StatisticsServiceImpl implements StatisticsService { @Override public Map getLogOverview() { - Map res = new HashMap<>(); - try { - res.put("code", "0"); - res.put("msg", ""); - return res; - } catch (Exception e) { - res.put("code", "1"); - e.printStackTrace(); - } - return res; + return null; } @Override public Map getException(int page, int limit) { - Map res = new HashMap<>(); - try { - res.put("code", "0"); - res.put("msg", ""); - return res; - } catch (Exception e) { - res.put("code", "1"); - e.printStackTrace(); - } - return res; + return null; } @Override public Map getLogMonitoringOptions() { Map res = new HashMap<>(); try { - Map> data = new HashMap(); + Map> data = new HashMap(); List> dataGroup = callApiLogRepository.getDataGroup(); List> deptName = callApiLogRepository.getDataGroupByDeptName(); - for (Map map : dataGroup) { - for (String key : map.keySet()) { - if (data.get(key) == null) { + for(Map map : dataGroup){ + for(String key : map.keySet()){ + if(data.get(key)==null){ Set set = new HashSet<>(); - data.put(key, set); + data.put(key,set); } - if (map.get(key) != null && !map.get(key).equals("null") && StringUtils.isNotBlank(map.get(key).toString())) { + if(map.get(key)!=null && !map.get(key).equals("null") && StringUtils.isNotBlank(map.get(key).toString())){ String[] strs = map.get(key).toString().split(","); - for (String str : strs) { + for(String str : strs){ data.get(key).add(str); } } } } - List> deptList = new ArrayList<>(); - for (Map map : deptName) { + List> deptList = new ArrayList<>(); + for (Map map : deptName){ if (map.get("deptName") != null && !map.get("deptName").equals("null") && StringUtils.isNotBlank(map.get("deptName").toString())) { Map pMap = new HashMap<>(); pMap.put("label", map.get("deptName")); @@ -149,7 +131,7 @@ public class StatisticsServiceImpl implements StatisticsService { } Map rtData = new HashMap(); rtData.putAll(data); - rtData.put("deptName", deptList); + rtData.put("deptName",deptList); res.put("data", rtData); res.put("code", "0"); res.put("msg", ""); @@ -168,26 +150,26 @@ public class StatisticsServiceImpl implements StatisticsService { Specification query = buildLogQueryBuilder(conditionMap); int pageSize = (int) conditionMap.getOrDefault("pageSize", 10); int page = (int) conditionMap.getOrDefault("page", 1); - page = page - 1; - PageRequest pageRequest = PageRequest.of(page, pageSize, Sort.by("requestStartTime").descending()); + page = page -1; + PageRequest pageRequest = PageRequest.of(page, pageSize,Sort.by("requestStartTime").descending()); Page all = callApiLogRepository.findAll(query, pageRequest); List entiyList = new ArrayList<>(); ObjectMapper mapper = new ObjectMapper(); - all.getContent().stream().forEach(m -> { - Map map = mapper.convertValue(m, Map.class); + all.getContent().stream().forEach(m ->{ + Map map = mapper.convertValue(m,Map.class); entiyList.add(map); }); Map> tempData = entiyList.stream() .peek(map -> { String requestStartTime = String.valueOf(map.get("requestStartTime")); - map.put("requestStartTime", removeMilliseconds(requestStartTime)); + map.put("requestStartTime",removeMilliseconds(requestStartTime)); }) .collect(Collectors.groupingBy(map -> String.valueOf(map.get("interfaceId")), Collectors.toList())); //到限流表中根据interfaceId查找限流接口的信息，最后补充数据返回。（没有找到的证明非限流接口不做处理） Set ids = new HashSet<>(); - for (String key : tempData.keySet()) { - if (tempData.get(key) != null && tempData.get(key).get(0) != null && "1".equals(tempData.get(key).get(0).get("isLimit").toString())) { + for(String key: tempData.keySet()){ + if(tempData.get(key)!=null && tempData.get(key).get(0)!=null && "1".equals(tempData.get(key).get(0).get("isLimit").toString())){ ids.add(key); } } @@ -228,6 +210,16 @@ public class StatisticsServiceImpl implements StatisticsService { return res; } + @Override + public Map getRealTimeLog(int page, int limit) { + return null; + } + + @Override + public Map getRunningCount() { + return null; + } + private Specification buildLogQueryBuilder(Map conditionMap) { List termFieldNames = List.of( @@ -237,7 +229,7 @@ public class StatisticsServiceImpl implements StatisticsService { List wildFieldNames = List.of("apiName", "userName", "serverIP", "requestIP", "requestUserName", "limitTime"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); - Specification spec = new Specification() { + Specification spec= new Specification(){ @Override public Predicate toPredicate(Root root, CriteriaQuery query, CriteriaBuilder criteriaBuilder) { List predicates = new ArrayList<>(); @@ -250,7 +242,7 @@ public class StatisticsServiceImpl implements StatisticsService { if (split.length == 2) { try { - predicates.add(criteriaBuilder.between(root.get("requestStartTime"), sdf.parse(startDate), sdf.parse(endDate))); + predicates.add(criteriaBuilder.between(root.get("requestStartTime"),sdf.parse(startDate),sdf.parse(endDate))); } catch (ParseException e) { e.printStackTrace(); } @@ -262,7 +254,7 @@ public class StatisticsServiceImpl implements StatisticsService { Map> map = (Map) conditionMap.get("deptSystem"); if (!map.isEmpty()) { for (String deptName : map.keySet()) { - predicates.add(criteriaBuilder.equal(root.get("deptName"), deptName)); + predicates.add(criteriaBuilder.equal(root.get("deptName"),deptName)); if (map.get(deptName) != null && map.get(deptName).size() > 0) { CriteriaBuilder.In applySystemNames = criteriaBuilder.in(root.get("applySystemName")); for (String it : map.get(deptName)) { @@ -278,14 +270,14 @@ public class StatisticsServiceImpl implements StatisticsService { Optional.ofNullable(conditionMap.get(fieldName)) .map(Object::toString) // 将termValue转换为字符串，以便后续比较 .filter(StringUtils::isNotBlank) - .ifPresent(value -> predicates.add(criteriaBuilder.equal(root.get(fieldName), value))); + .ifPresent(value -> predicates.add(criteriaBuilder.equal(root.get(fieldName),value))); } for (String fieldName : wildFieldNames) { Optional.ofNullable(conditionMap.get(fieldName)) .map(Object::toString) // 将termValue转换为字符串，以便后续比较 .filter(StringUtils::isNotBlank) - .ifPresent(value -> predicates.add(criteriaBuilder.like(root.get(fieldName), "%" + value + "%"))); + .ifPresent(value -> predicates.add(criteriaBuilder.like(root.get(fieldName),"%"+value+"%"))); } return criteriaBuilder.and(predicates.toArray(new Predicate[0])); } @@ -295,34 +287,6 @@ public class StatisticsServiceImpl implements StatisticsService { } - @Override - public Map getRealTimeLog(int page, int limit) { - Map res = new HashMap<>(); - try { - res.put("code", "0"); - res.put("msg", ""); - return res; - } catch (Exception e) { - res.put("code", "1"); - e.printStackTrace(); - } - return res; - } - - @Override - public Map getRunningCount() { - Map res = new HashMap<>(); - try { - res.put("code", "0"); - res.put("msg", ""); - return res; - } catch (Exception e) { - res.put("code", "1"); - e.printStackTrace(); - } - return res; - } - private String removeMilliseconds(String dateTime) { if (StringUtils.isBlank(dateTime) || "null".equals(dateTime)) { return ""; diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/SystemIdentifierServiceImpl.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/SystemIdentifierServiceImpl.java similarity index 71% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/SystemIdentifierServiceImpl.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/SystemIdentifierServiceImpl.java index 1a191c2..b48f520 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/service/impl/SystemIdentifierServiceImpl.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/service/impl/SystemIdentifierServiceImpl.java @@ -27,75 +27,74 @@ public class SystemIdentifierServiceImpl implements SystemIdentifierService { @Autowired private SystemIdentifierRepository systemIdentifierRepository; - @Override - public Page getSystemIdentifierPage(SystemIdentifier systemIdentifier, int page, int limit) { - Specification spec = new Specification() { + public Page getSystemIdentifierPage(SystemIdentifier systemIdentifier,int page ,int limit) { + Specification spec= new Specification(){ @Override public Predicate toPredicate(Root root, CriteriaQuery query, CriteriaBuilder criteriaBuilder) { List predicates = new ArrayList<>(); - if (StringUtils.isNotBlank(systemIdentifier.getName())) { - predicates.add(criteriaBuilder.like(root.get("name"), "%" + systemIdentifier.getName() + "%")); + if (StringUtils.isNotBlank(systemIdentifier.getName())){ + predicates.add(criteriaBuilder.like(root.get("name"),"%"+systemIdentifier.getName()+"%")); } - if (StringUtils.isNotBlank(systemIdentifier.getParameterType())) { - predicates.add(criteriaBuilder.equal(root.get("parameterType"), systemIdentifier.getParameterType())); + if (StringUtils.isNotBlank(systemIdentifier.getParameterType())){ + predicates.add(criteriaBuilder.equal(root.get("parameterType"),systemIdentifier.getParameterType())); } - predicates.add(criteriaBuilder.equal(root.get("isDelete"), "N")); + predicates.add(criteriaBuilder.equal(root.get("isDelete"),"N")); return criteriaBuilder.and(predicates.toArray(new Predicate[0])); } }; - Pageable pageable = PageRequest.of(page - 1, limit, Sort.by("sort").ascending()); - Page page1 = systemIdentifierRepository.findAll(spec, pageable); + Pageable pageable = PageRequest.of(page-1,limit, Sort.by("sort").ascending()); + Page page1 = systemIdentifierRepository.findAll(spec,pageable); return page1; } @Override public List getSystemIdentifierList(String type) { - return systemIdentifierRepository.findByParameterTypeAndIsDelete(type, "N"); + return systemIdentifierRepository.findByParameterTypeAndIsDelete(type,"N"); } @Override public List getSystemIdentifierListByPid(String id) { - return systemIdentifierRepository.findByParameterTypeAndPidAndIsDelete("1", id, "N"); + return systemIdentifierRepository.findByParameterTypeAndPidAndIsDelete("1",id,"N"); } @Override public Map delInfo(String id) { - Map map = new HashMap<>(); - if (StringUtils.isBlank(id)) { - map.put("status", "err"); - map.put("msg", "id为空不能删除"); + Map map = new HashMap<>(); + if(StringUtils.isBlank(id)){ + map.put("status","err"); + map.put("msg","id为空不能删除"); } SystemIdentifier systemIdentifier = systemIdentifierRepository.findById(id).orElse(null); - if (systemIdentifier != null) { + if (systemIdentifier!=null){ systemIdentifier.setIsDelete("Y"); List systemIdentifiers = systemIdentifierRepository.findByParameterTypeAndPidAndIsDelete("1", id, "N"); - if (systemIdentifiers.size() != 0) { - map.put("status", "err"); - map.put("msg", "此数据下有系统未删除，请先删除下属系统"); - } else { + if (systemIdentifiers.size()!=0){ + map.put("status","err"); + map.put("msg","此数据下有系统未删除，请先删除下属系统"); + }else { systemIdentifierRepository.save(systemIdentifier); - map.put("status", "success"); + map.put("status","success"); } - } else { - map.put("status", "err"); - map.put("msg", "没有数据"); + }else { + map.put("status","err"); + map.put("msg","没有数据"); } return map; } @Override public Map saveInfo(SystemIdentifier systemIdentifier) { - Map map = new HashMap<>(); - if (StringUtils.isBlank(systemIdentifier.getId())) { + Map map = new HashMap<>(); + if(StringUtils.isBlank(systemIdentifier.getId())){ systemIdentifier.setId(Y9IdGenerator.genId()); systemIdentifier.setIsDelete("N"); } SystemIdentifier identifier = systemIdentifierRepository.save(systemIdentifier); - if (identifier != null) { - map.put("status", true); - } else { - map.put("status", false); + if(identifier!=null){ + map.put("status",true); + }else { + map.put("status",false); } return map; } diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/util/BizException.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/util/BizException.java new file mode 100644 index 0000000..c39ecb8 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/util/BizException.java @@ -0,0 +1,10 @@ +package net.risesoft.util; + +public class BizException extends RuntimeException { + public BizException() { + } + + public BizException(String message) { + super(message); + } +} diff --git a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/RedissonUtil.java b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/util/RedissonUtil.java similarity index 62% rename from risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/RedissonUtil.java rename to y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/util/RedissonUtil.java index bc3b0e7..e93af18 100644 --- a/risenet-y9boot-webapp-interface-platform/src/main/java/net/risesoft/util/RedissonUtil.java +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/java/net/risesoft/util/RedissonUtil.java @@ -14,89 +14,89 @@ import org.redisson.config.Config; import org.springframework.stereotype.Component; + import java.util.concurrent.TimeUnit; @Component public class RedissonUtil { private static RedissonClient redissonClient; - static { Config config = new Config(); config.useSingleServer() - .setAddress("redis://" + Y9Context.getProperty("spring.redis.host") + ":" + Y9Context.getProperty("spring.redis.port")) + .setAddress("redis://"+ Y9Context.getProperty("spring.redis.host")+":"+Y9Context.getProperty("spring.redis.port")) .setPassword(Y9Context.getProperty("spring.redis.password")) .setDatabase(9); redissonClient = Redisson.create(config); } //返回redis中的限流器 - public RRateLimiter getRateLimiter(String key) { + public RRateLimiter getRateLimiter(String key){ return redissonClient.getRateLimiter(key); } - //初始化一个限流器 - public void init(InterfaceLimitInfo interfaceLimitInfo, String personId) { - RRateLimiter rRateLimiter = redissonClient.getRateLimiter("rateLimiter_" + interfaceLimitInfo.getInterfaceId()); + public void init(InterfaceLimitInfo interfaceLimitInfo,String personId){ + RRateLimiter rRateLimiter = redissonClient.getRateLimiter("rateLimiter_"+interfaceLimitInfo.getInterfaceId()); //生产令牌数 - Long count = 10L; + Long count = 10l; //多长时间内，单位：秒 - Long time = 1L; + Long time = 1l; if (ThresholdType.TYPE_ZDY.getEnName().equals(interfaceLimitInfo.getThresholdType())) { - if (StringUtils.isNotBlank(interfaceLimitInfo.getLimitCount())) { + if (StringUtils.isNotBlank(interfaceLimitInfo.getLimitCount())){ try { count = Long.parseLong(interfaceLimitInfo.getLimitCount()); - if (StringUtils.isNotBlank(interfaceLimitInfo.getLimitTime())) { + if (StringUtils.isNotBlank(interfaceLimitInfo.getLimitTime())){ time = Long.parseLong(interfaceLimitInfo.getLimitTime()); } - } catch (Exception e) { - count = 10L; - time = 1L; + }catch (Exception e){ + count = 10l; + time = 1l; } } - rRateLimiter.trySetRate(RateType.OVERALL, count, time, RateIntervalUnit.SECONDS); - } else if (ThresholdType.QPS.getEnName().equals(interfaceLimitInfo.getThresholdType())) { - if (StringUtils.isNotBlank(interfaceLimitInfo.getThresholdVal())) { + rRateLimiter.trySetRate(RateType.OVERALL,count,time, RateIntervalUnit.SECONDS); + }else if (ThresholdType.QPS.getEnName().equals(interfaceLimitInfo.getThresholdType())){ + if (StringUtils.isNotBlank(interfaceLimitInfo.getThresholdVal())){ try { count = Long.parseLong(interfaceLimitInfo.getThresholdVal()); - time = 1L; - } catch (Exception e) { - count = 10L; - time = 1L; + time=1l; + }catch (Exception e){ + count = 10l; + time = 1l; } - rRateLimiter.trySetRate(RateType.OVERALL, count, time, RateIntervalUnit.SECONDS); + rRateLimiter.trySetRate(RateType.OVERALL,count,time, RateIntervalUnit.SECONDS); } } } //调用方法判断当前请求是否允许通过(注意：这里约定调用此方法的应当是开启限流的接口) - public boolean isPass(InterfaceLimitInfo interfaceLimitInfo, String personId) { - RRateLimiter rRateLimiter = redissonClient.getRateLimiter("rateLimiter_" + interfaceLimitInfo.getInterfaceId()); + public boolean isPass(InterfaceLimitInfo interfaceLimitInfo,String personId){ + RRateLimiter rRateLimiter = redissonClient.getRateLimiter("rateLimiter_"+interfaceLimitInfo.getInterfaceId()); //判断限流器是否存在，不存在初始化限流器 - if (!rRateLimiter.isExists()) { - init(interfaceLimitInfo, personId); - rRateLimiter = redissonClient.getRateLimiter("rateLimiter_" + interfaceLimitInfo.getInterfaceId()); + if (!rRateLimiter.isExists()){ + init(interfaceLimitInfo,personId); + rRateLimiter = redissonClient.getRateLimiter("rateLimiter_"+interfaceLimitInfo.getInterfaceId()); } //判断流控效果 - if (Effect.FAIL_FAST.getEnName().equals(interfaceLimitInfo.getEffect())) { - boolean effect = rRateLimiter.tryAcquire(1L); + if (Effect.FAIL_FAST.getEnName().equals(interfaceLimitInfo.getEffect())){ + boolean effect = rRateLimiter.tryAcquire(1l); return effect; - } else if (Effect.WAIT.getEnName().equals(interfaceLimitInfo.getEffect())) { - Long time = 100L; + }else if (Effect.WAIT.getEnName().equals(interfaceLimitInfo.getEffect())){ + Long time = 100l; try { time = Long.parseLong(interfaceLimitInfo.getWaitTime()); - } catch (Exception e) { - time = 100L; + }catch (Exception e){ + time = 100l; } //等待时间为0，则一直等待直到获取到令牌 - if ("0".equals(interfaceLimitInfo.getWaitTime())) { - rRateLimiter.acquire(1L); + if ("0".equals(interfaceLimitInfo.getWaitTime())){ + rRateLimiter.acquire(1l); return true; } //在指定时间是否可以取到令牌 - return rRateLimiter.tryAcquire(1L, time, TimeUnit.MILLISECONDS); + boolean effect = rRateLimiter.tryAcquire(1l,time, TimeUnit.MILLISECONDS); + return effect; } return true; } diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/resources/application.yml b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/resources/application.yml new file mode 100644 index 0000000..ed0d533 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/resources/application.yml @@ -0,0 +1,191 @@ +server: + intranet: + ip: 192.168.x.x,10.161.x.x + port: 7055 + error: + include-message: always + servlet: + context-path: /interfacePlatform + register-default-servlet: true + encoding: + charset: UTF-8 + enabled: true + force: true + session: + tracking-modes: COOKIE + tomcat: + uri-encoding: UTF-8 +spring: + application: + name: interfacePlatform + aop: + auto: false + proxy-target-class: false + autoconfigure: + exclude: + - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration + - org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration + - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration + - org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration + - org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration + datasource: + generate-unique-name: false + type: com.alibaba.druid.pool.DruidDataSource + druid: + filter: + stat: + log-slow-sql: true + mergeSql: true + slow-sql-millis: 3000 + wall: + config: + drop-table-allow: true + enabled: true + stat-view-servlet: + enabled: false + url-pattern: /druid/* + login-username: admin + login-password: admin + reset-enable: false + allow: 127.0.0.1 + web-stat-filter: + enabled: false + url-pattern: /* + exclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*,/static/*' + y9-public: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/y9_interface?serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&useUnicode=true&characterEncoding=utf-8&rewriteBatchedStatements=true&useCompression=true&useSSL=false + username: root + password: 'root' + initialSize: 1 + maxActive: 20 + maxPoolPreparedStatementPerConnectionSize: 100 + maxWait: 60000 + minEvictableIdleTimeMillis: 300000 + minIdle: 1 + poolPreparedStatements: true + testOnBorrow: false + testOnReturn: false + testWhileIdle: true + timeBetweenEvictionRunsMillis: 60000 + useGlobalDataSourceStat: true + validationQuery: SELECT 1 FROM DUAL + jmx: + default-domain: interfacePlatform + jpa: + hibernate: + naming: + implicit-strategy: org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl + physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl + open-in-view: false + properties: + hibernate: + cache: + use_query_cache: false + use_second_level_cache: false + dialect: org.hibernate.dialect.MySQL8Dialect + hbm2ddl: + auto: update + jdbc: + batch_size: 100 + show_sql: false + kafka: + bootstrap-servers: localhost:9092 + producer: + retries: 0 + batch-size: 16384 + buffer-memory: 33554432 + consumer: + auto-commit-interval: 1000 + enable-auto-commit: false + group-id: y9risedata-server + main: + allow-bean-definition-overriding: true + allow-circular-references: true + redis: + database: 8 + host: localhost + lettuce: + pool: + max-active: 8 + max-idle: 8 + max-wait: -1 + min-idle: 0 + shutdown-timeout: 100ms + password: y9i-83204585 + port: 6379 + ssl: false + timeout: 10000 + mvc: + view: + prefix: /WEB-INF/jsp/ + suffix: .jsp + servlet: + multipart: + maxFileSize: 200MB + maxRequestSize: 1000MB +y9: + interfacePath: /home + systemName: interfacePlatform + common: + idEnabled: 0 + kafkaEnabled: false + feature: + log: + enabled: false + jpa: + packagesToScanEntityPublic: net.risesoft.y9public.entity + packagesToScanEntityTenant: net.risesoft.entity + packagesToScanRepositoryPublic: net.risesoft.y9public.repository + packagesToScanRepositoryTenant: net.risesoft.repository + session: + redis: + enabled: true + maxInactiveIntervalInSeconds: 3600 + security: + enabled: true + cors: + allowCredentials: true + allowedOriginPatterns: + - https://*.youshengyun.com + - http://*.youshengyun.com + - http://localhost:7056 + - http://localhost:7055 + - http://localhost:7070 + - http://127.0.0.1:7055 + - http://127.0.0.1:7056 + xss: + ignoreParam: + - ID + - properties + - operationArray + - resourceInfoJson + - meta + - accessLogJson + - clickedAppJson + - departmentJson + - personJson + - groupJson + - positionJson + - url + - xmlData + - parseData + - whereSql + csrf: + acceptedReferer: + - 127.0.0.1 + - localhost + oauth2: + resource: + enabled: true + saveLogMessage: false + saveOnlineMessage: false + allowBasicAuthentication: true + allowFormEncodedBodyParameter: true + allowUriQueryParameter: true + protectedUrlPatterns: /api/* + opaque: + client-id: clientid + client-secret: secret + introspection-uri: http://localhost:7055/sso/oauth2.0/introspect + profile-uri: http://localhost:7055/sso/oauth2.0/profile diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/resources/banner.txt b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/resources/banner.txt new file mode 100644 index 0000000..fa5b544 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/resources/banner.txt @@ -0,0 +1,6 @@ + _____ _ __ ___ _ _ __ + \_ \_ __ | |_ ___ _ __ / _| __ _ ___ ___ / _ \ | __ _| |_ / _| ___ _ __ _ __ ___ /\/\ __ _ _ __ __ _ __ _ ___ _ __ + / /\/ '_ \| __/ _ \ '__| |_ / _` |/ __/ _ \/ /_)/ |/ _` | __| |_ / _ \| '__| '_ ` _ \ / \ / _` | '_ \ / _` |/ _` |/ _ \ '__| +/\/ /_ | | | | || __/ | | _| (_| | (_| __/ ___/| | (_| | |_| _| (_) | | | | | | | / /\/\ \ (_| | | | | (_| | (_| | __/ | +\____/ |_| |_|\__\___|_| |_| \__,_|\___\___\/ |_|\__,_|\__|_| \___/|_| |_| |_| |_\/ \/\__,_|_| |_|\__,_|\__, |\___|_| + |___/ \ No newline at end of file diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/resources/logback.xml b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/resources/logback.xml new file mode 100644 index 0000000..deabc3e --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/resources/logback.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/resources/sql/data-mysql.sql b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/resources/sql/data-mysql.sql new file mode 100644 index 0000000..50e1417 --- /dev/null +++ b/y9-module-interface/risenet-y9boot-webapp-interface-platform-manager/src/main/resources/sql/data-mysql.sql @@ -0,0 +1,48 @@ +-- 删除表 +DROP TABLE y9_interface.view_approve_list; +--DROP TABLE IF EXISTS view_approve_list; + +-- 创建视图 +create or replace +algorithm = UNDEFINED view `y9_interface`.`view_approve_list` as +select + `nia`.`ID` as `APPROVE_ID`, + `nia`.`INTERFACE_ID` as `INTERFACE_ID`, + `nia`.`APPLY_ID` as `APPLY_ID`, + `nia`.`APPROVE_STATUS` as `APPROVE_STATUS`, + `nia`.`ILLUSTRATE` as `ILLUSTRATE`, + `nia`.`APPLY_TYPE` as `APPLY_TYPE`, + `nia`.`NOTES` as `NOTES`, + `nia`.`IS_OVER` as `IS_OVER`, + `nia`.`INTERFACE_STATUS` as `APPROVE_INTERFACE_STATUS`, + `nia`.`PERSON_ID` as `APPROVE_PERSON_ID`, + `nia`.`PERSON_NAME` as `APPROVE_PERSON_NAME`, + `nia`.`CREATETIME` as `CREATETIME`, + `nia`.`UPDATETIME` as `UPDATETIME`, + `nia`.`CURRENT_USER_ID` as `CURRENT_USER_ID`, + `nia`.`ALREADY_APPROVE_USER` as `ALREADY_APPROVE_USER`, + `nia2`.`APPLY_PERSON_ID` as `APPLY_PERSON_ID`, + `nia2`.`APPLY_PERSON_NAME` as `APPLY_PERSON_NAME`, + `nia2`.`CREATETIME` as `apply_time`, + `nimi`.`INTERFACE_NAME` as `INTERFACE_NAME`, + `nimi`.`INTERFACE_STATUS` as `INTERFACE_STATUS`, + `nimi`.`VERSION` as `VERSION`, + `nimi`.`IS_LIMIT_DATA` as `IS_LIMIT_DATA`, + (case + when (`nia`.`APPROVE_STATUS` = '未审批') then '0' + when (`nia`.`APPROVE_STATUS` = '审批中') then '1' + when (`nia`.`APPROVE_STATUS` = '通过') then '2' + when (`nia`.`APPROVE_STATUS` = '不通过') then '3' + end) as `STATUS_SORT` +from + ((`y9_interface`.`y9_interface_approve` `nia` + left join `y9_interface`.`y9_interface_apply` `nia2` on + ((`nia`.`APPLY_ID` = `nia2`.`ID`))) + left join `y9_interface`.`y9_interface_manage_info` `nimi` on + ((`nia`.`INTERFACE_ID` = `nimi`.`ID`))) +order by + `nia`.`UPDATETIME` desc; + +--插入管理员的默认执行节点 +#INSERT INTO y9_interface_flow_node (ID,CREATETIME,UPDATETIME,APPROVE_DEPT_ID,APPROVE_DEPT_NAME,APPROVE_ROLE_CODE,APPROVE_ROLE_NAME,APPROVE_USER_ID,APPROVE_USER_NAME,CREATE_USER_ID,IS_PRIMARY,IS_PROMOTER_SELECT,NODE_NAME,SAME_ID,SORT,UPDATE_USER_ID,illustrate,IS_DELETE,IS_ENABLE) VALUES +# ('25cee41e73dd4281a93a9cb799dd9d12',NOW(),NOW(),NULL,NULL,NULL,NULL,NULL,NULL,NULL,'Y',NULL,'管理员专属','25cee41e73dd4281a93a9cb799dd9d12',0,NULL,'','N','true');