 Aaaaaaaa
|
6c2daa0d7e
|
Merge branch 'master' into xxy
# Conflicts:
# cloud-modules/cloud-modules-protocolparsing/src/main/java/com/muyu/mqtt/Demo.java
|
2024-10-02 10:23:47 +08:00 |
|
Aaaaaaaa
|
5a64054615
|
Merge branch 'master' of https://gitea.qinmian.online/a_bazu/cloud-server-8
|
2024-10-02 10:22:59 +08:00 |
 张腾
|
903fecc2cc
|
121
|
2024-10-02 10:22:41 +08:00 |
|
张腾
|
e46b6325c4
|
整合 Kafka依赖并更新版本管理
- 在 cloud-common-kafka模块中添加 cloud-common-core依赖
- 移除 cloud-modules-carData 中的 Kafka 依赖版本声明
- 在根 pom.xml 中统一管理 Kafka 依赖版本
- 更新 cloud-common-kafka 依赖版本为 3.6.3
|
2024-10-02 10:10:10 +08:00 |
|
Aaaaaaaa
|
217ffd81ab
|
Merge branch 'master' into xxy
|
2024-10-02 10:00:30 +08:00 |
|
Aaaaaaaa
|
b2c16300f4
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# cloud-common/cloud-common-kafka/pom.xml
# cloud-common/cloud-common-kafka/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
|
2024-10-02 09:58:47 +08:00 |
|
Aaaaaaaa
|
b07b7a1d2d
|
添加Kafka消息队列配置和常量类
- 新增KafkaConstants类，定义Kafka主题和消费组常量
- 新增KafkaConsumerConfig类，配置Kafka消费者
- 新增KafkaProviderConfig类，配置Kafka生产者
- 添加AutoConfiguration.imports文件，导入Kafka配置类
- 创建cloud-common-kafka模块的pom.xml文件，添加依赖
|
2024-10-02 09:58:09 +08:00 |
|
张腾
|
614ddceebc
|
删除了IoTDB相关的实体类、接口和注解。这些代码可能已经移动到另一个位置或者不再需要这些结构。受影响的代码包括：
- 删除了`com.muyu.carData.domain.IoTDBRecord`实体类，它用于定义IoT数据库记录。
- 删除了`com.muyu.carData.interfaces.IoTDBRecordable`接口，它定义了如何将对象转换为IoTDBRecord。
- 删除了`com.muyu.carData.annotation.IoTTableName`注解，它用于标记类对应IoT数据库表的名称。
- 删除了`com.muyu.carData.constract.IoTDBTableParam`类，它包含IoT数据库表参数的常量定义。
|
2024-10-02 09:43:00 +08:00 |
|
张腾
|
a17d1b4557
|
feat():修复合并代码
|
2024-10-02 09:38:43 +08:00 |
|
Aaaaaaaa
|
057ad3ded5
|
Merge branch 'master' into xxy
|
2024-10-02 09:31:55 +08:00 |
|
张腾
|
1542f34db3
|
Merge remote-tracking branch 'origin/dev.carData' into dev
# Conflicts:
# cloud-common/pom.xml
|
2024-10-02 09:28:58 +08:00 |
|
张腾
|
87b3eccff5
|
feat():更新最新代码
|
2024-10-02 09:12:44 +08:00 |
|
Aaaaaaaa
|
735e7f56e0
|
协议解析:完成解析方法实现kafka的投产,并拆入自己的模块
|
2024-09-30 20:58:08 +08:00 |
|
张腾
|
af798f18e5
|
feat():编辑卡夫卡代码
|
2024-09-30 16:52:26 +08:00 |
|
Aaaaaaaa
|
0d82041676
|
Merge branch 'xxy' into dev
|
2024-09-30 10:12:22 +08:00 |
|
Aaaaaaaa
|
7a88f1da14
|
修改报错
|
2024-09-30 10:11:40 +08:00 |
|
niuwu666
|
b4f832925c
|
Merge pull request 'dev.carData' (#4) from dev.carData into dev
Reviewed-on: #4
|
2024-09-30 09:04:26 +08:00 |
|
张腾
|
5ab005839c
|
commit()yml
|
2024-09-30 09:03:40 +08:00 |
|
张腾
|
6f52789cc0
|
commit()yml
|
2024-09-30 09:03:17 +08:00 |
 WeiRan
|
4aebd67ebc
|
更新
|
2024-09-29 22:46:04 +08:00 |
|
WeiRan
|
207125c795
|
Merge branch 'master' of https://gitea.qinmian.online/a_bazu/cloud-server-8 into dev
# Conflicts:
# cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java
|
2024-09-29 22:23:10 +08:00 |
|
WeiRan
|
3bf6f0d929
|
更新
|
2024-09-29 22:18:34 +08:00 |
Yueng
|
f07d95abeb
|
fine()代码修改
|
2024-09-29 22:17:00 +08:00 |
|
WeiRan
|
f27b14dc33
|
更新
|
2024-09-29 17:51:53 +08:00 |
|
Yueng
|
aedee04643
|
fine()配置类提交
|
2024-09-29 17:16:32 +08:00 |
|
WeiRan
|
1627aa3dab
|
修改bug
|
2024-09-29 16:53:08 +08:00 |
|
niuwu666
|
fa3b9b2244
|
Merge pull request 'dev.carData' (#3) from dev.carData into master
Reviewed-on: #3
|
2024-09-29 10:21:36 +08:00 |
|
WeiRan
|
8d7ad9cdb9
|
修改pom配置
|
2024-09-29 10:19:55 +08:00 |
|
Yueng
|
13bb25f4da
|
fine()配置类提交
|
2024-09-29 10:14:43 +08:00 |
|
张腾
|
25bc628f8f
|
时序性数据库测试成功
|
2024-09-29 01:17:24 +08:00 |
|
Yueng
|
5688271d2c
|
fine()修改mybatis plus
|
2024-09-29 00:10:46 +08:00 |
|
WeiRan
|
83312b8e37
|
修改代码，mybatis->mybatis-plus
|
2024-09-28 22:33:22 +08:00 |
|
WeiRan
|
fa36d029af
|
所有注释补全
|
2024-09-28 19:28:54 +08:00 |
|
WeiRan
|
07a60444aa
|
所有注释补全
|
2024-09-28 17:41:48 +08:00 |
|
Yueng
|
60b63b758e
|
fine()修改mybatis plus
|
2024-09-28 17:35:25 +08:00 |
|
张腾
|
b299c8d3a1
|
配置
|
2024-09-28 12:30:20 +08:00 |
|
Yueng
|
ac21236123
|
fine()sass模块初始化
|
2024-09-28 12:28:53 +08:00 |
|
Yueng
|
016887afc2
|
Merge remote-tracking branch 'origin/psr'
# Conflicts:
# cloud-gateway/src/main/resources/bootstrap.yml
# cloud-modules/cloud-Saas-Service/src/main/resources/bootstrap.yml
# cloud-modules/cloud-Vehicle-Simulation/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarInformationController.java
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarMessageController.java
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessage.java
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/CarInformationMapper.java
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/CarMessageService.java
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/Impl/CarInformationServiceImpl.java
# cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-car/src/main/resources/mapper/car/CarInformationMapper.xml
# cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml
# cloud-modules/pom.xml
# pom.xml
|
2024-09-27 12:07:08 +08:00 |
|
Yueng
|
52dbb5a08b
|
fine()配置
|
2024-09-27 11:52:47 +08:00 |
|
Yueng
|
c415b7676f
|
Merge remote-tracking branch 'origin/dev.wei'
# Conflicts:
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarInformationController.java
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarMessageController.java
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessage.java
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/CarInformationMapper.java
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/CarMessageService.java
# cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/Impl/CarInformationServiceImpl.java
# cloud-modules/cloud-modules-car/src/main/resources/mapper/car/CarInformationMapper.xml
# pom.xml
|
2024-09-27 11:52:11 +08:00 |
|
Yueng
|
5b1c1a27a9
|
Merge branch 'dev.yang'
|
2024-09-27 11:01:15 +08:00 |
|
Aaaaaaaa
|
22b3d12010
|
Merge remote-tracking branch 'origin/dev.xxy'
# Conflicts:
# cloud-modules/pom.xml
|
2024-09-26 15:18:21 +08:00 |
|
Aaaaaaaa
|
f6c1de2c6b
|
车辆管理
|
2024-09-26 15:05:48 +08:00 |
|
Yueng
|
29c84f90ef
|
Merge branch 'master' of https://gitea.qinmian.online/a_bazu/cloud-server-8 into dev.yang
# Conflicts:
# cloud-auth/src/main/resources/bootstrap.yml
# cloud-common/pom.xml
# cloud-gateway/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml
# cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
# cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
|
2024-09-26 14:57:53 +08:00 |
 yuan
|
122049419c
|
feat():连接车辆管理
|
2024-09-26 14:53:11 +08:00 |
|
WeiRan
|
1d8aea440b
|
更新
|
2024-09-26 14:47:00 +08:00 |
|
niuwu666
|
49fe2961f0
|
Merge pull request 'saas1提交' (#2) from dev.zhang into master
Reviewed-on: #2
|
2024-09-26 14:46:44 +08:00 |
|
张腾
|
262899c57e
|
saas1提交
|
2024-09-26 14:34:09 +08:00 |
|
weiran
|
25ad7f9da0
|
删除 cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
|
2024-09-26 10:13:24 +08:00 |
|
weiran
|
01aaf7f926
|
删除 cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
|
2024-09-26 10:12:37 +08:00 |