Commit Graph

207 Commits (31e78c3c3c49b43384210938ccb07b6034ad72c8)

Author SHA1 Message Date
lijiayao 9e489bd4ec feat: 事件系统 2024-04-05 08:36:56 +08:00
lijiayao ed31af73b5 Merge remote-tracking branch 'origin/server_five_fufanrui' into server_five_xiaoyao
# Conflicts:
#	couplet-auth/src/main/resources/bootstrap.yml
#	couplet-gateway/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-system/src/main/resources/bootstrap.yml
2024-04-04 15:05:23 +08:00
lijiayao 041aaa4654 feat: 事件系统 2024-04-04 15:04:25 +08:00
dongxiaodong 846073f528 删除没用的文件 2024-04-04 14:45:07 +08:00
ffr 0c71aec748 车辆管理 2024-04-04 14:37:20 +08:00
lijiayao 9e8106ab46 refactor: 修改框架 2024-04-04 09:48:53 +08:00
lijiayao 93ccc7535e Merge remote-tracking branch 'origin/server_five_liuyunhu' into server_five 2024-04-04 09:48:29 +08:00
liuyunhu 4da1d7c52e Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu 2024-04-04 09:43:21 +08:00
liuyunhu 562deda30a 修改远程调用 配置,有的变量没改导致调用不通 2024-04-04 09:43:08 +08:00
dongxiaodong eac6f6076d Merge branch 'server_five' into server_five_dongxiaodong
# Conflicts:
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelMessage.java
2024-04-04 09:00:38 +08:00
lijiayao ab079c7daf Merge remote-tracking branch 'origin/server_five' into server_five 2024-04-04 08:58:50 +08:00
lijiayao ad5626f0af refactor: 修改框架 2024-04-04 08:58:43 +08:00
ffr a9be065140 Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_fufanrui 2024-04-04 08:57:50 +08:00
liuyunhu f07dc734e4 远程调用 加自动配置扫描 2024-04-04 08:50:19 +08:00
dongxiaodong 2affa40686 删除没用的文件 2024-04-03 11:50:42 +08:00
ffr e027acc275 车辆管理 2024-04-03 11:38:59 +08:00
lijiayao 0c1cfb8f28 refactor: 修改框架 2024-04-03 11:27:17 +08:00
lijiayao 2352def47e refactor: 修改框架 2024-04-03 11:01:11 +08:00
dongxiaodong 703997bd9b dxd解析报文 2024-04-03 10:42:30 +08:00
lijiayao 6ab26976d6 Merge remote-tracking branch 'origin/server_five_liuyunhu' into server_five_xiaoyao
# Conflicts:
#	couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/constant/ServiceNameConstants.java
#	couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java
#	couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleService.java
#	couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleServiceImpl.java
2024-04-03 09:03:51 +08:00
lijiayao de572170ec Merge remote-tracking branch 'origin/server_five_fufanrui' into server_five_xiaoyao 2024-04-03 09:01:41 +08:00
lijiayao bbd9e52302 新增 2024-04-03 09:00:58 +08:00
ffr c7443b81d7 车辆管理 2024-04-03 08:38:24 +08:00
liuyunhu ffa06bc02e 虎虎虎虎 2024-04-03 08:35:23 +08:00
liuyunhu 4b80034baf Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu 2024-04-03 08:33:21 +08:00
dongxiaodong 3947f9414e dxd解析报文 2024-04-02 21:42:16 +08:00
dongxiaodong 99dc4e832f Merge remote-tracking branch 'origin/server_five_xiaoyao' into server_five_dongxiaodong
# Conflicts:
#	couplet-modules/couplet-analyze/couplet-analyze-msg/pom.xml
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
2024-04-02 21:38:56 +08:00
lijiayao 00369a6052 新增 2024-04-02 21:36:23 +08:00
lijiayao a9977b44a9 新增 2024-04-02 21:25:33 +08:00
dongxiaodong b644752443 dxd解析报文 2024-04-02 21:15:25 +08:00
lijiayao aaa5d4f868 Merge branch 'server_five_dongxiaodong' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_xiaoyao 2024-04-02 18:28:31 +08:00
dongxiaodong 72b634fcc1 dxd测试 2024-04-02 18:27:56 +08:00
lijiayao 8d54e991dc Merge remote-tracking branch 'origin/server_five_fufanrui' into server_five_xiaoyao 2024-04-02 17:05:30 +08:00
lijiayao 73c2c159e8 Merge remote-tracking branch 'origin/server_five_dongxiaodong' into server_five_xiaoyao 2024-04-02 16:57:19 +08:00
lijiayao 422ffa1f32 新增 2024-04-02 16:57:04 +08:00
dongxiaodong 0bbf40741c dxd测试 2024-04-02 16:56:39 +08:00
dongxiaodong 8d5e46108f Merge branch 'server_five_liuyunhu' into server_five_dongxiaodong
# Conflicts:
#	couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/service/MqttListen.java
#	couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml
#	couplet-modules/pom.xml
2024-04-02 15:22:18 +08:00
dongxiaodong 6c16191d90 dxd测试 2024-04-02 15:20:18 +08:00
liuyunhu 831ba2668c Merge branch 'server_five' into server_five_liuyunhu
# Conflicts:
#	couplet-modules/pom.xml
2024-04-02 14:47:25 +08:00
liuyunhu 08aec277e6 虎虎虎虎 2024-04-02 14:46:36 +08:00
dongxiaodong 757f51a2dd Merge branch 'server_five' into server_five_dongxiaodong
# Conflicts:
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/msg/CoupletMsgApplication.java
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/msg/consumer/KafkaConsumerQuickStart.java
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/msg/contents/KafkaContents.java
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/msg/producer/KafkaProducerQuickStart.java
2024-04-02 14:24:20 +08:00
lijiayao 5148ae5e14 chore: 新增解析系统模块 2024-04-02 14:23:01 +08:00
dongxiaodong 5b499eb8c3 Kafka测试 2024-04-02 14:22:55 +08:00
ffr f9ec95317c Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_fufanrui 2024-04-02 10:59:00 +08:00
liuyunhu c3aee00eff 虎虎虎虎 2024-04-02 09:07:40 +08:00
liuyunhu c884fc9a19 Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_liuyunhu
# Conflicts:
#	couplet-modules/pom.xml
2024-04-02 09:05:41 +08:00
liuyunhu a3f5055ef2 虎,添加上线模块 2024-04-02 09:03:26 +08:00
ffr fa79d7a83b 员工管理 2024-04-01 21:19:21 +08:00
dongxiaodong 143176fd5a Kafka测试 2024-04-01 20:48:43 +08:00
lijiayao 313fd4aa54 Merge remote-tracking branch 'origin/server_five_yuanyonghao' into server_five_xiaoyao
# Conflicts:
#	couplet-auth/src/main/resources/bootstrap.yml
2024-04-01 19:49:39 +08:00