 刘武
|
ca505dc2c4
|
fix(): 代码合并
|
2024-10-07 21:35:30 +08:00 |
|
刘武
|
c90845d508
|
Merge remote-tracking branch 'origin/dev.event' into dev
# Conflicts:
# cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/producer/RabbitMQProducerUtil.java
# cloud-common/cloud-common-rabbit/src/main/java/com/muyu/rabbitmq/consumer/RabbitMQConsumerUtil.java
# cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/TemplateController.java
|
2024-10-07 21:31:48 +08:00 |
|
刘武
|
c1f24c8d03
|
Merge remote-tracking branch 'origin/dev.business' into dev
# Conflicts:
# cloud-common/cloud-common-kafka/pom.xml
# cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java
# cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarController.java
|
2024-10-07 20:52:29 +08:00 |
袁子龙
|
abf186e99c
|
test:()修改企业添加
|
2024-10-07 19:41:03 +08:00 |
 Number7
|
c539a55f1e
|
fix():将协议解析中的取值换成Redis缓存
|
2024-10-07 14:07:32 +08:00 |
|
刘武
|
9499d9738e
|
fix(): 事件基础
|
2024-10-07 12:06:18 +08:00 |
|
袁子龙
|
ae7294da6f
|
fix:()修改为Mybatis-Plus方法
|
2024-10-06 20:39:40 +08:00 |
|
袁子龙
|
fe3ce0e291
|
fix:()修改为Mybatis-Plus方法
|
2024-10-06 20:34:13 +08:00 |
|
袁子龙
|
bd0214ccd9
|
fix:()修改为Mybatis-Plus方法
|
2024-10-06 20:32:33 +08:00 |
|
袁子龙
|
875391757f
|
fix:()补全swagger接口文档
|
2024-10-06 16:17:34 +08:00 |
|
袁子龙
|
b9c4334cb5
|
style:()删除无用的测试类
|
2024-10-06 14:35:47 +08:00 |
|
袁子龙
|
a63bde6c84
|
fix:()kafka读取不到的问题
|
2024-10-06 10:09:48 +08:00 |
|
Number7
|
8c90364eaa
|
feat():修改协议解析方法
|
2024-10-04 16:57:45 +08:00 |
|
Number7
|
a3613176f3
|
Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev
|
2024-10-02 16:49:07 +08:00 |
|
Number7
|
d82ae07d37
|
feat():删除车辆管理中不必要的注入
|
2024-10-02 16:48:33 +08:00 |
|
Number7
|
9846c72b3b
|
Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev
|
2024-10-02 16:39:56 +08:00 |
|
Number7
|
53ff3d70c9
|
fix():完善kafka的报错
|
2024-10-02 16:38:11 +08:00 |
|
袁子龙
|
709878fbab
|
Merge branch 'dev.business' into dev
|
2024-10-02 16:33:16 +08:00 |
 86191
|
6dd3d73f62
|
fix():把saas缓存对象换成缓存列表
|
2024-10-02 16:23:41 +08:00 |
|
86191
|
2623669eb0
|
fix():把saas缓存对象换成缓存列表
|
2024-10-02 16:22:39 +08:00 |
|
86191
|
3a8b35b710
|
fix():把saas缓存对象换成缓存列表
|
2024-10-02 16:21:58 +08:00 |
|
袁子龙
|
cb8867d0ee
|
chore:修改企业管理字段
|
2024-10-02 15:14:50 +08:00 |
|
袁子龙
|
ba8009fd8d
|
chore:修改企业管理字段
|
2024-10-02 14:49:25 +08:00 |
|
袁子龙
|
954a8939c6
|
feat:新增企业管理添加
|
2024-10-02 14:39:19 +08:00 |
|
Number7
|
59050208a0
|
Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev
|
2024-10-02 11:03:52 +08:00 |
|
Number7
|
008efdde25
|
fix():修改协议解析方法
|
2024-10-02 11:03:21 +08:00 |
|
86191
|
217af96abc
|
feat():缓存各个模块对象
|
2024-10-02 10:57:46 +08:00 |
|
86191
|
b5a2687491
|
Merge remote-tracking branch 'origin/dev.operation' into dev
# Conflicts:
# cloud-auth/src/main/resources/bootstrap.yml
# cloud-gateway/src/main/resources/bootstrap.yml
# cloud-modules/cloud-event/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-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java
# cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java
# cloud-modules/saas/saas-server/src/main/resources/bootstrap.yml
|
2024-10-02 10:35:35 +08:00 |
|
86191
|
370a91773e
|
feat():缓存各个模块对象
|
2024-10-02 10:33:14 +08:00 |
|
Number7
|
708214b86e
|
Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev
|
2024-10-02 10:05:02 +08:00 |
|
86191
|
476d6ae0b7
|
feat():围栏和故障的缓存
|
2024-09-30 18:45:08 +08:00 |
|
Number7
|
a13ba8199a
|
fix():修改协议解析方法
|
2024-09-30 17:00:05 +08:00 |
|
袁子龙
|
fe90a341ff
|
Merge remote-tracking branch 'origin/dev.business' into dev
|
2024-09-30 16:48:27 +08:00 |
|
Number7
|
76440e1c98
|
feat():增加协议解析模块
|
2024-09-30 16:37:24 +08:00 |
|
Number7
|
82ec79ccaf
|
fix():修改报文基础类型方法
|
2024-09-30 15:47:20 +08:00 |
|
Number7
|
551f5f5496
|
Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev
# Conflicts:
# cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java
|
2024-09-30 15:28:30 +08:00 |
|
Number7
|
8e0e492555
|
fix():修改报文基础类型方法
|
2024-09-30 15:27:28 +08:00 |
|
Number7
|
6545fc79ef
|
feat():增加添加报文模版功能
|
2024-09-30 14:40:07 +08:00 |
|
袁子龙
|
051fe490d6
|
feat:企业入驻
|
2024-09-30 11:31:41 +08:00 |
|
袁子龙
|
f93af8b4a6
|
Merge remote-tracking branch 'origin/dev.business' into dev
# Conflicts:
# cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/CarType.java
# cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/DataType.java
# cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplate.java
# cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplateType.java
# cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCar.java
# cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarLog.java
# cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/Template.java
# cloud-modules/saas/saas-server/src/main/java/com/muyu/server/config/MqttConfigure.java
# cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java
|
2024-09-30 11:00:49 +08:00 |
|
Number7
|
1f072d4ca2
|
fix():修改报文接口字段问题
|
2024-09-30 10:29:58 +08:00 |
|
86191
|
d586c26468
|
Merge branch 'master' of https://gitea.qinmian.online/group-four/cloud-car
# Conflicts:
# cloud-common/pom.xml
|
2024-09-30 09:23:34 +08:00 |
|
86191
|
7b36e4b359
|
feat():围栏和故障的缓存
|
2024-09-30 09:22:46 +08:00 |
|
袁子龙
|
29cb1ffadb
|
refactor:修改注释
|
2024-09-29 22:03:51 +08:00 |
|
袁子龙
|
2488248967
|
refactor:修改注释
|
2024-09-29 16:12:34 +08:00 |
|
袁子龙
|
dea0f07c90
|
refactor:修改注释
|
2024-09-29 16:03:17 +08:00 |
|
Number7
|
0228051467
|
Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev
|
2024-09-29 15:12:21 +08:00 |
|
Number7
|
dfacea67f6
|
修改实体类规范
|
2024-09-29 15:11:57 +08:00 |
|
袁子龙
|
688154709d
|
refactor:修改注释
|
2024-09-29 14:51:02 +08:00 |
|
刘武
|
c35dea9159
|
Merge branch 'dev' of https://gitea.qinmian.online/group-four/cloud-car into dev
|
2024-09-29 12:29:08 +08:00 |