Commit Graph

  • a26ac1065d docs: fix README content pnoker 2019-06-09 21:45:11 +08:00
  • 4325b7563d 调整 pnoker 2019-06-09 21:37:52 +08:00
  • dcf794757d docs: update README links and descriptions pnoker 2019-06-09 21:37:52 +08:00
  • 64d34a4df2 调整 pnoker 2019-06-09 21:34:59 +08:00
  • 8d2959f2d5 docs: simplify README by removing outdated sections pnoker 2019-06-09 21:34:59 +08:00
  • 544194dfa3 client端 pnoker 2019-06-09 21:29:52 +08:00
  • 509798ffb7 feat(device): add dc3-client module with Feign API and hystrix fallback pnoker 2019-06-09 21:29:52 +08:00
  • 88a02274ea 完善rtsp-rtmp服务功能 pnoker 2019-06-04 23:01:56 +08:00
  • e29e877d22 feat(transfer): improve rtsp-to-rtmp task runner with startup and scheduling logic pnoker 2019-06-04 23:01:56 +08:00
  • 74e8d69998 调整api包层级关系,解决feignclient同component的冲突问题 pnoker 2019-06-03 09:58:20 +08:00
  • c405dc7218 refactor(api): restructure feign client packages to avoid component scan conflict pnoker 2019-06-03 09:58:20 +08:00
  • 0abe995d27 添加rtmp数据操作逻辑 pnoker 2019-06-03 01:07:35 +08:00
  • 9d76ab1d33 feat(dbs): add rtmp CRUD service and consolidate application config files pnoker 2019-06-03 01:07:35 +08:00
  • b597737044 删除webapp生产配置文件 pnoker 2019-06-03 01:06:21 +08:00
  • 2e399fbfe4 chore(webapp): consolidate application configs and remove env-specific profile files pnoker 2019-06-03 01:06:21 +08:00
  • f8c24ee3f5 rtmp添加新字段 pnoker 2019-06-03 01:05:12 +08:00
  • ddccd9ef37 feat(transfer): add new field to Rtmp model pnoker 2019-06-03 01:05:12 +08:00
  • bc60358c88 调整配置文件和依赖 pnoker 2019-06-03 01:04:45 +08:00
  • 4ea5e437e8 feat(api): expand RtmpFeignApi and hystrix fallback with full CRUD methods pnoker 2019-06-03 01:04:45 +08:00
  • cf3b5d1c0e 添加说明 pnoker 2019-06-03 01:03:44 +08:00
  • 0bd82a5c56 docs: add README description and data-flow design diagram pnoker 2019-06-03 01:03:44 +08:00
  • 036ddba7a7 Merge pull request #2 from pnoker/dev 张红元 2019-05-31 20:31:13 +08:00
  • 38df65a52f Merge pull request #2 from pnoker/dev pnoker 2019-05-31 20:31:13 +08:00
  • e66ec2e2fa 日常提交 pnoker 2019-05-31 16:55:21 +08:00
  • d9a0c0549d chore: update gateway/register config, add error codes, and refresh architecture assets pnoker 2019-05-31 16:55:21 +08:00
  • 64c26cd3a3 Merge pull request #1 from pnoker/dev 张红元 2019-05-29 20:03:14 +08:00
  • a430cb7587 Merge pull request #1 from pnoker/dev pnoker 2019-05-29 20:03:14 +08:00
  • 07ded56aa7 设备端管理和数据采集调整 pnoker 2019-05-29 19:54:04 +08:00
  • 008de07999 refactor(device): split dc3-devices into dc3-collect and dc3-manager sub-modules pnoker 2019-05-29 19:54:04 +08:00
  • 0bc207a074 调整配置文件和依赖 pnoker 2019-05-27 18:39:37 +08:00
  • 867930df5d chore: update eureka hostname references across all service configs pnoker 2019-05-27 18:39:37 +08:00
  • 2e840fcaff readme pnoker 2019-05-27 15:38:46 +08:00
  • af483bb688 docs: expand README with project description and setup details pnoker 2019-05-27 15:38:46 +08:00
  • bf3a986402 badge pnoker 2019-05-27 14:34:12 +08:00
  • 2abdfeeaaa docs: add status badges to README pnoker 2019-05-27 14:34:12 +08:00
  • f58e4101b4 badge pnoker 2019-05-27 14:30:14 +08:00
  • 05d541fc38 docs: add and reformat status badges in README pnoker 2019-05-27 14:30:14 +08:00
  • 87897c3475 添加Apache License-2.0开源协议 pnoker 2019-05-27 13:57:53 +08:00
  • 9ae7ec498d docs: add Apache License 2.0 and project logo pnoker 2019-05-27 13:57:53 +08:00
  • 4983dcdfdf Rtsp转Rtmp监听线程调整 pnoker 2019-05-27 11:02:45 +08:00
  • 3b13819449 refactor(rtmp): rename Tasker/TaskHandel, extract task monitoring logic, add unit tests pnoker 2019-05-27 11:02:45 +08:00
  • 2f832ea014 Rtsp转Rtmp监听线程调整 pnoker 2019-05-26 23:58:43 +08:00
  • 69b37d4d77 feat(rtmp): add task monitor thread, timer, and output handle for rtsp-to-rtmp relay pnoker 2019-05-26 23:58:43 +08:00
  • b1a35252f5 GUID工具类 pnoker 2019-05-26 23:34:59 +08:00
  • 7b38fbc288 feat(common): add UID utility class and AES/RSA encryption helpers pnoker 2019-05-26 23:34:59 +08:00
  • 739aa90748 设备管理 pnoker 2019-05-26 22:26:31 +08:00
  • 05be4c1a30 chore: update eureka service-url and port assignments across all modules pnoker 2019-05-26 22:26:31 +08:00
  • 87b914ecf3 web服务的监控提交&调整Redis连接 pnoker 2019-05-25 14:38:04 +08:00
  • cabbb123b6 feat(monitor): register webapp with Spring Boot Admin and fix Redis connection config pnoker 2019-05-25 14:38:04 +08:00
  • cbc6f85bdf 调整pom配置 pnoker 2019-05-25 01:56:48 +08:00
  • 0b8e13ed2d build: add spring-boot-maven-plugin to dbs, gateway, and service pom files pnoker 2019-05-25 01:56:48 +08:00
  • 8c0bdd8ed2 Spring Cloud Admin 监控信息配置 pnoker 2019-05-25 01:33:52 +08:00
  • 19d03d9ad4 chore: add Spring Boot Admin client config to all service application ymls pnoker 2019-05-25 01:33:52 +08:00
  • a18ca57aa3 添加服务状态监控 Spring Cloud Admin 模块 pnoker 2019-05-25 01:26:34 +08:00
  • 10b7abdfa2 feat(monitor): add Spring Boot Admin server module for service health monitoring pnoker 2019-05-25 01:26:34 +08:00
  • 79eff289d1 添加描述信息 pnoker 2019-05-25 00:48:00 +08:00
  • 912c3e3196 build: add description field to all module pom files pnoker 2019-05-25 00:48:00 +08:00
  • 874eb7bc27 添加Actuator监控 pnoker 2019-05-25 00:44:11 +08:00
  • 7c45f74c77 feat(register): add Actuator dependency and enable management endpoints pnoker 2019-05-25 00:44:11 +08:00
  • 28872c6d96 提交spring cloud gateway配置 pnoker 2019-05-24 22:24:44 +08:00
  • adbdc62601 feat(gateway): configure Spring Cloud Gateway routes and remove stub controller pnoker 2019-05-24 22:24:44 +08:00
  • 1959ed4a94 熔断 pnoker 2019-05-24 18:44:19 +08:00
  • 80cfc32391 feat(api): add hystrix fallback for rtmp feign client and extend rtmp model pnoker 2019-05-24 18:44:19 +08:00
  • f86448ba1c 提交负载和熔断修改 pnoker 2019-05-24 17:56:29 +08:00
  • 0a548dc715 feat(dbs): add rtmp controller and service, replace user feign client with rtmp feign api pnoker 2019-05-24 17:56:29 +08:00
  • 0052818b1c 提交rtsp->rtmp例子 pnoker 2019-05-22 20:18:35 +08:00
  • 6dc1bbd2fc feat(rtmp): add rtsp-to-rtmp transcoding controller, output handle, and task runner pnoker 2019-05-22 20:18:35 +08:00
  • 72882fbb4b 提交build脚本 pnoker 2019-05-22 12:05:12 +08:00
  • e803630bfb build: add shell scripts for build, init, startup and shutdown; consolidate .gitignore files pnoker 2019-05-22 12:05:12 +08:00
  • 072b59c3c7 postman 用于api接口测试 pnoker 2019-05-22 10:26:14 +08:00
  • ab53be57b7 docs: add postman api collection and architecture diagram pnoker 2019-05-22 10:26:14 +08:00
  • 408f314a04 设备端管理服务提交 pnoker 2019-05-22 10:02:29 +08:00
  • 9bb6645bc7 feat(driver): scaffold dc3-devices service module with spring boot application pnoker 2019-05-22 10:02:29 +08:00
  • f8e7b89266 更新springboot版本到Greenwich,并调整兼容性问题 pnoker 2019-05-22 10:00:06 +08:00
  • 4f32b03a3d build: upgrade spring cloud to Greenwich release train and align all module pom versions pnoker 2019-05-22 10:00:06 +08:00
  • c166257dce 添加加密算法AES\RSA pnoker 2019-05-13 23:44:15 +08:00
  • 003ff22d04 feat(common): refactor aes/rsa encryption utilities and add encrypt unit tests pnoker 2019-05-13 23:44:15 +08:00
  • c5be763b67 添加测试 pnoker 2019-05-13 13:00:35 +08:00
  • af2ea0b587 feat(common): introduce aes and rsa encryption util classes, remove active tools, add keys bean pnoker 2019-05-13 13:00:35 +08:00
  • e9cff28385 添加对称加密工具 pnoker 2019-05-13 00:43:03 +08:00
  • 7d9c0b60df feat(common): add symmetric encryption utility class (ActiveTools) pnoker 2019-05-13 00:43:03 +08:00
  • 24e8935c1f 添加西门子S7 PLC支持 pnoker 2019-05-08 23:46:59 +08:00
  • 6a494a532f feat(driver): add siemens s7 plc driver dependency and base controller scaffold pnoker 2019-05-08 23:46:59 +08:00
  • 744796ea7f 初始化数据 pnoker 2019-05-05 11:35:08 +08:00
  • 0320096f55 chore: add seed data sql file and rename sql scripts to consistent naming pnoker 2019-05-05 11:35:08 +08:00
  • fdedb65682 创建数据库脚本 pnoker 2019-05-05 10:58:38 +08:00
  • 0c7a8aa13b chore: add database and table creation sql scripts pnoker 2019-05-05 10:58:38 +08:00
  • 90e88c1a90 初始化Opc\Opc Ua\Plc S7数据处理服务 pnoker 2019-05-05 10:23:22 +08:00
  • 13a8150d91 feat(driver): scaffold opc, opc-ua, and plc-s7 service modules with spring boot application pnoker 2019-05-05 10:23:22 +08:00
  • 08b9963430 添加测试 pnoker 2019-05-04 23:31:41 +08:00
  • 8c72705c21 test(dbs): add rtmp mapper, model, and mybatis test with datasource configuration pnoker 2019-05-04 23:31:41 +08:00
  • 9ffe3adc4f 升级spring-boot版本到2.0最新版本 添加mybatis plus支持 调整依赖版本,进行统一管理 pnoker 2019-05-03 13:30:41 +08:00
  • 285cb25270 build: upgrade spring boot to 2.0 latest, add mybatis-plus, centralize dependency versions pnoker 2019-05-03 13:30:41 +08:00
  • eb4ffdf933 配置网关和rtmp服务 pnoker 2019-05-01 20:57:32 +08:00
  • f6acf3c864 refactor(rtmp): rename package from rtsp to rtmp and configure gateway and rtmp service pnoker 2019-05-01 20:57:32 +08:00
  • be27296331 socket处理 Netty pnoker 2019-04-30 23:40:17 +08:00
  • ea91e898bd feat(driver): add rtmp transcoding service and netty tcp socket client/server implementation pnoker 2019-04-30 23:40:17 +08:00
  • 65c31efcca socket处理 Netty pnoker 2019-04-30 23:38:14 +08:00
  • 56f70c9524 refactor(service): replace rtsp-rtmp module with socket service using Netty pnoker 2019-04-30 23:38:14 +08:00
  • 3f1903566b 提交命令启动器 pnoker 2019-04-30 23:26:44 +08:00