opensource/iot-dc3
3
0
Fork 0
mirror of https://gitee.com/pnoker/iot-dc3.git synced 2026-10-31 18:21:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 0adf0d9d28 Merge pull request #20 from pnoker/dev 张红元 2019-07-11 09:24:06 +08:00
  • 914a4ef2e1 Merge pull request #20 from pnoker/dev pnoker 2019-07-11 09:24:06 +08:00
  • ed1f205252 去掉web端源码，后期需要迁移至单独工程中 pnoker 2019-07-10 13:49:47 +08:00
  • ada2c16b2a chore: remove dc3-web frontend submodule from monorepo pnoker 2019-07-10 13:49:47 +08:00
  • bd8ebdc0b2 Merge pull request #18 from pnoker/dev 张红元 2019-07-09 22:01:14 +08:00
  • 42c7aca9a3 Merge pull request #18 from pnoker/dev pnoker 2019-07-09 22:01:14 +08:00
  • 4931200de8 日常调整 pnoker 2019-07-09 17:35:29 +08:00
  • 6ff025ffaf build: centralize spring-boot repackage config and align module dockerfiles pnoker 2019-07-09 17:35:29 +08:00
  • e1ed1e77a9 api接口安全校验 pnoker 2019-07-08 22:14:15 +08:00
  • 8d7bedc633 security: add feign security configurer and tighten nginx config pnoker 2019-07-08 22:14:15 +08:00
  • 4df2a29cf5 Merge pull request #17 from pnoker/add-code-of-conduct-1 张红元 2019-07-08 16:23:55 +08:00
  • b4aa49d1f6 Merge pull request #17 from pnoker/add-code-of-conduct-1 pnoker 2019-07-08 16:23:55 +08:00
  • 845b98f840 Create CODE_OF_CONDUCT.md 张红元 2019-07-08 16:23:41 +08:00
  • c7cdefd751 docs: add code of conduct pnoker 2019-07-08 16:23:41 +08:00
  • 0faa4bb48a Merge pull request #16 from pnoker/dev 张红元 2019-07-06 11:55:55 +08:00
  • 8e842a29a1 Merge pull request #16 from pnoker/dev pnoker 2019-07-06 11:55:55 +08:00
  • aa4b18dcb2 . pnoker 2019-07-05 21:47:07 +08:00
  • ad9254010f build: add nginx reverse proxy config and update all module dockerfiles pnoker 2019-07-05 21:47:07 +08:00
  • a15a47f70f Merge pull request #15 from pnoker/dev 张红元 2019-07-05 16:19:34 +08:00
  • f94053eb89 Merge pull request #15 from pnoker/dev pnoker 2019-07-05 16:19:34 +08:00
  • fae89dce24 nginx-rtmp打包到基础镜像中去 pnoker 2019-07-05 16:18:44 +08:00
  • 7f9bb56275 build: extract nginx-rtmp build into dedicated nginx base dockerfile pnoker 2019-07-05 16:18:44 +08:00
  • d8ccdcd828 Merge pull request #14 from pnoker/dev 张红元 2019-07-05 15:19:12 +08:00
  • bb7c24de9c Merge pull request #14 from pnoker/dev pnoker 2019-07-05 15:19:12 +08:00
  • 0db2277a11 ffmpeg打包到基础镜像中去 pnoker 2019-07-05 15:17:16 +08:00
  • 6e7176efb2 build: move ffmpeg build into base image and slim all module dockerfiles pnoker 2019-07-05 15:17:16 +08:00
  • ca31cf38ec Merge pull request #13 from pnoker/dev 张红元 2019-07-05 14:54:08 +08:00
  • 5990817f65 Merge pull request #13 from pnoker/dev pnoker 2019-07-05 14:54:08 +08:00
  • 50aac8a2ae 调整docker版本 pnoker 2019-07-05 14:51:55 +08:00
  • 9867bcfa0b build: update docker base image versions and add rtmp dockerfile pnoker 2019-07-05 14:51:55 +08:00
  • cc295bdc28 iot dc3 docker base images pnoker 2019-07-05 13:27:44 +08:00
  • 1c811f720a build: add initial docker base image dockerfile pnoker 2019-07-05 13:27:44 +08:00
  • 4dea398d88 Merge pull request #12 from pnoker/dev 张红元 2019-07-04 14:37:53 +08:00
  • e0927a012c Merge pull request #12 from pnoker/dev pnoker 2019-07-04 14:37:53 +08:00
  • dd7dee9d20 . pnoker 2019-07-04 14:35:36 +08:00
  • 0a995d1f9a build(compose): expand docker-compose service definitions pnoker 2019-07-04 14:35:36 +08:00
  • a6fa508730 修改工程打包内容，调整dockerfile pnoker 2019-07-03 23:10:30 +08:00
  • e42bf4ac06 build: add Dockerfiles and spring-boot-maven-plugin to all modules pnoker 2019-07-03 23:10:30 +08:00
  • 1a6c24fe18 . pnoker 2019-07-03 20:08:32 +08:00
  • b0e146d176 chore: remove express data-helper scaffold and restructure parent pom pnoker 2019-07-03 20:08:32 +08:00
  • 10cf40fde8 update readme pnoker 2019-07-03 16:48:00 +08:00
  • 7bc476b158 docs: fix typo in README pnoker 2019-07-03 16:48:00 +08:00
  • 72903f39e9 Merge pull request #11 from pnoker/dev 张红元 2019-07-03 16:38:27 +08:00
  • 72108102af Merge pull request #11 from pnoker/dev pnoker 2019-07-03 16:38:27 +08:00
  • e4ed03107d 配置docker网络，调整架构图 pnoker 2019-07-03 16:12:30 +08:00
  • 02b29b77b5 build(compose): refactor docker-compose networking and add mariadb Dockerfile pnoker 2019-07-03 16:12:30 +08:00
  • 8b736c9f4b 提交注册中心Host设置 pnoker 2019-07-02 23:18:10 +08:00
  • ed3bffe9b2 fix(config): set eureka hostname to docker service name in all application.yml files pnoker 2019-07-02 23:18:10 +08:00
  • ad72093a15 Merge pull request #10 from pnoker/dev 张红元 2019-07-01 23:53:08 +08:00
  • d88876dd2b Merge pull request #10 from pnoker/dev pnoker 2019-07-01 23:53:08 +08:00
  • d2b845c7c4 更新readme pnoker 2019-07-01 23:51:22 +08:00
  • 62f2035667 docs: add line to README pnoker 2019-07-01 23:51:22 +08:00
  • c5ed740ff2 docker config‘ pnoker 2019-07-01 23:19:13 +08:00
  • ad0be63ec6 docs: expand docker configuration section in README pnoker 2019-07-01 23:19:13 +08:00
  • afdad55ab6 调整docker设置 pnoker 2019-07-01 17:27:46 +08:00
  • db488614ab build(compose): add mariadb, rabbitmq, and redis dependency Dockerfiles with init scripts pnoker 2019-07-01 17:27:46 +08:00
  • dc857123f4 添加docker配置 pnoker 2019-06-30 23:16:05 +08:00
  • 6525f6a230 feat(driver): add dc3-rtmp module and integrate into multi-module build v2019.6.30 pnoker 2019-06-30 23:16:05 +08:00
  • 2e2c599062 优化pom配置 pnoker 2019-06-30 00:16:32 +08:00
  • 69616f17cd refactor(build): consolidate pom dependencies and add Dockerfiles to manager and gateway modules pnoker 2019-06-30 00:16:32 +08:00
  • 722a955bca 明文添加加密 pnoker 2019-06-29 16:18:23 +08:00
  • ac14c65998 feat(security): add jasypt encryption to application configs and docker-compose pnoker 2019-06-29 16:18:23 +08:00
  • 41f495dc5f pom pnoker 2019-06-29 15:15:15 +08:00
  • 5e4fd9a12c build: add dependency management entries to root pom pnoker 2019-06-29 15:15:15 +08:00
  • 49b9949e48 设置数据库服务 pnoker 2019-06-29 15:09:53 +08:00
  • e9c914ca2e feat(auth): add WebSecurityConfigurer to dbs and collect modules pnoker 2019-06-29 15:09:53 +08:00
  • baba7bba93 调整注册中心和管理中心 pnoker 2019-06-29 14:34:49 +08:00
  • 774144f3a2 feat(auth): add WebSecurityConfigurer to monitor and register centers pnoker 2019-06-29 14:34:49 +08:00
  • 7bcbafeae5 调整 pnoker 2019-06-29 13:56:31 +08:00
  • e982e33a89 build: expand root pom with dependency management and plugin configuration pnoker 2019-06-29 13:56:31 +08:00
  • cc595e56dd Merge pull request #9 from pnoker/dev 张红元 2019-06-26 23:49:40 +08:00
  • bd801041ed Merge pull request #9 from pnoker/dev pnoker 2019-06-26 23:49:40 +08:00
  • 87a8deb565 版本调整和设备组数采程序线程和队列的建立 pnoker 2019-06-26 23:47:25 +08:00
  • 7fb751e507 feat(driver): add WIA data service, controller, and receive thread in dc3-group pnoker 2019-06-26 23:47:25 +08:00
  • 26c1eeb96c Merge pull request #8 from pnoker/dev 张红元 2019-06-23 22:55:49 +08:00
  • 9701f93938 Merge pull request #8 from pnoker/dev pnoker 2019-06-23 22:55:49 +08:00
  • a0f715e0d4 资源服务器 pnoker 2019-06-23 22:54:01 +08:00
  • 4f5ed7a1b9 feat(transfer): add layui static assets and error/mp4 templates to dc3-resource pnoker 2019-06-23 22:54:01 +08:00
  • 333db7000b 提交Wia数据相关类 pnoker 2019-06-22 23:19:41 +08:00
  • 1316cd855b feat(driver): add WIA/HART data beans and dc3-group device module pnoker 2019-06-22 23:19:41 +08:00
  • 365c9a6a33 消息组件模块调整 pnoker 2019-06-21 20:55:34 +08:00
  • eaffeadaea refactor(center): move dc3-message to dc3-center and add AMQP/MQTT/WebSocket controllers pnoker 2019-06-21 20:55:34 +08:00
  • c106a6afec 添加消息组件模块配置 pnoker 2019-06-17 21:02:13 +08:00
  • e5dd08c373 feat(transfer): add dc3-message module with AMQP messaging configuration pnoker 2019-06-17 21:02:13 +08:00
  • 15b63310bc Merge pull request #7 from pnoker/dev 张红元 2019-06-17 14:02:42 +08:00
  • 071e5a30e1 Merge pull request #7 from pnoker/dev pnoker 2019-06-17 14:02:42 +08:00
  • b1dd422eb4 结构调整 pnoker 2019-06-17 13:58:23 +08:00
  • 8370b18ad9 refactor: reorganize modules into dc3-center with dbs, monitor, and register submodules pnoker 2019-06-17 13:58:23 +08:00
  • 47b3556f5a Merge pull request #5 from pnoker/dev 张红元 2019-06-13 13:40:33 +08:00
  • ef153d97f6 Merge pull request #5 from pnoker/dev pnoker 2019-06-13 13:40:33 +08:00
  • 313d338b67 提交plcs7功能 pnoker 2019-06-10 23:06:41 +08:00
  • fb99130dea feat(driver): add PLC S7 WebSocket controller and config classes pnoker 2019-06-10 23:06:41 +08:00
  • 51a88873cd vue upgrade pnoker 2019-06-10 21:30:36 +08:00
  • 6306d065c4 build(web): upgrade vue dependencies in data-helper yarn.lock pnoker 2019-06-10 21:30:36 +08:00
  • 102d103d38 Merge pull request #3 from pnoker/dev 张红元 2019-06-09 23:10:24 +08:00
  • eab0331494 Merge pull request #3 from pnoker/dev pnoker 2019-06-09 23:10:24 +08:00
  • 45a6b14300 readme pnoker 2019-06-09 23:00:21 +08:00
  • 5f5d6ef67c docs: rewrite README with updated architecture overview pnoker 2019-06-09 23:00:21 +08:00
  • d3a56e1643 调整 pnoker 2019-06-09 21:45:11 +08:00
  • a26ac1065d docs: fix README content pnoker 2019-06-09 21:45:11 +08:00