Commit Graph

35 Commits (5ba5f0a01b2445ed67c6e40579c7cbd307522607)

Author SHA1 Message Date
yuan b3a79bbade feat:http请求 2024-10-10 20:30:44 +08:00
yuan 26e1591f43 feat():增加ip轮询 2024-10-08 20:01:54 +08:00
Yueng 54f0aee961 Merge remote-tracking branch 'origin/dev.yang' into dev
# Conflicts:
#	cloud-auth/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
2024-10-08 01:45:18 +08:00
WeiRan 748d4be165 Merge branch 'dev.wei' into dev 2024-10-07 23:48:17 +08:00
WeiRan df1c9ad9e8 feat():修改企业入驻 2024-10-07 23:44:14 +08:00
Aaaaaaaa e6e7e58f95 移除冗余代码并优化Kafka配置
- 删除了KafkaConstants、KafkaConsumerConfig和KafkaProviderConfig类,这些类已被移动到其他项目中
-简化了KafkaConfig类,移除了其中的kafkaProducer方法,该方法已被移动到其他类中
- 在MqttTest类中更新了Kafka主题的硬编码值
- 移除了oneMse类,该类用于测试,目前不再需要
- 在ProtocolApplication的main方法中添加了一个空的System.out.println语句,用于调试或日志记录
2024-10-07 14:22:46 +08:00
WeiRan 7063af945e feat():完成saas切换登录切换数据源 2024-10-06 20:17:45 +08:00
Yueng 6e4b268730 fine()添加车辆缓存 2024-10-06 10:57:31 +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
张腾 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 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
张腾 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 0d82041676 Merge branch 'xxy' into dev 2024-09-30 10:12:22 +08:00
Aaaaaaaa 7a88f1da14 修改报错 2024-09-30 10:11:40 +08:00
WeiRan 3bf6f0d929 更新 2024-09-29 22:18:34 +08:00
Yueng 5688271d2c fine()修改mybatis plus 2024-09-29 00:10:46 +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 5b1c1a27a9 Merge branch 'dev.yang' 2024-09-27 11:01:15 +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
张腾 262899c57e saas1提交 2024-09-26 14:34:09 +08:00
张腾 6d682e1423 saas初始 2024-09-25 20:22:59 +08:00
Yueng 178d4966b5 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-25 19:54:42 +08:00
Yueng c174e8adab 添加解绑操作 2024-09-25 19:53:11 +08:00
Yueng 10981bc80d 查询中间表,添加车辆中间表围栏组围栏表信息 2024-09-24 11:08:21 +08:00
yuan 833e554722 feat():连接车辆类型与模板 2024-09-23 10:59:43 +08:00
Yueng 41918d6303 初始化 2024-09-21 20:47:42 +08:00
Yueng 86eb16420b 初始化 2024-09-21 20:47:11 +08:00
yuan b3ce3825ad Merge branch 'master' of https://gitea.qinmian.online/a_bazu/cloud-server-8 into psr
# Conflicts:
#	cloud-common/pom.xml
#	cloud-modules/pom.xml
2024-09-21 12:01:55 +08:00
张腾 0a01ca8497 初始化 2024-09-21 11:52:20 +08:00
yuan 6a413e0ce0 feat():初始化 2024-09-21 11:51:40 +08:00
张腾 14da1917c3 初始化 2024-09-19 21:07:54 +08:00
张腾 fac31cb7a8 初始化 2024-09-14 17:47:45 +08:00