From 6e827e5f972dc2ccaac62900be52d0bdf891e32f Mon Sep 17 00:00:00 2001
From: decoder <546371936@qq.com>
Date: Thu, 11 Nov 2021 13:31:29 +0800
Subject: [PATCH] =?UTF-8?q?-antd=20=E9=A3=8E=E6=A0=BCUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 4 -
.../genersoft/iot/vmp/VManageBootstrap.java | 7 +-
.../genersoft/iot/vmp/common/MyPageInfo.java | 95 +
.../com/genersoft/iot/vmp/common/Page.java | 95 +
.../genersoft/iot/vmp/common/VersionPo.java | 136 -
.../iot/vmp/common/VideoManagerConstants.java | 5 +-
.../vmp/common/reponse/ErrorResponseData.java | 28 +
.../iot/vmp/common/reponse/ResponseData.java | 98 +
.../common/reponse/SuccessResponseData.java | 15 +
.../iot/vmp/conf/ApiAccessFilter.java | 23 +-
.../iot/vmp/conf/ProxyServletConfig.java | 3 -
.../genersoft/iot/vmp/conf/RedisConfig.java | 113 +-
.../iot/vmp/conf/SipDeviceRunner.java | 1 -
.../iot/vmp/conf/SipPlatformRunner.java | 6 +-
.../com/genersoft/iot/vmp/conf/UserSetup.java | 1 -
.../iot/vmp/conf/VManagerConfig.java | 25 -
.../genersoft/iot/vmp/conf/VersionConfig.java | 37 -
.../genersoft/iot/vmp/conf/VersionInfo.java | 37 -
.../com/genersoft/iot/vmp/conf/WebConfig.java | 28 +
.../AnonymousAuthenticationEntryPoint.java | 43 -
.../DefaultUserDetailsServiceImpl.java | 47 -
.../conf/security/InvalidSessionHandler.java | 24 -
.../conf/security/LoginFailureHandler.java | 65 -
.../conf/security/LoginSuccessHandler.java | 24 -
.../iot/vmp/conf/security/LogoutHandler.java | 27 -
.../iot/vmp/conf/security/SecurityUtils.java | 78 -
.../vmp/conf/security/WebSecurityConfig.java | 169 -
.../iot/vmp/conf/security/dto/LoginUser.java | 102 -
.../iot/vmp/gb28181/bean/Device.java | 6 +-
.../iot/vmp/service/IGbStreamService.java | 2 +-
.../iot/vmp/service/IRecordInfoServer.java | 8 +
.../iot/vmp/service/IStreamProxyService.java | 3 +-
.../iot/vmp/service/IUserService.java | 22 -
.../iot/vmp/service/IVideoSquareService.java | 10 +
.../vmp/service/impl/GbStreamServiceImpl.java | 4 +-
.../service/impl/RecordInfoServerImpl.java | 81 +
.../service/impl/StreamProxyServiceImpl.java | 5 +-
.../iot/vmp/service/impl/UserServiceImpl.java | 56 -
.../service/impl/VideoSquareServiceImpl.java | 52 +
.../vmp/storager/IVideoManagerStorager.java | 733 +-
.../vmp/storager/dao/DeviceChannelMapper.java | 2 +-
.../iot/vmp/storager/dao/DeviceMapper.java | 11 +-
.../iot/vmp/storager/dao/GbStreamMapper.java | 12 +-
.../iot/vmp/storager/dao/RecordInfoDao.java | 10 +
.../vmp/storager/dao/StreamProxyMapper.java | 17 +-
.../vmp/storager/dao/VideoSquareMapper.java | 20 +
.../impl/VideoManagerStoragerImpl.java | 1183 +-
.../com/genersoft/iot/vmp/utils/GitUtil.java | 44 -
.../genersoft/iot/vmp/utils/JarFileUtils.java | 73 -
.../MobilePositionController.java | 31 +-
.../gb28181/alarm/AlarmController.java | 93 +-
.../vmanager/gb28181/device/DeviceQuery.java | 463 +-
.../gb28181/gbStream/GbStreamController.java | 30 +-
.../gb28181/platform/PlatformController.java | 49 +-
.../PlatformGbStreamController.java | 7 +-
.../vmanager/gb28181/play/PlayController.java | 19 +-
.../vmanager/gb28181/ptz/PtzController.java | 9 +-
.../vmp/vmanager/record/RecordController.java | 74 +-
.../vmp/vmanager/server/ServerController.java | 81 +-
.../streamProxy/StreamProxyController.java | 17 +-
.../iot/vmp/vmanager/user/RoleController.java | 101 -
.../iot/vmp/vmanager/user/UserController.java | 182 -
.../videoSquare/VideoSquareController.java | 20 +
.../iot/vmp/web/ApiDeviceController.java | 56 +-
.../genersoft/iot/vmp/web/AuthController.java | 25 -
src/main/resources/application-dev.yml | 44 +-
src/main/resources/application.yml | 2 +-
.../vmp/service/impl/RoleServiceImplTest.java | 58 -
.../vmp/service/impl/UserServiceImplTest.java | 72 -
web_src/.babelrc | 12 -
web_src/.browserslistrc | 3 +
web_src/.editorconfig | 46 +-
web_src/.env | 3 +
web_src/.env.development | 3 +
web_src/.env.preview | 3 +
web_src/.gitattributes | 1 +
web_src/.gitignore | 12 +-
web_src/.postcssrc.js | 14 -
web_src/.prettierrc | 6 +
web_src/.travis.yml | 7 +
web_src/Dockerfile | 6 +
web_src/LICENSE | 21 +
web_src/README.md | 22 +-
web_src/babel.config.js | 30 +
web_src/build/build.js | 41 -
web_src/build/check-versions.js | 54 -
web_src/build/logo.png | Bin 6849 -> 0 bytes
web_src/build/utils.js | 101 -
web_src/build/vue-loader.conf.js | 22 -
web_src/build/webpack.base.conf.js | 83 -
web_src/build/webpack.dev.conf.js | 95 -
web_src/build/webpack.prod.conf.js | 145 -
web_src/config/dev.env.js | 8 -
web_src/config/index.js | 85 -
web_src/config/plugin.config.js | 49 +
web_src/config/prod.env.js | 4 -
web_src/config/themePluginConfig.js | 115 +
web_src/deploy/caddy.conf | 9 +
web_src/deploy/nginx.conf | 24 +
web_src/index.html | 18 -
web_src/jest.config.js | 23 +
web_src/jsconfig.json | 11 +
web_src/package-lock.json | 11955 ----------------
web_src/package.json | 109 +-
web_src/postcss.config.js | 5 +
web_src/public/avatar2.jpg | Bin 0 -> 80189 bytes
web_src/public/index.html | 34 +
web_src/public/jessibuca/bg.jpg | Bin 0 -> 148090 bytes
web_src/public/jessibuca/favicon.ico | Bin 0 -> 4418 bytes
web_src/public/jessibuca/ff.js | 43 +
.../{static/js => public}/jessibuca/ff.wasm | Bin
web_src/public/jessibuca/ff_wasm.js | 1 +
web_src/public/jessibuca/ff_wasm.wasm | Bin 0 -> 875544 bytes
web_src/public/jessibuca/index.js | 3 +
web_src/public/jessibuca/libhevc_aac.js | 35 +
web_src/public/jessibuca/libhevc_aac_wasm.js | 1 +
.../public/jessibuca/libhevc_aac_wasm.wasm | Bin 0 -> 616019 bytes
.../{static/js => public}/jessibuca/logo.png | Bin
web_src/public/jessibuca/tech.png | Bin 0 -> 106426 bytes
web_src/{static => public}/libDecoder.wasm | Bin
web_src/public/logo.png | Bin 0 -> 9218 bytes
web_src/src/App.vue | 92 +-
web_src/src/api/controller.js | 78 +
web_src/src/api/deviceList.js | 225 +
web_src/src/api/gbPlatform.js | 106 +
web_src/src/api/login.js | 12 +
web_src/src/api/manage.js | 70 +
web_src/src/api/mediaServer.js | 59 +
web_src/src/api/recordList.js | 61 +
web_src/src/api/streamProxy.js | 108 +
web_src/src/api/videoSquare.js | 12 +
web_src/src/api/warning.js | 25 +
web_src/src/assets/background.svg | 69 +
web_src/src/assets/icons.png | Bin 11567 -> 0 bytes
web_src/src/assets/icons/bx-analyse.svg | 1 +
web_src/src/assets/loading.png | Bin 2763 -> 0 bytes
web_src/src/assets/login-bg.jpg | Bin 4068 -> 0 bytes
web_src/src/assets/login-cloud.png | Bin 3388 -> 0 bytes
web_src/src/assets/logo.png | Bin 67082 -> 0 bytes
web_src/src/assets/logo.svg | 29 +
web_src/src/assets/play.png | Bin 546 -> 0 bytes
web_src/src/assets/zlm-log.png | Bin 49027 -> 0 bytes
.../images => src/assets}/zlm-logo.png | Bin
.../ArticleListContent/ArticleListContent.vue | 89 +
.../components/ArticleListContent/index.js | 3 +
web_src/src/components/AvatarList/Item.jsx | 25 +
web_src/src/components/AvatarList/List.jsx | 72 +
web_src/src/components/AvatarList/index.js | 9 +
web_src/src/components/AvatarList/index.less | 60 +
web_src/src/components/AvatarList/index.md | 64 +
web_src/src/components/CloudRecord.vue | 196 -
web_src/src/components/CloudRecordDetail.vue | 570 -
web_src/src/components/DeviceList.vue | 316 -
web_src/src/components/Dialog.js | 113 +
web_src/src/components/Editor/QuillEditor.vue | 83 +
web_src/src/components/Editor/WangEditor.vue | 57 +
web_src/src/components/Ellipsis/Ellipsis.vue | 64 +
web_src/src/components/Ellipsis/index.js | 3 +
web_src/src/components/Ellipsis/index.md | 38 +
.../FooterToolbar/FooterToolBar.vue | 47 +
web_src/src/components/FooterToolbar/index.js | 4 +
.../src/components/FooterToolbar/index.less | 23 +
web_src/src/components/FooterToolbar/index.md | 48 +
web_src/src/components/GlobalFooter/index.vue | 11 +
.../components/GlobalHeader/RightContent.vue | 63 +
.../components/IconSelector/IconSelector.vue | 86 +
web_src/src/components/IconSelector/README.md | 48 +
web_src/src/components/IconSelector/icons.js | 36 +
web_src/src/components/IconSelector/index.js | 2 +
web_src/src/components/Login.vue | 125 -
web_src/src/components/MediaServerManger.vue | 179 -
web_src/src/components/MultiTab/MultiTab.vue | 162 +
web_src/src/components/MultiTab/events.js | 2 +
web_src/src/components/MultiTab/index.js | 40 +
web_src/src/components/MultiTab/index.less | 25 +
.../src/components/NProgress/nprogress.less | 76 +
.../src/components/NoticeIcon/NoticeIcon.vue | 90 +
web_src/src/components/NoticeIcon/index.js | 2 +
.../src/components/NumberInfo/NumberInfo.vue | 54 +
web_src/src/components/NumberInfo/index.js | 3 +
web_src/src/components/NumberInfo/index.less | 55 +
web_src/src/components/NumberInfo/index.md | 43 +
web_src/src/components/Other/CarbonAds.vue | 62 +
web_src/src/components/PageLoading/index.jsx | 106 +
web_src/src/components/ParentPlatformList.vue | 171 -
web_src/src/components/PushVideoList.vue | 243 -
.../src/components/Search/GlobalSearch.jsx | 63 +
web_src/src/components/Search/index.less | 25 +
web_src/src/components/SelectLang/index.jsx | 58 +
web_src/src/components/SelectLang/index.less | 31 +
.../SettingDrawer/SettingDrawer.vue | 343 +
.../components/SettingDrawer/SettingItem.vue | 38 +
web_src/src/components/SettingDrawer/index.js | 2 +
.../components/SettingDrawer/settingConfig.js | 48 +
.../components/SettingDrawer/themeColor.js | 24 +
.../StandardFormRow/StandardFormRow.vue | 122 +
.../src/components/StandardFormRow/index.js | 3 +
web_src/src/components/StreamProxyList.vue | 360 -
web_src/src/components/Table/README.md | 341 +
web_src/src/components/Table/index.js | 316 +
.../components/TagSelect/TagSelectOption.jsx | 45 +
web_src/src/components/TagSelect/index.jsx | 113 +
web_src/src/components/TextArea/index.jsx | 69 +
web_src/src/components/TextArea/style.less | 12 +
web_src/src/components/Tree/Tree.jsx | 124 +
web_src/src/components/Trend/Trend.vue | 41 +
web_src/src/components/Trend/index.js | 3 +
web_src/src/components/Trend/index.less | 42 +
web_src/src/components/Trend/index.md | 45 +
web_src/src/components/UiHeader.vue | 120 -
.../components/VideoPlayer/dialogPlayer.vue | 811 ++
.../{dialog => VideoPlayer}/easyPlayer.vue | 22 +-
.../src/components/VideoPlayer/jessibuca.vue | 328 +
web_src/src/components/_util/util.js | 46 +
web_src/src/components/channelList.vue | 392 -
web_src/src/components/control.vue | 442 -
web_src/src/components/devicePosition.vue | 391 -
.../src/components/dialog/MediaServerEdit.vue | 381 -
.../src/components/dialog/StreamProxyEdit.vue | 278 -
.../src/components/dialog/addStreamTOGB.vue | 137 -
.../src/components/dialog/changePassword.vue | 128 -
.../src/components/dialog/chooseChannel.vue | 98 -
.../components/dialog/chooseChannelForGb.vue | 239 -
.../dialog/chooseChannelForStream.vue | 216 -
web_src/src/components/dialog/deviceEdit.vue | 117 -
.../src/components/dialog/devicePlayer.vue | 772 -
web_src/src/components/dialog/jessibuca.vue | 298 -
web_src/src/components/dialog/onvifEdit.vue | 121 -
.../src/components/dialog/platformEdit.vue | 404 -
web_src/src/components/dialog/rtcPlayer.vue | 114 -
web_src/src/components/index.js | 32 +
web_src/src/components/index.less | 6 +
web_src/src/components/service/MediaServer.js | 99 -
web_src/src/components/setting/Media.vue | 121 -
web_src/src/components/setting/Sip.vue | 77 -
web_src/src/components/setting/Web.vue | 83 -
web_src/src/components/test.vue | 198 -
web_src/src/components/test2.vue | 190 -
.../src/components/tools/TwoStepCaptcha.vue | 89 +
web_src/src/config/defaultSettings.js | 30 +
web_src/src/config/router.config.js | 165 +
.../{static/js => src/core}/EasyWasmPlayer.js | 0
web_src/src/core/bootstrap.js | 33 +
web_src/src/core/icons.js | 11 +
web_src/src/core/jessibuca/bg.jpg | Bin 0 -> 148090 bytes
web_src/src/core/jessibuca/favicon.ico | Bin 0 -> 4418 bytes
.../{static/js => src/core}/jessibuca/ff.js | 0
web_src/src/core/jessibuca/ff.wasm | Bin 0 -> 1216411 bytes
web_src/src/core/jessibuca/index.js | 3 +
web_src/src/core/jessibuca/logo.png | Bin 0 -> 10620 bytes
web_src/src/core/jessibuca/renderer.js | 1711 +++
web_src/src/core/jessibuca/tech.png | Bin 0 -> 106426 bytes
web_src/src/core/lazy_use.js | 119 +
web_src/src/core/loadMap.js | 9 +
web_src/src/core/use.js | 21 +
web_src/src/global.less | 94 +
web_src/src/layouts/BasicLayout.less | 36 +
web_src/src/layouts/BasicLayout.vue | 221 +
web_src/src/layouts/BlankLayout.vue | 16 +
web_src/src/layouts/PageView.vue | 12 +
web_src/src/layouts/RouteView.vue | 32 +
web_src/src/layouts/UserLayout.vue | 178 +
web_src/src/layouts/index.js | 7 +
web_src/src/locales/index.js | 59 +
web_src/src/locales/lang/en-US.js | 35 +
web_src/src/locales/lang/en-US/account.js | 5 +
.../locales/lang/en-US/account/settings.js | 62 +
web_src/src/locales/lang/en-US/dashboard.js | 5 +
.../locales/lang/en-US/dashboard/analysis.js | 36 +
web_src/src/locales/lang/en-US/form.js | 5 +
.../src/locales/lang/en-US/form/basicForm.js | 61 +
web_src/src/locales/lang/en-US/global.js | 6 +
web_src/src/locales/lang/en-US/menu.js | 21 +
web_src/src/locales/lang/en-US/result.js | 7 +
web_src/src/locales/lang/en-US/result/fail.js | 11 +
.../src/locales/lang/en-US/result/success.js | 19 +
web_src/src/locales/lang/en-US/setting.js | 29 +
web_src/src/locales/lang/en-US/user.js | 45 +
web_src/src/locales/lang/zh-CN.js | 34 +
web_src/src/locales/lang/zh-CN/account.js | 5 +
.../locales/lang/zh-CN/account/settings.js | 57 +
web_src/src/locales/lang/zh-CN/dashboard.js | 5 +
.../locales/lang/zh-CN/dashboard/analysis.js | 36 +
web_src/src/locales/lang/zh-CN/form.js | 5 +
.../src/locales/lang/zh-CN/form/basicForm.js | 58 +
web_src/src/locales/lang/zh-CN/global.js | 6 +
web_src/src/locales/lang/zh-CN/menu.js | 21 +
web_src/src/locales/lang/zh-CN/result.js | 7 +
web_src/src/locales/lang/zh-CN/result/fail.js | 10 +
.../src/locales/lang/zh-CN/result/success.js | 19 +
web_src/src/locales/lang/zh-CN/setting.js | 29 +
web_src/src/locales/lang/zh-CN/user.js | 43 +
web_src/src/main.js | 89 +-
web_src/src/permission.js | 44 +
web_src/src/router/generator-routers.js | 153 +
web_src/src/router/index.js | 113 +-
web_src/src/store/app-mixin.js | 32 +
web_src/src/store/device-mixin.js | 11 +
web_src/src/store/getters.js | 10 +
web_src/src/store/i18n-mixin.js | 16 +
web_src/src/store/index.js | 24 +
web_src/src/store/modules/app.js | 99 +
web_src/src/store/modules/async-router.js | 31 +
web_src/src/store/modules/permission.js | 26 +
web_src/src/store/mutation-types.js | 22 +
.../{components => utils}/GeoConvertTools.js | 0
web_src/src/utils/axios.js | 35 +
web_src/src/utils/domUtil.js | 21 +
web_src/src/utils/filter.js | 20 +
web_src/src/utils/fontAwesomeIcon.js | 64 +
web_src/src/utils/request.js | 56 +
web_src/src/utils/routeConvert.js | 30 +
web_src/src/utils/screenLog.js | 18 +
web_src/src/utils/util.js | 95 +
web_src/src/utils/utils.less | 50 +
web_src/src/views/dashboard/MediaInfo.vue | 35 +
web_src/src/views/dashboard/Monitor.vue | 340 +
web_src/src/views/dashboard/MonitorIndex.vue | 47 +
web_src/src/views/dashboard/SIPInfo.vue | 55 +
.../src/views/device/DeviceChannelList.vue | 294 +
web_src/src/views/device/DeviceEdit.vue | 76 +
web_src/src/views/device/DeviceIndex.vue | 56 +
web_src/src/views/device/DeviceList.vue | 297 +
web_src/src/views/device/DevicePosition.vue | 199 +
web_src/src/views/device/GBRecords.vue | 152 +
web_src/src/views/device/RecordPlayer.vue | 180 +
web_src/src/views/exception/403.vue | 20 +
web_src/src/views/exception/404.vue | 20 +
web_src/src/views/exception/500.vue | 20 +
web_src/src/views/gbPlatform/ChannelForGb.vue | 218 +
.../src/views/gbPlatform/ChannelForStream.vue | 188 +
.../src/views/gbPlatform/GbPlatformEdit.vue | 253 +
.../src/views/gbPlatform/GbPlatformIndex.vue | 50 +
.../src/views/gbPlatform/GbPlatformList.vue | 172 +
.../views/mediaServer/MediaServerDetail.vue | 59 +
.../src/views/mediaServer/MediaServerEdit.vue | 239 +
.../views/mediaServer/MediaServerIndex.vue | 50 +
.../src/views/mediaServer/MediaServerList.vue | 100 +
.../stepForm/MediaServerStepForm.vue | 129 +
.../mediaServer/stepForm/StepBaseForm.vue | 129 +
.../mediaServer/stepForm/StepDetailForm.vue | 208 +
.../mediaServer/stepForm/StepSubmitForm.vue | 86 +
web_src/src/views/records/NVRRecordDetail.vue | 166 +
web_src/src/views/records/NVRRecordIndex.vue | 44 +
web_src/src/views/records/NVRRecords.vue | 133 +
web_src/src/views/records/RecordDetail.vue | 169 +
web_src/src/views/records/RecordIndex.vue | 44 +
web_src/src/views/records/RecordList.vue | 204 +
.../src/views/streamProxy/PlayerDialog.vue | 50 +
.../src/views/streamProxy/StreamProxyEdit.vue | 206 +
.../src/views/streamProxy/StreamProxyList.vue | 294 +
web_src/src/views/videoSquare/squareIndex.vue | 182 +
.../src/views/videoSquare/squareMatrixOne.vue | 109 +
.../views/videoSquare/squareMatrixThree.vue | 150 +
.../src/views/videoSquare/squareMatrixTwo.vue | 139 +
web_src/src/views/warning/WarningList.vue | 246 +
web_src/static/.gitkeep | 0
web_src/static/EasyPlayer.swf | Bin 75255 -> 0 bytes
web_src/static/css/iconfont.css | 1659 ---
web_src/static/css/iconfont.woff2 | Bin 46768 -> 0 bytes
web_src/static/css/login.css | 420 -
web_src/static/fonts/poppins/Poppins-Bold.ttf | Bin 141260 -> 0 bytes
.../static/fonts/poppins/Poppins-Medium.ttf | Bin 143516 -> 0 bytes
.../static/fonts/poppins/Poppins-Regular.ttf | Bin 145312 -> 0 bytes
.../static/fonts/poppins/Poppins-SemiBold.ttf | Bin 142148 -> 0 bytes
web_src/static/js/ZLMRTCClient.js | 7546 ----------
web_src/static/js/jessibuca/ff.worker.js | 1 -
web_src/static/js/jessibuca/index.js | 3 -
web_src/static/logo.png | Bin 67082 -> 0 bytes
web_src/vue.config.js | 144 +
web_src/webstorm.config.js | 3 +
web_src/yarn.lock | 10565 ++++++++++++++
372 files changed, 29395 insertions(+), 33170 deletions(-)
create mode 100644 src/main/java/com/genersoft/iot/vmp/common/MyPageInfo.java
create mode 100644 src/main/java/com/genersoft/iot/vmp/common/Page.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/common/VersionPo.java
create mode 100644 src/main/java/com/genersoft/iot/vmp/common/reponse/ErrorResponseData.java
create mode 100644 src/main/java/com/genersoft/iot/vmp/common/reponse/ResponseData.java
create mode 100644 src/main/java/com/genersoft/iot/vmp/common/reponse/SuccessResponseData.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/conf/VManagerConfig.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/conf/VersionConfig.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/conf/VersionInfo.java
create mode 100644 src/main/java/com/genersoft/iot/vmp/conf/WebConfig.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/conf/security/DefaultUserDetailsServiceImpl.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/conf/security/InvalidSessionHandler.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/conf/security/LoginFailureHandler.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/conf/security/LoginSuccessHandler.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/conf/security/LogoutHandler.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/conf/security/SecurityUtils.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/conf/security/dto/LoginUser.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/service/IUserService.java
create mode 100644 src/main/java/com/genersoft/iot/vmp/service/IVideoSquareService.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java
create mode 100644 src/main/java/com/genersoft/iot/vmp/service/impl/VideoSquareServiceImpl.java
create mode 100644 src/main/java/com/genersoft/iot/vmp/storager/dao/VideoSquareMapper.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/utils/GitUtil.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/utils/JarFileUtils.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/vmanager/user/RoleController.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
create mode 100644 src/main/java/com/genersoft/iot/vmp/vmanager/videoSquare/VideoSquareController.java
delete mode 100644 src/main/java/com/genersoft/iot/vmp/web/AuthController.java
delete mode 100644 src/test/java/com/genersoft/iot/vmp/service/impl/RoleServiceImplTest.java
delete mode 100644 src/test/java/com/genersoft/iot/vmp/service/impl/UserServiceImplTest.java
delete mode 100644 web_src/.babelrc
create mode 100644 web_src/.browserslistrc
create mode 100644 web_src/.env
create mode 100644 web_src/.env.development
create mode 100644 web_src/.env.preview
create mode 100644 web_src/.gitattributes
delete mode 100644 web_src/.postcssrc.js
create mode 100644 web_src/.prettierrc
create mode 100644 web_src/.travis.yml
create mode 100644 web_src/Dockerfile
create mode 100644 web_src/LICENSE
create mode 100644 web_src/babel.config.js
delete mode 100644 web_src/build/build.js
delete mode 100644 web_src/build/check-versions.js
delete mode 100644 web_src/build/logo.png
delete mode 100644 web_src/build/utils.js
delete mode 100644 web_src/build/vue-loader.conf.js
delete mode 100644 web_src/build/webpack.base.conf.js
delete mode 100755 web_src/build/webpack.dev.conf.js
delete mode 100644 web_src/build/webpack.prod.conf.js
delete mode 100644 web_src/config/dev.env.js
delete mode 100644 web_src/config/index.js
create mode 100644 web_src/config/plugin.config.js
delete mode 100644 web_src/config/prod.env.js
create mode 100644 web_src/config/themePluginConfig.js
create mode 100644 web_src/deploy/caddy.conf
create mode 100644 web_src/deploy/nginx.conf
delete mode 100644 web_src/index.html
create mode 100644 web_src/jest.config.js
create mode 100644 web_src/jsconfig.json
delete mode 100644 web_src/package-lock.json
create mode 100644 web_src/postcss.config.js
create mode 100644 web_src/public/avatar2.jpg
create mode 100644 web_src/public/index.html
create mode 100644 web_src/public/jessibuca/bg.jpg
create mode 100644 web_src/public/jessibuca/favicon.ico
create mode 100644 web_src/public/jessibuca/ff.js
rename web_src/{static/js => public}/jessibuca/ff.wasm (100%)
mode change 100755 => 100644
create mode 100644 web_src/public/jessibuca/ff_wasm.js
create mode 100644 web_src/public/jessibuca/ff_wasm.wasm
create mode 100644 web_src/public/jessibuca/index.js
create mode 100644 web_src/public/jessibuca/libhevc_aac.js
create mode 100644 web_src/public/jessibuca/libhevc_aac_wasm.js
create mode 100644 web_src/public/jessibuca/libhevc_aac_wasm.wasm
rename web_src/{static/js => public}/jessibuca/logo.png (100%)
create mode 100644 web_src/public/jessibuca/tech.png
rename web_src/{static => public}/libDecoder.wasm (100%)
create mode 100644 web_src/public/logo.png
create mode 100644 web_src/src/api/controller.js
create mode 100644 web_src/src/api/deviceList.js
create mode 100644 web_src/src/api/gbPlatform.js
create mode 100644 web_src/src/api/login.js
create mode 100644 web_src/src/api/manage.js
create mode 100644 web_src/src/api/mediaServer.js
create mode 100644 web_src/src/api/recordList.js
create mode 100644 web_src/src/api/streamProxy.js
create mode 100644 web_src/src/api/videoSquare.js
create mode 100644 web_src/src/api/warning.js
create mode 100644 web_src/src/assets/background.svg
delete mode 100644 web_src/src/assets/icons.png
create mode 100644 web_src/src/assets/icons/bx-analyse.svg
delete mode 100644 web_src/src/assets/loading.png
delete mode 100644 web_src/src/assets/login-bg.jpg
delete mode 100644 web_src/src/assets/login-cloud.png
delete mode 100644 web_src/src/assets/logo.png
create mode 100644 web_src/src/assets/logo.svg
delete mode 100644 web_src/src/assets/play.png
delete mode 100644 web_src/src/assets/zlm-log.png
rename web_src/{static/images => src/assets}/zlm-logo.png (100%)
create mode 100644 web_src/src/components/ArticleListContent/ArticleListContent.vue
create mode 100644 web_src/src/components/ArticleListContent/index.js
create mode 100644 web_src/src/components/AvatarList/Item.jsx
create mode 100644 web_src/src/components/AvatarList/List.jsx
create mode 100644 web_src/src/components/AvatarList/index.js
create mode 100644 web_src/src/components/AvatarList/index.less
create mode 100644 web_src/src/components/AvatarList/index.md
delete mode 100644 web_src/src/components/CloudRecord.vue
delete mode 100644 web_src/src/components/CloudRecordDetail.vue
delete mode 100644 web_src/src/components/DeviceList.vue
create mode 100644 web_src/src/components/Dialog.js
create mode 100644 web_src/src/components/Editor/QuillEditor.vue
create mode 100644 web_src/src/components/Editor/WangEditor.vue
create mode 100644 web_src/src/components/Ellipsis/Ellipsis.vue
create mode 100644 web_src/src/components/Ellipsis/index.js
create mode 100644 web_src/src/components/Ellipsis/index.md
create mode 100644 web_src/src/components/FooterToolbar/FooterToolBar.vue
create mode 100644 web_src/src/components/FooterToolbar/index.js
create mode 100644 web_src/src/components/FooterToolbar/index.less
create mode 100644 web_src/src/components/FooterToolbar/index.md
create mode 100644 web_src/src/components/GlobalFooter/index.vue
create mode 100644 web_src/src/components/GlobalHeader/RightContent.vue
create mode 100644 web_src/src/components/IconSelector/IconSelector.vue
create mode 100644 web_src/src/components/IconSelector/README.md
create mode 100644 web_src/src/components/IconSelector/icons.js
create mode 100644 web_src/src/components/IconSelector/index.js
delete mode 100644 web_src/src/components/Login.vue
delete mode 100644 web_src/src/components/MediaServerManger.vue
create mode 100644 web_src/src/components/MultiTab/MultiTab.vue
create mode 100644 web_src/src/components/MultiTab/events.js
create mode 100644 web_src/src/components/MultiTab/index.js
create mode 100644 web_src/src/components/MultiTab/index.less
create mode 100644 web_src/src/components/NProgress/nprogress.less
create mode 100644 web_src/src/components/NoticeIcon/NoticeIcon.vue
create mode 100644 web_src/src/components/NoticeIcon/index.js
create mode 100644 web_src/src/components/NumberInfo/NumberInfo.vue
create mode 100644 web_src/src/components/NumberInfo/index.js
create mode 100644 web_src/src/components/NumberInfo/index.less
create mode 100644 web_src/src/components/NumberInfo/index.md
create mode 100644 web_src/src/components/Other/CarbonAds.vue
create mode 100644 web_src/src/components/PageLoading/index.jsx
delete mode 100644 web_src/src/components/ParentPlatformList.vue
delete mode 100644 web_src/src/components/PushVideoList.vue
create mode 100644 web_src/src/components/Search/GlobalSearch.jsx
create mode 100644 web_src/src/components/Search/index.less
create mode 100644 web_src/src/components/SelectLang/index.jsx
create mode 100644 web_src/src/components/SelectLang/index.less
create mode 100644 web_src/src/components/SettingDrawer/SettingDrawer.vue
create mode 100644 web_src/src/components/SettingDrawer/SettingItem.vue
create mode 100644 web_src/src/components/SettingDrawer/index.js
create mode 100644 web_src/src/components/SettingDrawer/settingConfig.js
create mode 100644 web_src/src/components/SettingDrawer/themeColor.js
create mode 100644 web_src/src/components/StandardFormRow/StandardFormRow.vue
create mode 100644 web_src/src/components/StandardFormRow/index.js
delete mode 100644 web_src/src/components/StreamProxyList.vue
create mode 100644 web_src/src/components/Table/README.md
create mode 100644 web_src/src/components/Table/index.js
create mode 100644 web_src/src/components/TagSelect/TagSelectOption.jsx
create mode 100644 web_src/src/components/TagSelect/index.jsx
create mode 100644 web_src/src/components/TextArea/index.jsx
create mode 100644 web_src/src/components/TextArea/style.less
create mode 100644 web_src/src/components/Tree/Tree.jsx
create mode 100644 web_src/src/components/Trend/Trend.vue
create mode 100644 web_src/src/components/Trend/index.js
create mode 100644 web_src/src/components/Trend/index.less
create mode 100644 web_src/src/components/Trend/index.md
delete mode 100644 web_src/src/components/UiHeader.vue
create mode 100644 web_src/src/components/VideoPlayer/dialogPlayer.vue
rename web_src/src/components/{dialog => VideoPlayer}/easyPlayer.vue (77%)
create mode 100644 web_src/src/components/VideoPlayer/jessibuca.vue
create mode 100644 web_src/src/components/_util/util.js
delete mode 100644 web_src/src/components/channelList.vue
delete mode 100644 web_src/src/components/control.vue
delete mode 100644 web_src/src/components/devicePosition.vue
delete mode 100644 web_src/src/components/dialog/MediaServerEdit.vue
delete mode 100644 web_src/src/components/dialog/StreamProxyEdit.vue
delete mode 100644 web_src/src/components/dialog/addStreamTOGB.vue
delete mode 100644 web_src/src/components/dialog/changePassword.vue
delete mode 100644 web_src/src/components/dialog/chooseChannel.vue
delete mode 100644 web_src/src/components/dialog/chooseChannelForGb.vue
delete mode 100644 web_src/src/components/dialog/chooseChannelForStream.vue
delete mode 100644 web_src/src/components/dialog/deviceEdit.vue
delete mode 100644 web_src/src/components/dialog/devicePlayer.vue
delete mode 100644 web_src/src/components/dialog/jessibuca.vue
delete mode 100644 web_src/src/components/dialog/onvifEdit.vue
delete mode 100644 web_src/src/components/dialog/platformEdit.vue
delete mode 100644 web_src/src/components/dialog/rtcPlayer.vue
create mode 100644 web_src/src/components/index.js
create mode 100644 web_src/src/components/index.less
delete mode 100644 web_src/src/components/service/MediaServer.js
delete mode 100644 web_src/src/components/setting/Media.vue
delete mode 100644 web_src/src/components/setting/Sip.vue
delete mode 100644 web_src/src/components/setting/Web.vue
delete mode 100644 web_src/src/components/test.vue
delete mode 100644 web_src/src/components/test2.vue
create mode 100644 web_src/src/components/tools/TwoStepCaptcha.vue
create mode 100644 web_src/src/config/defaultSettings.js
create mode 100644 web_src/src/config/router.config.js
rename web_src/{static/js => src/core}/EasyWasmPlayer.js (100%)
create mode 100644 web_src/src/core/bootstrap.js
create mode 100644 web_src/src/core/icons.js
create mode 100644 web_src/src/core/jessibuca/bg.jpg
create mode 100644 web_src/src/core/jessibuca/favicon.ico
rename web_src/{static/js => src/core}/jessibuca/ff.js (100%)
create mode 100644 web_src/src/core/jessibuca/ff.wasm
create mode 100644 web_src/src/core/jessibuca/index.js
create mode 100644 web_src/src/core/jessibuca/logo.png
create mode 100644 web_src/src/core/jessibuca/renderer.js
create mode 100644 web_src/src/core/jessibuca/tech.png
create mode 100644 web_src/src/core/lazy_use.js
create mode 100644 web_src/src/core/loadMap.js
create mode 100644 web_src/src/core/use.js
create mode 100644 web_src/src/global.less
create mode 100644 web_src/src/layouts/BasicLayout.less
create mode 100644 web_src/src/layouts/BasicLayout.vue
create mode 100644 web_src/src/layouts/BlankLayout.vue
create mode 100644 web_src/src/layouts/PageView.vue
create mode 100644 web_src/src/layouts/RouteView.vue
create mode 100644 web_src/src/layouts/UserLayout.vue
create mode 100644 web_src/src/layouts/index.js
create mode 100644 web_src/src/locales/index.js
create mode 100644 web_src/src/locales/lang/en-US.js
create mode 100644 web_src/src/locales/lang/en-US/account.js
create mode 100644 web_src/src/locales/lang/en-US/account/settings.js
create mode 100644 web_src/src/locales/lang/en-US/dashboard.js
create mode 100644 web_src/src/locales/lang/en-US/dashboard/analysis.js
create mode 100644 web_src/src/locales/lang/en-US/form.js
create mode 100644 web_src/src/locales/lang/en-US/form/basicForm.js
create mode 100644 web_src/src/locales/lang/en-US/global.js
create mode 100644 web_src/src/locales/lang/en-US/menu.js
create mode 100644 web_src/src/locales/lang/en-US/result.js
create mode 100644 web_src/src/locales/lang/en-US/result/fail.js
create mode 100644 web_src/src/locales/lang/en-US/result/success.js
create mode 100644 web_src/src/locales/lang/en-US/setting.js
create mode 100644 web_src/src/locales/lang/en-US/user.js
create mode 100644 web_src/src/locales/lang/zh-CN.js
create mode 100644 web_src/src/locales/lang/zh-CN/account.js
create mode 100644 web_src/src/locales/lang/zh-CN/account/settings.js
create mode 100644 web_src/src/locales/lang/zh-CN/dashboard.js
create mode 100644 web_src/src/locales/lang/zh-CN/dashboard/analysis.js
create mode 100644 web_src/src/locales/lang/zh-CN/form.js
create mode 100644 web_src/src/locales/lang/zh-CN/form/basicForm.js
create mode 100644 web_src/src/locales/lang/zh-CN/global.js
create mode 100644 web_src/src/locales/lang/zh-CN/menu.js
create mode 100644 web_src/src/locales/lang/zh-CN/result.js
create mode 100644 web_src/src/locales/lang/zh-CN/result/fail.js
create mode 100644 web_src/src/locales/lang/zh-CN/result/success.js
create mode 100644 web_src/src/locales/lang/zh-CN/setting.js
create mode 100644 web_src/src/locales/lang/zh-CN/user.js
create mode 100644 web_src/src/permission.js
create mode 100644 web_src/src/router/generator-routers.js
create mode 100644 web_src/src/store/app-mixin.js
create mode 100644 web_src/src/store/device-mixin.js
create mode 100644 web_src/src/store/getters.js
create mode 100644 web_src/src/store/i18n-mixin.js
create mode 100644 web_src/src/store/index.js
create mode 100644 web_src/src/store/modules/app.js
create mode 100644 web_src/src/store/modules/async-router.js
create mode 100644 web_src/src/store/modules/permission.js
create mode 100644 web_src/src/store/mutation-types.js
rename web_src/src/{components => utils}/GeoConvertTools.js (100%)
create mode 100644 web_src/src/utils/axios.js
create mode 100644 web_src/src/utils/domUtil.js
create mode 100644 web_src/src/utils/filter.js
create mode 100644 web_src/src/utils/fontAwesomeIcon.js
create mode 100644 web_src/src/utils/request.js
create mode 100644 web_src/src/utils/routeConvert.js
create mode 100644 web_src/src/utils/screenLog.js
create mode 100644 web_src/src/utils/util.js
create mode 100644 web_src/src/utils/utils.less
create mode 100644 web_src/src/views/dashboard/MediaInfo.vue
create mode 100644 web_src/src/views/dashboard/Monitor.vue
create mode 100644 web_src/src/views/dashboard/MonitorIndex.vue
create mode 100644 web_src/src/views/dashboard/SIPInfo.vue
create mode 100644 web_src/src/views/device/DeviceChannelList.vue
create mode 100644 web_src/src/views/device/DeviceEdit.vue
create mode 100644 web_src/src/views/device/DeviceIndex.vue
create mode 100644 web_src/src/views/device/DeviceList.vue
create mode 100644 web_src/src/views/device/DevicePosition.vue
create mode 100644 web_src/src/views/device/GBRecords.vue
create mode 100644 web_src/src/views/device/RecordPlayer.vue
create mode 100644 web_src/src/views/exception/403.vue
create mode 100644 web_src/src/views/exception/404.vue
create mode 100644 web_src/src/views/exception/500.vue
create mode 100644 web_src/src/views/gbPlatform/ChannelForGb.vue
create mode 100644 web_src/src/views/gbPlatform/ChannelForStream.vue
create mode 100644 web_src/src/views/gbPlatform/GbPlatformEdit.vue
create mode 100644 web_src/src/views/gbPlatform/GbPlatformIndex.vue
create mode 100644 web_src/src/views/gbPlatform/GbPlatformList.vue
create mode 100644 web_src/src/views/mediaServer/MediaServerDetail.vue
create mode 100644 web_src/src/views/mediaServer/MediaServerEdit.vue
create mode 100644 web_src/src/views/mediaServer/MediaServerIndex.vue
create mode 100644 web_src/src/views/mediaServer/MediaServerList.vue
create mode 100644 web_src/src/views/mediaServer/stepForm/MediaServerStepForm.vue
create mode 100644 web_src/src/views/mediaServer/stepForm/StepBaseForm.vue
create mode 100644 web_src/src/views/mediaServer/stepForm/StepDetailForm.vue
create mode 100644 web_src/src/views/mediaServer/stepForm/StepSubmitForm.vue
create mode 100644 web_src/src/views/records/NVRRecordDetail.vue
create mode 100644 web_src/src/views/records/NVRRecordIndex.vue
create mode 100644 web_src/src/views/records/NVRRecords.vue
create mode 100644 web_src/src/views/records/RecordDetail.vue
create mode 100644 web_src/src/views/records/RecordIndex.vue
create mode 100644 web_src/src/views/records/RecordList.vue
create mode 100644 web_src/src/views/streamProxy/PlayerDialog.vue
create mode 100644 web_src/src/views/streamProxy/StreamProxyEdit.vue
create mode 100644 web_src/src/views/streamProxy/StreamProxyList.vue
create mode 100644 web_src/src/views/videoSquare/squareIndex.vue
create mode 100644 web_src/src/views/videoSquare/squareMatrixOne.vue
create mode 100644 web_src/src/views/videoSquare/squareMatrixThree.vue
create mode 100644 web_src/src/views/videoSquare/squareMatrixTwo.vue
create mode 100644 web_src/src/views/warning/WarningList.vue
delete mode 100644 web_src/static/.gitkeep
delete mode 100755 web_src/static/EasyPlayer.swf
delete mode 100644 web_src/static/css/iconfont.css
delete mode 100644 web_src/static/css/iconfont.woff2
delete mode 100755 web_src/static/css/login.css
delete mode 100755 web_src/static/fonts/poppins/Poppins-Bold.ttf
delete mode 100755 web_src/static/fonts/poppins/Poppins-Medium.ttf
delete mode 100755 web_src/static/fonts/poppins/Poppins-Regular.ttf
delete mode 100755 web_src/static/fonts/poppins/Poppins-SemiBold.ttf
delete mode 100644 web_src/static/js/ZLMRTCClient.js
delete mode 100644 web_src/static/js/jessibuca/ff.worker.js
delete mode 100644 web_src/static/js/jessibuca/index.js
delete mode 100644 web_src/static/logo.png
create mode 100644 web_src/vue.config.js
create mode 100644 web_src/webstorm.config.js
create mode 100644 web_src/yarn.lock
diff --git a/pom.xml b/pom.xml
index 5cd5f048..6a12a5fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,10 +77,6 @@
mybatis-spring-boot-starter
2.1.4
-
- org.springframework.boot
- spring-boot-starter-security
-
redis.clients
diff --git a/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java b/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
index 56038bd5..7fe62ecc 100644
--- a/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
+++ b/src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
@@ -1,7 +1,5 @@
package com.genersoft.iot.vmp;
-import java.util.logging.LogManager;
-
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.ServletComponentScan;
@@ -9,9 +7,8 @@ import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.scheduling.annotation.EnableScheduling;
import springfox.documentation.oas.annotations.EnableOpenApi;
-/**
- *
- */
+import java.util.logging.LogManager;
+
@ServletComponentScan("com.genersoft.iot.vmp.conf")
@SpringBootApplication
@EnableScheduling
diff --git a/src/main/java/com/genersoft/iot/vmp/common/MyPageInfo.java b/src/main/java/com/genersoft/iot/vmp/common/MyPageInfo.java
new file mode 100644
index 00000000..54fb71b5
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/common/MyPageInfo.java
@@ -0,0 +1,95 @@
+package com.genersoft.iot.vmp.common;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MyPageInfo {
+ //当前页
+ private int pageNo;
+ //每页的数量
+ private int pageSize;
+ //当前页的数量
+ private int size;
+ //总页数
+ private int pages;
+ //总数
+ private int total;
+
+ private List resultData;
+
+ private List list;
+
+ public MyPageInfo(List resultData) {
+ this.resultData = resultData;
+ }
+
+ public void startPage(int page, int count) {
+ if (page <= 0) page = 1;
+ this.pageNo = page;
+ this.pageSize = count;
+ this.total = resultData.size();
+
+ this.pages = total%count == 0 ? total/count : total/count + 1;
+ int fromIndx = (page - 1) * count;
+ if ( fromIndx > this.total - 1) {
+ this.list = new ArrayList<>();
+ this.size = 0;
+ return;
+ }
+
+ int toIndx = page * count;
+ if (toIndx > this.total) {
+ toIndx = this.total;
+ }
+ this.list = this.resultData.subList(fromIndx, toIndx);
+ this.size = this.list.size();
+ }
+
+ public int getPageNo() {
+ return pageNo;
+ }
+
+ public void setPageNo(int pageNo) {
+ this.pageNo = pageNo;
+ }
+
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(int pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public int getSize() {
+ return size;
+ }
+
+ public void setSize(int size) {
+ this.size = size;
+ }
+
+ public int getPages() {
+ return pages;
+ }
+
+ public void setPages(int pages) {
+ this.pages = pages;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public List getList() {
+ return list;
+ }
+
+ public void setList(List list) {
+ this.list = list;
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/common/Page.java b/src/main/java/com/genersoft/iot/vmp/common/Page.java
new file mode 100644
index 00000000..c43bfcee
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/common/Page.java
@@ -0,0 +1,95 @@
+package com.genersoft.iot.vmp.common;
+
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+public class Page {
+
+ private Integer pageSize;
+
+ private Integer pageNo;
+
+ private Integer totalPage;
+
+ private Long totalCount;
+
+ private List data;
+
+ public Page() {
+ }
+
+ public Page(Integer pageSize, Integer pageNo, Integer totalPage, Long totalCount, List data) {
+ this.pageSize = pageSize;
+ this.pageNo = pageNo;
+ this.totalPage = totalPage;
+ this.totalCount = totalCount;
+ this.data = data;
+ }
+
+ public Page(PageInfo pageInfo) {
+ Integer pageNo = pageInfo.getPageNum();
+ Integer pageSize = pageInfo.getPageSize();
+ Integer totalPage = pageInfo.getPages();
+ Long totalCount = pageInfo.getTotal();
+ List data = pageInfo.getList();
+ setPageNo(pageNo);
+ setPageSize(pageSize);
+ setTotalPage(totalPage);
+ setTotalCount(totalCount);
+ setData(data);
+ }
+
+ public Page(MyPageInfo myPageInfo){
+ Integer pageNo = myPageInfo.getPageNo();
+ Integer pageSize = myPageInfo.getPageSize();
+ Integer totalPage = myPageInfo.getPages();
+ int totalCount = myPageInfo.getTotal();
+ List data = myPageInfo.getList();
+ setPageNo(pageNo);
+ setPageSize(pageSize);
+ setTotalPage(totalPage);
+ setTotalCount((long) totalCount);
+ setData(data);
+ }
+
+ public Integer getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(Integer pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public Integer getPageNo() {
+ return pageNo;
+ }
+
+ public void setPageNo(Integer pageNo) {
+ this.pageNo = pageNo;
+ }
+
+ public Integer getTotalPage() {
+ return totalPage;
+ }
+
+ public void setTotalPage(Integer totalPage) {
+ this.totalPage = totalPage;
+ }
+
+ public Long getTotalCount() {
+ return totalCount;
+ }
+
+ public void setTotalCount(Long totalCount) {
+ this.totalCount = totalCount;
+ }
+
+ public List getData() {
+ return data;
+ }
+
+ public void setData(List data) {
+ this.data = data;
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/common/VersionPo.java b/src/main/java/com/genersoft/iot/vmp/common/VersionPo.java
deleted file mode 100644
index a7d8ce67..00000000
--- a/src/main/java/com/genersoft/iot/vmp/common/VersionPo.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.genersoft.iot.vmp.common;
-
-import com.alibaba.fastjson.annotation.JSONField;
-
-public class VersionPo {
- /**
- * git的全版本号
- */
- @JSONField(name="GIT-Revision")
- private String GIT_Revision;
- /**
- * maven版本
- */
- @JSONField(name = "Create-By")
- private String Create_By;
- /**
- * git的分支
- */
- @JSONField(name = "GIT-BRANCH")
- private String GIT_BRANCH;
- /**
- * git的url
- */
- @JSONField(name = "GIT-URL")
- private String GIT_URL;
- /**
- * 构建日期
- */
- @JSONField(name = "BUILD-DATE")
- private String BUILD_DATE;
- /**
- * 项目名称 配合pom使用
- */
- @JSONField(name = "artifactId")
- private String artifactId;
- /**
- * git局部版本号
- */
- @JSONField(name = "GIT-Revision-SHORT")
- private String GIT_Revision_SHORT;
- /**
- * 项目的版本如2.0.1.0 配合pom使用
- */
- @JSONField(name = "version")
- private String version;
- /**
- * 子系统名称
- */
- @JSONField(name = "project")
- private String project;
- /**
- * jdk版本
- */
- @JSONField(name="Build_Jdk")
- private String Build_Jdk;
-
- public void setGIT_Revision(String GIT_Revision) {
- this.GIT_Revision = GIT_Revision;
- }
-
- public void setCreate_By(String create_By) {
- Create_By = create_By;
- }
-
- public void setGIT_BRANCH(String GIT_BRANCH) {
- this.GIT_BRANCH = GIT_BRANCH;
- }
-
- public void setGIT_URL(String GIT_URL) {
- this.GIT_URL = GIT_URL;
- }
-
- public void setBUILD_DATE(String BUILD_DATE) {
- this.BUILD_DATE = BUILD_DATE;
- }
-
- public void setArtifactId(String artifactId) {
- this.artifactId = artifactId;
- }
-
- public void setGIT_Revision_SHORT(String GIT_Revision_SHORT) {
- this.GIT_Revision_SHORT = GIT_Revision_SHORT;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- public void setBuild_Jdk(String build_Jdk) {
- Build_Jdk = build_Jdk;
- }
-
- public String getGIT_Revision() {
- return GIT_Revision;
- }
-
- public String getCreate_By() {
- return Create_By;
- }
-
- public String getGIT_BRANCH() {
- return GIT_BRANCH;
- }
-
- public String getGIT_URL() {
- return GIT_URL;
- }
-
- public String getBUILD_DATE() {
- return BUILD_DATE;
- }
-
- public String getArtifactId() {
- return artifactId;
- }
-
- public String getGIT_Revision_SHORT() {
- return GIT_Revision_SHORT;
- }
-
- public String getVersion() {
- return version;
- }
-
- public String getProject() {
- return project;
- }
-
- public String getBuild_Jdk() {
- return Build_Jdk;
- }
-}
diff --git a/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java b/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
index 5fd9c772..89d87125 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
@@ -1,10 +1,7 @@
package com.genersoft.iot.vmp.common;
/**
- * @description: 定义常量
- * @author: swwheihei
- * @date: 2019年5月30日 下午3:04:04
- *
+ * 定义常量
*/
public class VideoManagerConstants {
diff --git a/src/main/java/com/genersoft/iot/vmp/common/reponse/ErrorResponseData.java b/src/main/java/com/genersoft/iot/vmp/common/reponse/ErrorResponseData.java
new file mode 100644
index 00000000..c99f91e9
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/common/reponse/ErrorResponseData.java
@@ -0,0 +1,28 @@
+package com.genersoft.iot.vmp.common.reponse;
+
+public class ErrorResponseData extends ResponseData{
+ /**
+ * 异常的具体类名称
+ */
+ private String exceptionClazz;
+
+ public String getExceptionClazz() {
+ return exceptionClazz;
+ }
+
+ public void setExceptionClazz(String exceptionClazz) {
+ this.exceptionClazz = exceptionClazz;
+ }
+
+ ErrorResponseData(String message) {
+ super(false, DEFAULT_ERROR_CODE, message, null);
+ }
+
+ public ErrorResponseData(Integer code, String message) {
+ super(false, code, message, null);
+ }
+
+ ErrorResponseData(Integer code, String message, Object object) {
+ super(false, code, message, object);
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/common/reponse/ResponseData.java b/src/main/java/com/genersoft/iot/vmp/common/reponse/ResponseData.java
new file mode 100644
index 00000000..fe3d6034
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/common/reponse/ResponseData.java
@@ -0,0 +1,98 @@
+package com.genersoft.iot.vmp.common.reponse;
+
+public class ResponseData {
+
+ public static final String DEFAULT_SUCCESS_MESSAGE = "请求成功";
+
+ public static final String DEFAULT_ERROR_MESSAGE = "网络异常";
+
+ public static final Integer DEFAULT_SUCCESS_CODE = 200;
+
+ public static final Integer DEFAULT_ERROR_CODE = 500;
+
+ /**
+ * 请求是否成功
+ */
+ private Boolean success;
+
+ /**
+ * 响应状态码
+ */
+ private Integer code;
+
+ /**
+ * 响应信息
+ */
+ private String message;
+
+ /**
+ * 响应对象
+ */
+ private Object data;
+
+ public ResponseData() {
+ }
+
+ public ResponseData(Boolean success, Integer code, String message, Object data) {
+ this.success = success;
+ this.code = code;
+ this.message = message;
+ this.data = data;
+ }
+
+ public static SuccessResponseData success() {
+ return new SuccessResponseData();
+ }
+
+ public static SuccessResponseData success(Object object) {
+ return new SuccessResponseData(object);
+ }
+
+ public static SuccessResponseData success(Integer code, String message, Object object) {
+ return new SuccessResponseData(code, message, object);
+ }
+
+ public static ErrorResponseData error(String message) {
+ return new ErrorResponseData(message);
+ }
+
+ public static ErrorResponseData error(Integer code, String message) {
+ return new ErrorResponseData(code, message);
+ }
+
+ public static ErrorResponseData error(Integer code, String message, Object object) {
+ return new ErrorResponseData(code, message, object);
+ }
+
+ public Boolean getSuccess() {
+ return success;
+ }
+
+ public void setSuccess(Boolean success) {
+ this.success = success;
+ }
+
+ public Integer getCode() {
+ return code;
+ }
+
+ public void setCode(Integer code) {
+ this.code = code;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public Object getData() {
+ return data;
+ }
+
+ public void setData(Object data) {
+ this.data = data;
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/common/reponse/SuccessResponseData.java b/src/main/java/com/genersoft/iot/vmp/common/reponse/SuccessResponseData.java
new file mode 100644
index 00000000..c8fa1755
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/common/reponse/SuccessResponseData.java
@@ -0,0 +1,15 @@
+package com.genersoft.iot.vmp.common.reponse;
+
+public class SuccessResponseData extends ResponseData {
+ public SuccessResponseData() {
+ super(true, DEFAULT_SUCCESS_CODE, DEFAULT_SUCCESS_MESSAGE, null);
+ }
+
+ public SuccessResponseData(Object object) {
+ super(true, DEFAULT_SUCCESS_CODE, DEFAULT_SUCCESS_MESSAGE, object);
+ }
+
+ public SuccessResponseData(Integer code, String message, Object object) {
+ super(true, code, message, object);
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/ApiAccessFilter.java b/src/main/java/com/genersoft/iot/vmp/conf/ApiAccessFilter.java
index 08d030a8..4e3ee4d9 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/ApiAccessFilter.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/ApiAccessFilter.java
@@ -1,7 +1,6 @@
package com.genersoft.iot.vmp.conf;
import com.genersoft.iot.vmp.common.ApiSaveConstant;
-import com.genersoft.iot.vmp.conf.security.SecurityUtils;
import com.genersoft.iot.vmp.service.ILogService;
import com.genersoft.iot.vmp.storager.dao.dto.LogDto;
import org.apache.commons.lang3.StringUtils;
@@ -18,14 +17,9 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.text.SimpleDateFormat;
-/**
- * @author lin
- */
-@WebFilter(filterName = "ApiAccessFilter", urlPatterns = "/api/*", asyncSupported=true)
+@WebFilter(filterName = "ApiAccessFilter", urlPatterns = "/api/*", asyncSupported = true)
public class ApiAccessFilter extends OncePerRequestFilter {
- private final static Logger logger = LoggerFactory.getLogger(ApiAccessFilter.class);
-
private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@Autowired
@@ -34,25 +28,14 @@ public class ApiAccessFilter extends OncePerRequestFilter {
@Autowired
private ILogService logService;
-
@Override
protected void doFilterInternal(HttpServletRequest servletRequest, HttpServletResponse servletResponse, FilterChain filterChain) throws ServletException, IOException {
- String username = null;
- if (SecurityUtils.getUserInfo() == null) {
- username = servletRequest.getParameter("username");
- }else {
- username = SecurityUtils.getUserInfo().getUsername();
- }
long start = System.currentTimeMillis(); // 请求进入时间
String uriName = ApiSaveConstant.getVal(servletRequest.getRequestURI());
-
filterChain.doFilter(servletRequest, servletResponse);
-
if (uriName != null && userSetup.getLogInDatebase()) {
-
LogDto logDto = new LogDto();
logDto.setName(uriName);
- logDto.setUsername(username);
logDto.setAddress(servletRequest.getRemoteAddr());
logDto.setResult(HttpStatus.valueOf(servletResponse.getStatus()).toString());
logDto.setTiming(System.currentTimeMillis() - start);
@@ -60,10 +43,6 @@ public class ApiAccessFilter extends OncePerRequestFilter {
logDto.setUri(servletRequest.getRequestURI());
logDto.setCreateTime(format.format(System.currentTimeMillis()));
logService.add(logDto);
-// logger.warn("[Api Access] [{}] [{}] [{}] [{}] [{}] {}ms",
-// uriName, servletRequest.getMethod(), servletRequest.getRequestURI(), servletRequest.getRemoteAddr(), HttpStatus.valueOf(servletResponse.getStatus()),
-// System.currentTimeMillis() - start);
-
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
index 5d8acce9..5cf69db1 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
@@ -21,9 +21,6 @@ import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.net.ConnectException;
-/**
- * @author lin
- */
@SuppressWarnings(value = {"rawtypes", "unchecked"})
@Configuration
public class ProxyServletConfig {
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/RedisConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/RedisConfig.java
index dcb0e811..a01c1838 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/RedisConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/RedisConfig.java
@@ -16,73 +16,66 @@ import redis.clients.jedis.JedisPool;
import redis.clients.jedis.JedisPoolConfig;
/**
- * @description:Redis中间件配置类,使用spring-data-redis集成,自动从application.yml中加载redis配置
- * @author: swwheihei
- * @date: 2019年5月30日 上午10:58:25
- *
+ * 中间件配置类,使用spring-data-redis集成,自动从application.yml中加载redis配置
*/
@Configuration
public class RedisConfig extends CachingConfigurerSupport {
- @Value("${spring.redis.host}")
- private String host;
- @Value("${spring.redis.port}")
- private int port;
- @Value("${spring.redis.database}")
- private int database;
- @Value("${spring.redis.password}")
- private String password;
- @Value("${spring.redis.timeout}")
- private int timeout;
- @Value("${spring.redis.poolMaxTotal:1000}")
- private int poolMaxTotal;
- @Value("${spring.redis.poolMaxIdle:500}")
- private int poolMaxIdle;
- @Value("${spring.redis.poolMaxWait:5}")
- private int poolMaxWait;
+ @Value("${spring.redis.host}")
+ private String host;
+ @Value("${spring.redis.port}")
+ private int port;
+ @Value("${spring.redis.database}")
+ private int database;
+ @Value("${spring.redis.password}")
+ private String password;
+ @Value("${spring.redis.timeout}")
+ private int timeout;
+ @Value("${spring.redis.poolMaxTotal:1000}")
+ private int poolMaxTotal;
+ @Value("${spring.redis.poolMaxIdle:500}")
+ private int poolMaxIdle;
+ @Value("${spring.redis.poolMaxWait:5}")
+ private int poolMaxWait;
- @Bean
- public JedisPool jedisPool() {
- if (StringUtils.isBlank(password)) {
- password = null;
- }
- JedisPoolConfig poolConfig = new JedisPoolConfig();
- poolConfig.setMaxIdle(poolMaxIdle);
- poolConfig.setMaxTotal(poolMaxTotal);
- // 秒转毫秒
- poolConfig.setMaxWaitMillis(poolMaxWait * 1000L);
- JedisPool jp = new JedisPool(poolConfig, host, port, timeout * 1000, password, database);
- return jp;
- }
-
- @Bean("redisTemplate")
- public RedisTemplate