diff --git a/pom.xml b/pom.xml index 8c64afcb3..d5c79101e 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,12 @@ + + org.bytedeco + javacv-platform + 1.5.9 + + diff --git a/src/main/java/com/zhgd/xmgl/config/AsyncConfig.java b/src/main/java/com/zhgd/xmgl/config/AsyncConfig.java index 3b3f7e0c4..b01772ba3 100644 --- a/src/main/java/com/zhgd/xmgl/config/AsyncConfig.java +++ b/src/main/java/com/zhgd/xmgl/config/AsyncConfig.java @@ -587,4 +587,23 @@ public class AsyncConfig { return executor; } + @Bean("saveVideoItemCover") + public ThreadPoolTaskExecutor saveVideoItemCoverExecutor() { + MdcThreadPoolTaskExecutor executor = new MdcThreadPoolTaskExecutor(); + /** 核心线程数（默认线程数） */ + executor.setCorePoolSize(1); + /** 最大线程数 */ + executor.setMaxPoolSize(1); + executor.setQueueCapacity(queueCapacity * 1000); + /** 允许线程空闲时间（单位：默认为秒） */ + executor.setKeepAliveSeconds(60); + /** 线程池名前缀 */ + executor.setThreadNamePrefix("saveVideoItemCoverExecutor-"); + // 线程池对拒绝任务的处理策略 + executor.setRejectedExecutionHandler(new ThreadPoolExecutor.AbortPolicy()); + // 初始化 + executor.initialize(); + return executor; + } + } diff --git a/src/main/java/com/zhgd/xmgl/task/VideoItemTask.java b/src/main/java/com/zhgd/xmgl/task/VideoItemTask.java index 39902448b..977e00282 100644 --- a/src/main/java/com/zhgd/xmgl/task/VideoItemTask.java +++ b/src/main/java/com/zhgd/xmgl/task/VideoItemTask.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.task; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -10,10 +11,14 @@ import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.async.AsyncHikvision; import com.zhgd.xmgl.call.HikvisionVideoCall; import com.zhgd.xmgl.modules.project.entity.Project; +import com.zhgd.xmgl.modules.project.entity.ProjectVideoConfig; import com.zhgd.xmgl.modules.project.mapper.ProjectMapper; import com.zhgd.xmgl.modules.project.mapper.ProjectVideoConfigMapper; +import com.zhgd.xmgl.modules.project.service.IProjectService; +import com.zhgd.xmgl.modules.project.service.IProjectVideoConfigService; import com.zhgd.xmgl.modules.project.service.ProgressTaskService; import com.zhgd.xmgl.modules.video.entity.ProjectVideoHkVqd; +import com.zhgd.xmgl.modules.video.entity.VideoItem; import com.zhgd.xmgl.modules.video.mapper.ProjectVideoHkVqdMapper; import com.zhgd.xmgl.modules.video.mapper.VideoItemMapper; import com.zhgd.xmgl.modules.video.service.impl.VideoItemServiceImpl; @@ -21,17 +26,18 @@ import com.zhgd.xmgl.modules.xz.entity.XzHikvisionVideoFull; import com.zhgd.xmgl.modules.xz.entity.XzHikvisionVideoOnline; import com.zhgd.xmgl.modules.xz.mapper.XzHikvisionVideoFullMapper; import com.zhgd.xmgl.modules.xz.mapper.XzHikvisionVideoOnlineMapper; -import com.zhgd.xmgl.util.DateUtils; -import com.zhgd.xmgl.util.HikvisionUtil; -import com.zhgd.xmgl.util.MapBuilder; +import com.zhgd.xmgl.util.*; import lombok.extern.slf4j.Slf4j; import net.javacrumbs.shedlock.core.SchedulerLock; import org.apache.commons.collections4.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; +import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import java.io.File; import java.util.*; import java.util.stream.Collectors; @@ -39,7 +45,8 @@ import java.util.stream.Collectors; * 视频设备（监控点）定时任务 */ @Slf4j -@Component +@RestController +@RequestMapping("/xmgl/task/") public class VideoItemTask { @Lazy @Autowired @@ -71,6 +78,12 @@ public class VideoItemTask { @Lazy @Autowired VideoItemServiceImpl videoItemService; + @Lazy + @Autowired + private IProjectService projectService; + @Lazy + @Autowired + private IProjectVideoConfigService projectVideoConfigService; /** * 定时获取录像完整性结果 @@ -202,4 +215,45 @@ public class VideoItemTask { } } + /** + * 每2个小时更新一下监控封面 + * + * @throws Exception + */ + @RequestMapping("saveVideoItemCover") + @SchedulerLock(name = "saveVideoItemCover", lockAtMostFor = 1000 * 60, lockAtLeastFor = 1000 * 60) + @Scheduled(cron = "0 0 */2 * * ?") + public void saveVideoItemCover() throws Exception { + List configList = projectVideoConfigService.list(new LambdaQueryWrapper() + .eq(ProjectVideoConfig::getIsEnable, 1)); + List itemList = videoItemService.list(); + String basePath = "videoItemCover"; + for (ProjectVideoConfig projectVideoConfig : configList) { + if (Objects.equals(projectVideoConfig.getVideoType(), 3)) { + List items = itemList.stream().filter(o -> Objects.equals(o.getVideoId(), projectVideoConfig.getId())).collect(Collectors.toList()); + for (VideoItem item : items) { + saveVideoItemCoverAsync(basePath, projectVideoConfig, item); + } + } + } + } + + @Async("saveVideoItemCover") + public void saveVideoItemCoverAsync(String basePath, ProjectVideoConfig projectVideoConfig, VideoItem item) throws Exception { + try { + String url = HikVideoUtil.callPostApiGetPreviewURL(item.getSerialNumber(), "rtsp", + 2, projectVideoConfig.getAccount(), + projectVideoConfig.getPassword(), projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret()); + if (url != null) { + String uuidPic = IdUtil.fastUUID() + ".jpg"; + String picPath = PathUtil.getBasePath() + "/" + basePath + "/" + uuidPic; + new File(picPath).getParentFile().mkdirs(); + RtspUtils.getVideoImagePathByRSTP(url, picPath); + item.setCoverUrl(PathUtil.getServerUrl() + "/image/" + basePath + "/" + uuidPic); + videoItemService.updateById(item); + } + } catch (Exception e) { + e.printStackTrace(); + } + } } diff --git a/src/main/java/com/zhgd/xmgl/util/RtspUtils.java b/src/main/java/com/zhgd/xmgl/util/RtspUtils.java new file mode 100644 index 000000000..80b60ba6f --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/util/RtspUtils.java @@ -0,0 +1,133 @@ +package com.zhgd.xmgl.util; + +import lombok.extern.slf4j.Slf4j; +import org.bytedeco.javacv.FFmpegFrameGrabber; +import org.bytedeco.javacv.Frame; +import org.bytedeco.javacv.FrameGrabber; +import org.bytedeco.javacv.Java2DFrameConverter; + +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.math.BigDecimal; +import java.math.RoundingMode; + +@Slf4j +public class RtspUtils { + + private static String RTSP_TRANSPORT_TYPE = "tcp"; + /** + * 视频帧率 + */ + private static int FRAME_RATE = 1; + /** + * 视频宽度 + */ +// private static int FRAME_WIDTH = 1920; + private static int FRAME_WIDTH = 426; + /** + * 视频高度 + */ +// private static int FRAME_HEIGHT = 1080; + private static int FRAME_HEIGHT = 240; + /** + * 遍历500次确保实时图片显示正常图片 + */ + private static int COUNT = 100; + + /** + * 解析视频地址并截图 + * + * @param path rstp 流地址 + * @param picPath 图片存放地址 + * @throws Exception + */ + public static void getVideoImagePathByRSTP(String path, String picPath) throws Exception { + //创建rstp流对象 + FFmpegFrameGrabber grabber = createGrabber(path); + try { + //开启流获取 + grabber.start(); + //由于视频第一帧的流可能为黑屏 为了确保实时能截取到准确图像 + // 故此做了个for循环用于覆盖生成图片 + for (int i = 0; i < COUNT; i++) { + //获取流视频框内的图像 + Frame frame = grabber.grabFrame(); + //转换图像 + Java2DFrameConverter converter = new Java2DFrameConverter(); + BufferedImage srcImage = converter.getBufferedImage(frame); + if (srcImage != null) { + //自定义画图 + int w = srcImage.getWidth(); + int h = srcImage.getHeight(); + int weight = 426; + int height = new BigDecimal(weight).divide(new BigDecimal(w), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(h)).setScale(0, RoundingMode.HALF_UP).intValue(); + BufferedImage bufferedImage = new BufferedImage(weight, height, BufferedImage.TYPE_3BYTE_BGR); + bufferedImage.getGraphics().drawImage(srcImage.getScaledInstance(weight, height, Image.SCALE_SMOOTH), 0, 0, null); + //创建文件 + File file = new File(picPath); + //输出文件 + ImageIO.write(bufferedImage, "jpg", file); + break; + } + } + } finally { + grabber.stop(); + grabber.close(); + } + + + } + + + /** + * 构造视频抓取器 + * + * @param rtsp 拉流地址 + * @return + */ + private static FFmpegFrameGrabber createGrabber(String rtsp) { + // 获取视频源 + try { + FFmpegFrameGrabber grabber = FFmpegFrameGrabber.createDefault(rtsp); + //设置传输方式 TCP | UDP + grabber.setOption("rtsp_transport", RTSP_TRANSPORT_TYPE); + //设置帧率 + grabber.setFrameRate(FRAME_RATE); + //设置获取的视频宽度 + grabber.setImageWidth(FRAME_WIDTH); + //设置获取的视频高度 + grabber.setImageHeight(FRAME_HEIGHT); + // 设置采集器构造超时时间(单位微秒，1秒=1000000微秒) + grabber.setOption("stimeout", "2000000000"); + //设置视频bit率 + // grabber.setVideoBitrate(2000000); + // 过滤坏掉的帧 + grabber.setVideoOption("skip_frame", "nokey"); +// grabber.setOption("Connection", "keep-alive"); + // 设置缓冲区大小为1MB + grabber.setOption("buffer_size", "10240000"); + return grabber; + } catch (FrameGrabber.Exception e) { + log.error("创建解析rtsp FFmpegFrameGrabber 失败"); + log.error("create rtsp FFmpegFrameGrabber exception: ", e); + return null; + } + } + + + public static void main(String[] args) { + try { + //参数1 rtsp 地址自行获取 参数2 截取图片存放地址 + RtspUtils.getVideoImagePathByRSTP("rtsp://222.80.185.228:554/openUrl/uAYM6I0", "C:\\Users\\Administrator\\Desktop\\t\\new\\1000.jpg"); + } catch (IOException e) { + e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + } + } + +} + diff --git a/src/main/resources/application-gsx-dev.properties b/src/main/resources/application-gsx-dev.properties index 4242bbbde..1d94df440 100644 --- a/src/main/resources/application-gsx-dev.properties +++ b/src/main/resources/application-gsx-dev.properties @@ -4,7 +4,7 @@ http.port=18070 #spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC #spring.datasource.url=jdbc:mysql://36.137.53.203:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true #spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true -#spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +#spring.datasource.url=jdbc:mysql://jxj.zhgdyun.com:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false #spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true spring.datasource.url=jdbc:mysql://localhost:3306/wisdomsite_yanshi?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&useSSL=false spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) @@ -28,7 +28,7 @@ wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic serverUrl=http://124.71.67.160:8088 -#serverUrl=http://182.90.224.237:7000 +#serverUrl=http://jxj.zhgdyun.com:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url video-analysis-url= diff --git a/src/main/resources/application-gsx-other-env-show.properties b/src/main/resources/application-gsx-other-env-show.properties index 8c077a7c3..65008523b 100644 --- a/src/main/resources/application-gsx-other-env-show.properties +++ b/src/main/resources/application-gsx-other-env-show.properties @@ -23,7 +23,7 @@ wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic serverUrl=http://192.168.34.221:19111 -#serverUrl=http://182.90.224.237:7000 +#serverUrl=http://jxj.zhgdyun.com:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url video-analysis-url= diff --git a/src/main/resources/application-gsx-t-dev.properties b/src/main/resources/application-gsx-t-dev.properties index 03eff3d7b..341a43ae1 100644 --- a/src/main/resources/application-gsx-t-dev.properties +++ b/src/main/resources/application-gsx-t-dev.properties @@ -22,7 +22,7 @@ video.alarm.newUrl=223.82.100.80:6040 wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic -serverUrl=http://182.90.224.237:51234 +serverUrl=http://jxj.zhgdyun.com:51234 #\u89C6\u9891\u5206\u6790url video-analysis-url= server.ssl.enabled=false @@ -85,7 +85,7 @@ sj.business.gateway.url=http://116.169.63.183:30867/ #\u4E09\u6C5F\u4E1A\u52A1\u4E2D\u53F0\u7F51\u5173\u5730\u5740\u7684\u8C03\u7528\u51ED\u8BC1 sj.business.gateway.api.key=nDmkHCxlQzCqE-xfYteXMw #\u4E09\u6C5F\u56FE\u7247\u8BBF\u95EE\u8DEF\u5F84\uFF08\u7528\u4E8E\u63A8\u9001\u4E1A\u52A1\u4E2D\u53F0\uFF09 -sj.upload.image.url.prefix=http://182.90.224.237:51234/image/ +sj.upload.image.url.prefix=http://jxj.zhgdyun.com:51234/image/ active.environment.name=gsx-other-env-show-dev #携稳扬尘 xiwon.postEnvironmentDustData=http://openapi.xiwon588.com/dust/realTimeData @@ -97,6 +97,6 @@ magic-api.web=/xmgl/magic/web #配置文件存储位置。当以classpath开头时，为只读模式 magic-api.resource.location=C:/jxj/prod/backEnd/itbgpImage/data/magic-api #上传的图片的url前缀 -upload.image.url.prefix=http://182.90.224.237:51234/image/ +upload.image.url.prefix=http://jxj.zhgdyun.com:51234/image/ #内网的服务图片的url前缀 xingzong.inner.upload.image.url.prefix=http://10.168.2.104:9809/image/ diff --git a/src/main/resources/application-gxlt.properties b/src/main/resources/application-gxlt.properties index 577c137c4..f5728df1f 100644 --- a/src/main/resources/application-gxlt.properties +++ b/src/main/resources/application-gxlt.properties @@ -1,7 +1,7 @@ http.port=18070 -spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false&&serverTimezone=Asia/Shanghai +spring.datasource.url=jdbc:mysql://jxj.zhgdyun.com:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false&&serverTimezone=Asia/Shanghai spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V) #server.port=6688 @@ -25,9 +25,7 @@ wx-appid= wx-AppSecret= mqtt-scope=gxltTopic - - -serverUrl=http://182.90.224.237:7000 +serverUrl=http://jxj.zhgdyun.com:7000 #视频分析url video-analysis-url= @@ -69,8 +67,8 @@ license.licensePath=E:/license_demo/client/license.lic license.publicKeysStorePath=E:/license_demo/client/publicCerts.keystore # admin中对应的地址及实例名 -spring.boot.admin.client.instance.service-url=http://182.90.224.237:7000 +spring.boot.admin.client.instance.service-url=http://jxj.zhgdyun.com:7000 spring.boot.admin.client.instance.name=gxlt double-carbon.water-data-url=http://test.cesms.net double-carbon.ammeter-data-url=http://test.cesms.net -server.ssl.enabled=false \ No newline at end of file +server.ssl.enabled=false diff --git a/src/main/resources/application-hncs.properties b/src/main/resources/application-hncs.properties index 95fc7da33..7e4e8297b 100644 --- a/src/main/resources/application-hncs.properties +++ b/src/main/resources/application-hncs.properties @@ -5,7 +5,7 @@ http.port=6324 #spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC #spring.datasource.url=jdbc:mysql://36.137.53.203:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true #spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true -#spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +#spring.datasource.url=jdbc:mysql://jxj.zhgdyun.com:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false #spring.datasource.url=jdbc:mysql://192.168.34.125:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false spring.datasource.url=jdbc:mysql://139.9.66.234:3387/wisdomsite_hncs?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false #spring.datasource.url=jdbc:mysql://124.71.67.160:3306/wisdomsite_test?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false diff --git a/src/main/resources/application-hq.properties b/src/main/resources/application-hq.properties index ffe8c2c44..229165e34 100644 --- a/src/main/resources/application-hq.properties +++ b/src/main/resources/application-hq.properties @@ -5,7 +5,7 @@ http.port=6023 #spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC #spring.datasource.url=jdbc:mysql://36.137.53.203:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true #spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true -#spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +#spring.datasource.url=jdbc:mysql://jxj.zhgdyun.com:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false spring.datasource.url=jdbc:mysql://tx9m14y.nat.ipyingshe.com:19589/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false spring.datasource.username=ENC(q7HIlKWUMTc1XCfJDx8nvA==) #spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V) diff --git a/src/main/resources/application-shahu-gsx.properties b/src/main/resources/application-shahu-gsx.properties index a246dd7ed..e8d4ed43f 100644 --- a/src/main/resources/application-shahu-gsx.properties +++ b/src/main/resources/application-shahu-gsx.properties @@ -4,7 +4,7 @@ http.port=38323 #spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC #spring.datasource.url=jdbc:mysql://36.137.53.203:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true #spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true -#spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +#spring.datasource.url=jdbc:mysql://jxj.zhgdyun.com:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false #spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true spring.datasource.url=jdbc:mysql://localhost:3306/wisdomsite_shahu?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) @@ -28,7 +28,7 @@ wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic serverUrl=http://124.71.67.160:8088 -#serverUrl=http://182.90.224.237:7000 +#serverUrl=http://jxj.zhgdyun.com:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url video-analysis-url= diff --git a/src/main/resources/application-sjjt-gsx.properties b/src/main/resources/application-sjjt-gsx.properties index 6865082f2..6380185bf 100644 --- a/src/main/resources/application-sjjt-gsx.properties +++ b/src/main/resources/application-sjjt-gsx.properties @@ -4,7 +4,7 @@ http.port=30221 #spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC #spring.datasource.url=jdbc:mysql://36.137.53.203:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true #spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true -#spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +#spring.datasource.url=jdbc:mysql://jxj.zhgdyun.com:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false #spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true spring.datasource.url=jdbc:mysql://192.168.34.221:3306/wisdomsite_sj?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) @@ -29,7 +29,7 @@ wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic serverUrl=http://124.71.67.160:8088 -#serverUrl=http://182.90.224.237:7000 +#serverUrl=http://jxj.zhgdyun.com:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url video-analysis-url= diff --git a/src/main/resources/application-xingzong.properties b/src/main/resources/application-xingzong.properties index a829fff91..5ba2cb873 100644 --- a/src/main/resources/application-xingzong.properties +++ b/src/main/resources/application-xingzong.properties @@ -17,7 +17,7 @@ wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic serverUrl=http://42.180.188.17:9809 -#serverUrl=http://182.90.224.237:7000 +#serverUrl=http://jxj.zhgdyun.com:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url video-analysis-url= diff --git a/src/main/resources/application-ylww.properties b/src/main/resources/application-ylww.properties index e99ec3729..5d3298273 100644 --- a/src/main/resources/application-ylww.properties +++ b/src/main/resources/application-ylww.properties @@ -4,7 +4,7 @@ http.port=18070 #spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC #spring.datasource.url=jdbc:mysql://36.137.53.203:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true #spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true -#spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +#spring.datasource.url=jdbc:mysql://jxj.zhgdyun.com:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false #spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true spring.datasource.url=jdbc:mysql://139.9.66.234:33001/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) @@ -29,7 +29,7 @@ wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic serverUrl=http://124.71.67.160:8088 -#serverUrl=http://182.90.224.237:7000 +#serverUrl=http://jxj.zhgdyun.com:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url video-analysis-url= diff --git a/src/main/resources/application-zjsj-gsx.properties b/src/main/resources/application-zjsj-gsx.properties index 00e73f87a..300d7717d 100644 --- a/src/main/resources/application-zjsj-gsx.properties +++ b/src/main/resources/application-zjsj-gsx.properties @@ -4,7 +4,7 @@ http.port=21323 #spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC #spring.datasource.url=jdbc:mysql://36.137.53.203:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true #spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true -#spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +#spring.datasource.url=jdbc:mysql://jxj.zhgdyun.com:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false #spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true spring.datasource.url=jdbc:mysql://localhost:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) @@ -28,7 +28,7 @@ wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic serverUrl=http://124.71.67.160:8088 -#serverUrl=http://182.90.224.237:7000 +#serverUrl=http://jxj.zhgdyun.com:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url video-analysis-url= diff --git a/src/main/resources/application-zjsj-prod.properties b/src/main/resources/application-zjsj-prod.properties index 0f62ca7fd..5ea9aa0ca 100644 --- a/src/main/resources/application-zjsj-prod.properties +++ b/src/main/resources/application-zjsj-prod.properties @@ -4,7 +4,7 @@ http.port=18070 #spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC #spring.datasource.url=jdbc:mysql://36.137.53.203:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true #spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true -#spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +#spring.datasource.url=jdbc:mysql://jxj.zhgdyun.com:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false #spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true spring.datasource.url=jdbc:mysql://124.71.67.160:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) @@ -29,7 +29,7 @@ wx-appid= wx-AppSecret= mqtt-scope=zjsjTopic serverUrl=http://124.71.67.160:8088 -#serverUrl=http://182.90.224.237:7000 +#serverUrl=http://jxj.zhgdyun.com:7000 #serverUrl=http://127.0.0.1:6023 #\u89C6\u9891\u5206\u6790url video-analysis-url=