diff --git a/bootstrap.sh b/bootstrap.sh deleted file mode 100644 index 0f3c4c977..000000000 --- a/bootstrap.sh +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash - -###################################################### -# Copyright 2019 Pham Ngoc Hoai -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Repo: https://github.com/tyrion9/spring-boot-startup-script -# -######### PARAM ###################################### - -JAVA_OPT=-Xmx1024m -JARFILE=`ls -1r *.jar 2>/dev/null | head -n 1` -PID_FILE=pid.file -RUNNING=N -PWD=`pwd` - -######### DO NOT MODIFY ######## - -if [ -f $PID_FILE ]; then - PID=`cat $PID_FILE` - if [ ! -z "$PID" ] && kill -0 $PID 2>/dev/null; then - RUNNING=Y - fi -fi - -start() -{ - if [ $RUNNING == "Y" ]; then - echo "Application already started" - else - if [ -z "$JARFILE" ] - then - echo "ERROR: jar file not found" - else - nohup java $JAVA_OPT -Djava.security.egd=file:/dev/./urandom -jar $PWD/$JARFILE > nohup.out 2>&1 & - echo $! > $PID_FILE - echo "Application $JARFILE starting..." - tail -f nohup.out - fi - fi -} - -stop() -{ - if [ $RUNNING == "Y" ]; then - kill -9 $PID - rm -f $PID_FILE - echo "Application stopped" - else - echo "Application not running" - fi -} - -restart() -{ - stop - start -} - -case "$1" in - - 'start') - start - ;; - - 'stop') - stop - ;; - - 'restart') - restart - ;; - - *) - echo "Usage: $0 { start | stop | restart }" - exit 1 - ;; -esac -exit 0 - diff --git a/buildPackage.sh b/buildPackage.sh deleted file mode 100755 index 913a0d851..000000000 --- a/buildPackage.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -# 获取当前日期并格式化为 YYYY-MM-DD 的形式 -current_date=$(date +"%Y-%m-%d") - -mkdir -p "$current_date"/数据库 - -cp -r ./数据库/2.7.3 "$current_date"/数据库 - -cp src/main/resources/配置详情.yml "$current_date" -cp src/main/resources/application-dev.yml "$current_date"/application.yml - -cp ./target/wvp-pro-*.jar "$current_date" - -zip -r "$current_date".zip "$current_date" - -rm -rf "$current_date" - -exit 0 - diff --git a/libs/smiley-http-proxy-servlet-2.0.jar b/libs/smiley-http-proxy-servlet-2.0.jar deleted file mode 100644 index 876b56c61..000000000 Binary files a/libs/smiley-http-proxy-servlet-2.0.jar and /dev/null differ diff --git a/pom.xml b/pom.xml index 20936fa41..5f7d0cbf7 100644 --- a/pom.xml +++ b/pom.xml @@ -213,17 +213,12 @@ org.springdoc springdoc-openapi-starter-webmvc-ui - 2.8.6 + 2.8.5 org.springdoc springdoc-openapi-starter-webmvc-api - 2.8.6 - - - org.springdoc - springdoc-openapi-security - 1.8.0 + 2.8.5 diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java index 65ebc3f88..ba1b0facd 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java @@ -7,12 +7,12 @@ import io.swagger.v3.oas.models.info.Contact; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.info.License; import io.swagger.v3.oas.models.security.SecurityScheme; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.core.annotation.Order; -import org.springdoc.core.GroupedOpenApi; +import org.springdoc.core.models.GroupedOpenApi; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.Order; /** * @author lin @@ -39,7 +39,7 @@ public class SpringDocConfig { .info(new Info().title("WVP-PRO 接口文档") .contact(contact) .description("开箱即用的28181协议视频平台。
" + - "1. 打开登录接口" + + "1. 打开登录接口" + " 登录成功后返回AccessToken。
" + "2. 填写到AccessToken到参数值 Token配置
" + "后续接口就可以直接测试了") diff --git a/zlm.md b/zlm.md deleted file mode 100644 index bbaf32953..000000000 --- a/zlm.md +++ /dev/null @@ -1,15 +0,0 @@ -1. 增加接口:用来返回hook调用耗时。 - 参数: sn, - 返回值: hook耗时 - 功能: zlm收到调用后立即调用心跳hook,hook中携带sn信息, zlm收到hook返回后计算此次hook的耗时,然后返回耗时 - 用途: 1. 可以用来检测hook配置是否正常 - 2. 检测wvp与zlm连接的健康程度 -2. 增加接口:查询loadMP4File的录像播放位置 - 参数: app, steam, - 返回: 当前播放的hook位置 - 功能: zlm收到请求后查询流的seek位置并返回 - 用途: 1. 获取当前播放位置,可以在页面同步显示时间 - 2. 用来时快进五秒 快退五秒类似的操作 -3. loadMP4File扩展, 增加默认seek值和默认倍速,开始时直接从这个位置开始,并使用指定的倍速 -4. 支持下载指定取件的mp4文件,这个区间可能包括多个文件和文件的一部分。 -5. 希望seek接口和倍速接口可以去除schema的必选,作为可选项,不传则默认全部