Commit Graph

164 Commits (d21aab7ef91b663b880c6dbce9af2ed2c10cbcfe)

Author SHA1 Message Date
Number7 d21aab7ef9 Merge remote-tracking branch 'origin/dev' into dev 2024-10-11 19:55:34 +08:00
Number7 761a186777 feat():新增数据预警 2024-10-11 19:54:43 +08:00
SuiXxx f68c4ca325 feat():接受HTTP请求 2024-10-11 19:52:47 +08:00
袁子龙 24b8fe4085 Merge remote-tracking branch 'origin/dev.business' into dev
# Conflicts:
#	cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/EnterpriseController.java
#	cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/EnterpriseServiceImpl.java
2024-10-10 22:25:22 +08:00
袁子龙 13a67257fc Merge branch 'dev' of https://gitea.qinmian.online/group-four/cloud-car into dev 2024-10-10 22:24:42 +08:00
袁子龙 b04f697547 text:()修改企业入入驻 2024-10-10 22:24:30 +08:00
袁子龙 585656aa46 text:()修改企业入入驻 2024-10-10 22:24:27 +08:00
袁子龙 55ed020ac7 test:()去除无用的对象 2024-10-10 22:24:21 +08:00
袁子龙 cedad4d7b9 test:()去除重复的企业对象 2024-10-10 22:24:21 +08:00
袁子龙 c8f912393d test:()修改企业对象 2024-10-10 22:24:21 +08:00
袁子龙 0be030416f test:()修改故障 2024-10-10 22:24:21 +08:00
袁子龙 40fccdbc56 test:()修改企业添加 2024-10-10 22:24:18 +08:00
袁子龙 b8a7658ce5 text:()修改企业入入驻 2024-10-10 22:21:48 +08:00
袁子龙 a8cdd55797 text:()修改企业入入驻 2024-10-10 22:21:06 +08:00
Number7 1960d9dd90 Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev 2024-10-10 19:54:59 +08:00
Number7 2308d974be fix():数据预警编写修改 2024-10-10 19:53:34 +08:00
SuiXxx b26bb59183 Merge branch 'dev' of https://gitea.qinmian.online/group-four/cloud-car into dev 2024-10-10 19:52:57 +08:00
SuiXxx 1a62dd6f96 feat():轮询 2024-10-10 17:20:16 +08:00
袁子龙 6779e2120e text:()修改企业入入驻 2024-10-10 14:01:21 +08:00
袁子龙 b9ce76ca15 text:()修改企业入入驻 2024-10-10 11:45:55 +08:00
Number7 2e940349ef Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev
# Conflicts:
#	cloud-auth/src/main/resources/bootstrap.yml
#	cloud-gateway/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-event/src/main/java/com/muyu/event/consumer/MessageConsumer.java
#	cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-vehiclegateway/src/main/resources/bootstrap.yml
#	cloud-modules/saas/saas-server/src/main/java/com/muyu/server/SaasApplication.java
#	cloud-modules/saas/saas-server/src/main/resources/bootstrap.yml
2024-10-10 09:28:44 +08:00
Number7 cf286d48f9 feat():新增数据预警 2024-10-10 09:26:52 +08:00
袁子龙 ec57579533 test:()去除无用的对象 2024-10-09 17:18:04 +08:00
袁子龙 4cbfb65109 test:()去除重复的企业对象 2024-10-09 17:16:17 +08:00
袁子龙 acd7ad9fb4 test:()修改企业对象 2024-10-09 17:13:08 +08:00
袁子龙 b266460a0a test:()修改故障 2024-10-09 17:08:19 +08:00
袁子龙 d7fa72be80 Merge remote-tracking branch 'origin/dev' into dev.business
# Conflicts:
#	cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/EnterpriseController.java
#	cloud-modules/saas/saas-server/src/main/resources/bootstrap.yml
2024-10-09 16:50:46 +08:00
Number7 88fdcfcbab Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev 2024-10-08 20:02:50 +08:00
Number7 79f9309c0f fix():完善数据预警方法 2024-10-08 20:02:00 +08:00
Number7 0aa33b36a0 Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev 2024-10-08 17:12:00 +08:00
Number7 d5d17321ff fix():修复协议解析 2024-10-08 17:11:03 +08:00
Number7 6e5e07af85 Merge remote-tracking branch 'origin/dev' into dev 2024-10-08 11:56:49 +08:00
Number7 d0e51b14b1 Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev 2024-10-08 11:56:30 +08:00
Number7 4548e2c781 fix():删除冗余代码 2024-10-08 11:55:04 +08:00
袁子龙 59c16de298 test:()修改企业入驻 2024-10-08 11:46:04 +08:00
袁子龙 efa6861d2f test:()修改企业添加 2024-10-08 11:31:17 +08:00
刘武 0ebf046e25 fix(): 代码合并 2024-10-08 10:05:09 +08:00
袁子龙 2773a13270 test:()修改企业添加 2024-10-08 09:15:15 +08:00
刘武 2a0bd1178e Merge remote-tracking branch 'origin/dev.vehiclegateway' into dev 2024-10-08 09:03:44 +08:00
刘武 97994a0452 fix(): 代码合并 2024-10-07 22:38:09 +08:00
SuiXxx cd5e46b650 feat():项目启动创建交换机 2024-10-07 21:51:04 +08:00
SuiXxx f6baa83c94 Merge remote-tracking branch 'origin/dev' into dev.vehiclegateway 2024-10-07 21:39:34 +08:00
SuiXxx 2235097f05 feat():账号密码存入数据库 2024-10-07 21:39:01 +08:00
刘武 9e94cf5674 Merge branch 'dev' of https://gitea.qinmian.online/group-four/cloud-car into dev 2024-10-07 21:35:45 +08:00
刘武 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
刘武 f45e6865d9 Merge remote-tracking branch 'origin/dev.template' into dev 2024-10-07 20:39:38 +08:00
袁子龙 abf186e99c test:()修改企业添加 2024-10-07 19:41:03 +08:00
Number7 2186c58122 Merge remote-tracking branch 'refs/remotes/origin/dev.template' into dev 2024-10-07 14:31:00 +08:00