From 7774f5a15efb1afe03437ba18373d7688a67d943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E9=B8=A3?= Date: Fri, 19 Mar 2021 15:23:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4docker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/build.sh | 28 ----------- bin/run.sh | 46 ------------------- docker/Dockerfile | 7 --- .../files/docker-compose.yml | 17 ------- .../roles/springbootstart-test/tasks/main.yml | 22 --------- playbook/test-hosts | 1 - playbook/test.yml | 6 --- .../zhehekeji/web/config/SwaggerConfig.java | 2 +- .../web/controller/StockController.java | 3 +- .../web/controller/StreetController.java | 16 ------- .../zhehekeji/web/lib/PtzControlModule.java | 4 +- .../zhehekeji/web/service/OrderService.java | 4 +- .../zhehekeji/web/service/StockService.java | 6 ++- web/src/main/resources/application-dev.yml | 2 +- 14 files changed, 12 insertions(+), 152 deletions(-) delete mode 100644 bin/build.sh delete mode 100644 bin/run.sh delete mode 100644 docker/Dockerfile delete mode 100644 playbook/roles/springbootstart-test/files/docker-compose.yml delete mode 100644 playbook/roles/springbootstart-test/tasks/main.yml delete mode 100644 playbook/test-hosts delete mode 100644 playbook/test.yml diff --git a/bin/build.sh b/bin/build.sh deleted file mode 100644 index 3ac88fa..0000000 --- a/bin/build.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -PWD=$(cd `dirname $0`;pwd); -TARGET='test' - -set -e - -help() { - echo "Usage: $1 IMAGE." - exit 1 -} - -if [ $# -lt 1 ];then - help $0 -fi - -IMAGE=$1 - -if [ $# -ge 2 ];then - TARGET=$2 -fi - -cd $PWD/.. - -mvn clean package -P $TARGET -cp web/target/springbootstart-web-1.0.0.jar docker/springbootstart-1.0.0.jar - -docker build -t $IMAGE docker diff --git a/bin/run.sh b/bin/run.sh deleted file mode 100644 index a5ab6bc..0000000 --- a/bin/run.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -PWD=$(cd `dirname $0`;pwd); - -IMG_NAME="springbootstart" -IMG_VER='1.0.1' -PORT=8090 - -if [ $# -gt 1 ];then - PORT=$2 -fi - -if [ $# -gt 2 ];then - IMG_VER=$3 -fi - -NAME="springbootstart-$IMG_VER" - -run() { - echo "docker run --restart=on-failure:10 --name $NAME -d -p$PORT:8080 ${IMG_NAME}:${IMG_VER}" - docker run --restart=on-failure:10 --name $NAME -d -p$PORT:8080 ${IMG_NAME}:${IMG_VER} -} - -case $1 in - start) - docker start $NAME - exit $? - ;; - stop) - docker stop $NAME - exit $? - ;; - rm) - docker rm $NAME - exit $? - ;; - run) - run - exit $? - ;; - *) - echo "Usage: run.sh {start|stop|rm|run} port version." >&2 - echo "port and version are optional." >&2 - exit 1 - ;; -esac diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 2516908..0000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM tonywell/alpine-jre8:1.0.0 - -RUN mkdir /app -WORKDIR /app -COPY springbootstart-1.0.0.jar /app/ -ENTRYPOINT ["java", "-jar", "-Xms256m", "-Xmx256m", "/app/springbootstart-1.0.0.jar"] -EXPOSE 8080 diff --git a/playbook/roles/springbootstart-test/files/docker-compose.yml b/playbook/roles/springbootstart-test/files/docker-compose.yml deleted file mode 100644 index 260e1be..0000000 --- a/playbook/roles/springbootstart-test/files/docker-compose.yml +++ /dev/null @@ -1,17 +0,0 @@ -version: '2' -services: - backend: - image: springbootstart:1.0.0 - container_name: lipo-duoji - ports: - - "8632:8099" - - "8097:8097" - hostname: lipo-duoji - volumes: - - /home/work/lia/duoji/logs:/data/log/duoji - - /home/work/lia/duoji/data:/home/work/data - -networks: - default: - external: - name: zhehe007 diff --git a/playbook/roles/springbootstart-test/tasks/main.yml b/playbook/roles/springbootstart-test/tasks/main.yml deleted file mode 100644 index a7f2a88..0000000 --- a/playbook/roles/springbootstart-test/tasks/main.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- name: Ensures /home/work/lia/duoji_test dir exists - file: path=/home/work/lia/duoji_test state=directory - -- name: stop admin Service - shell: docker-compose -f /home/work/lia/duoji_test/docker-compose.yml down - ignore_errors: True - -- name: copy admin docker-compose.yml - copy: - src: docker-compose.yml - dest: /home/work/lia/duoji_test/docker-compose.yml - backup: yes - -- name: docker-pull - shell: docker pull {{ DOCKER_REPO }}/{{ IMAGE }} && docker tag {{ DOCKER_REPO }}/{{ IMAGE }} {{ IMAGE }} && docker rmi {{ DOCKER_REPO }}/{{ IMAGE }} - -- name: modify docker-compose.yml - shell: cd /home/work/lia/duoji_test && sed -i "s/springbootstart:1.0.0/{{ IMAGE }}/g" docker-compose.yml - -- name: start Service - shell: docker-compose -f /home/work/lia/duoji_test/docker-compose.yml up -d diff --git a/playbook/test-hosts b/playbook/test-hosts deleted file mode 100644 index 3a97d0f..0000000 --- a/playbook/test-hosts +++ /dev/null @@ -1 +0,0 @@ -192.168.26.214 diff --git a/playbook/test.yml b/playbook/test.yml deleted file mode 100644 index 3159f60..0000000 --- a/playbook/test.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: deploy springbootstart - hosts: all - remote_user: root - roles: - - springbootstart-test diff --git a/web/src/main/java/com/zhehekeji/web/config/SwaggerConfig.java b/web/src/main/java/com/zhehekeji/web/config/SwaggerConfig.java index df86d41..0063daf 100644 --- a/web/src/main/java/com/zhehekeji/web/config/SwaggerConfig.java +++ b/web/src/main/java/com/zhehekeji/web/config/SwaggerConfig.java @@ -13,7 +13,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @Configuration @EnableSwagger2 -@Profile({"test", "dev"}) +@Profile({"test", "dev","prod"}) public class SwaggerConfig { @Bean diff --git a/web/src/main/java/com/zhehekeji/web/controller/StockController.java b/web/src/main/java/com/zhehekeji/web/controller/StockController.java index 49bbff4..feff60b 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StockController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StockController.java @@ -1,6 +1,7 @@ package com.zhehekeji.web.controller; import com.alibaba.excel.EasyExcel; +import com.github.pagehelper.PageInfo; import com.zhehekeji.common.util.ValidatorUtil; import com.zhehekeji.core.pojo.Result; import com.zhehekeji.web.entity.Stock; @@ -50,7 +51,7 @@ public class StockController { @PostMapping("/page") @ApiOperation(value = "库存列表") - public Result> page(@RequestBody PageSearch pageSearch){ + public Result> page(@RequestBody PageSearch pageSearch){ return Result.success(stockService.page(pageSearch)); } diff --git a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java b/web/src/main/java/com/zhehekeji/web/controller/StreetController.java index 34938b5..4a7ce37 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/StreetController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/StreetController.java @@ -2,22 +2,15 @@ package com.zhehekeji.web.controller; import com.github.pagehelper.PageInfo; import com.zhehekeji.core.pojo.Result; -import com.zhehekeji.filter.pojo.SessionHandler; -import com.zhehekeji.web.entity.Order; import com.zhehekeji.web.entity.Street; -import com.zhehekeji.web.mapper.StreetMapper; -import com.zhehekeji.web.pojo.OrderSearch; import com.zhehekeji.web.pojo.street.StreetSearch; import com.zhehekeji.web.pojo.street.StreetVO; -import com.zhehekeji.web.service.OrderService; import com.zhehekeji.web.service.StreetService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; @Api(value = "StreetController",tags = "巷道管理") @RestController(value = "StreetController") @@ -61,13 +54,4 @@ public class StreetController { return Result.success(streetService.streetById(id)); } - - - /*@GetMapping("/userCenter") - @ApiOperation("用户中心地址") - public Result userCenter(){ - return Result.success(applicationService.userCenter()); - }*/ - - } diff --git a/web/src/main/java/com/zhehekeji/web/lib/PtzControlModule.java b/web/src/main/java/com/zhehekeji/web/lib/PtzControlModule.java index 05a90a1..3ef327d 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/PtzControlModule.java +++ b/web/src/main/java/com/zhehekeji/web/lib/PtzControlModule.java @@ -292,8 +292,8 @@ public class PtzControlModule { NetSDKLib.PTZ_CONTROL_ABSOLUTELY absolutely = new NetSDKLib.PTZ_CONTROL_ABSOLUTELY(); absolutely.stuPosition.nPositionX = 3600; absolutely.stuPosition.nPositionY= 0; - absolutely.stuSpeed.fPositionX = 0.9f; - absolutely.stuSpeed.fPositionY = 0f; + absolutely.stuSpeed.fPositionX = 0.2f; + absolutely.stuSpeed.fPositionY = 0.2f; //absolutely.stuSpeed.fZoom = 0.5f; Boolean ok = LoginModule.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId),0,dwPTZCommand, 0,0,0,0,absolutely.getPointer()); diff --git a/web/src/main/java/com/zhehekeji/web/service/OrderService.java b/web/src/main/java/com/zhehekeji/web/service/OrderService.java index c1c599d..b752379 100644 --- a/web/src/main/java/com/zhehekeji/web/service/OrderService.java +++ b/web/src/main/java/com/zhehekeji/web/service/OrderService.java @@ -107,12 +107,12 @@ public class OrderService { if (street.getCamera1Id() != null) { String path = PathUtil.createFileName("mp4"); - PtzControlModule.downloadMp4(street.getCamera1Id(), mp4Path + path, orderNum, order.getStartTime(), order.getEndTime()); + PtzControlModule.downloadMp4(street.getCamera1Id(), mp4Path + path, orderNum, order.getStartTime(), update.getEndTime()); update.setVideoPath1(path); } if (street.getCamera2Id() != null) { String path = PathUtil.createFileName("mp4"); - PtzControlModule.downloadMp4(street.getCamera2Id(), mp4Path + path, orderNum, order.getStartTime(), order.getEndTime()); + PtzControlModule.downloadMp4(street.getCamera2Id(), mp4Path + path, orderNum, order.getStartTime(), update.getEndTime()); update.setVideoPath2(path); } orderMapper.updateById(update); diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/zhehekeji/web/service/StockService.java index a79b7e6..cd9b827 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.zhehekeji.core.util.Assert; import com.zhehekeji.web.entity.Stock; import com.zhehekeji.web.entity.StockLog; @@ -74,10 +75,11 @@ public class StockService { return stocks; } - public List page(PageSearch pageSearch) { + public PageInfo page(PageSearch pageSearch) { PageHelper.startPage(pageSearch.getPageNum(), pageSearch.getPageSize()); List stocks = stockMapper.selectList(new QueryWrapper().orderByAsc("shelve_id", "`row`", "`column`")); - return stocks; + return new PageInfo<>(stocks); + } /** diff --git a/web/src/main/resources/application-dev.yml b/web/src/main/resources/application-dev.yml index 6a4d74b..9962929 100644 --- a/web/src/main/resources/application-dev.yml +++ b/web/src/main/resources/application-dev.yml @@ -31,7 +31,7 @@ zhehe: postToken: w89euijon2&UHBTY$%huni34ri server: port: 8099 -userUrl: http://115.236.65.98:8007 +userUrl: http://115.236.65.98:11001 picPort: 8544 cameraPassword: admin123 cameraUser: admin