one-YI
/
cloud-server
5
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: one-YI:97572f57122c6e00d13148a48a2dd05ce85920c7
Branches Tags
one-YI:dev
one-YI:dev.car.gateway
one-YI:dev.saas.platform
one-YI:dev.saas.RedisCar
one-YI:dev.vehicle.gateway
one-YI:dev.saas.customer
one-YI:dev.data.processing
one-YI:dev.protocol.parsing
one-YI:dev.data.processing.dataTreating
one-YI:master
...
compare: one-YI:15b1b6c639ed165e07cc78d09952309efa17c38e
Branches Tags
one-YI:dev
one-YI:dev.car.gateway
one-YI:dev.saas.platform
one-YI:dev.saas.RedisCar
one-YI:dev.vehicle.gateway
one-YI:dev.saas.customer
one-YI:dev.data.processing
one-YI:dev.protocol.parsing
one-YI:dev.data.processing.dataTreating
one-YI:master

76 Commits
97572f5712 ... 15b1b6c639

Author SHA1 Message Date
面包骑士 15b1b6c639 fix(): 修复合并异常与业务模块无法启动问题 2024-10-10 10:10:55 +08:00
面包骑士 5361b43bd7 fix(): 修复业务模块无法启动问题 2024-10-09 20:22:26 +08:00
面包骑士 583779765d style: 优化数据处理逻辑展示效果 2024-10-09 19:43:29 +08:00
面包骑士 4f9c9ecd65 feat: 优化Rabbit生产消费 2024-10-09 18:59:59 +08:00
面包骑士 465d39a4bf feat(): 优化Kafka逻辑,新增缓存工具类 2024-10-09 17:04:11 +08:00
DongZeLiang ed3a542066 feat()：增加缓存代码示例 2024-10-08 16:07:46 +08:00
DongZeLiang 2a3d68f51d feat()：增加缓存代码示例 2024-10-08 16:06:48 +08:00
DongZeLiang 9b41098f32 fix(): 修复数据源启动因空数据源导致程序启动失败的问题 2024-10-08 14:28:42 +08:00
chentaisen e4fa985e2f Merge remote-tracking branch 'origin/dev' into dev 2024-10-08 14:16:12 +08:00
chentaisen 8ce6502511 feat：修复 2024-10-08 14:16:02 +08:00
DongZeLiang 78c7834036 fix(): 修复启动类名称规范 2024-10-08 14:12:22 +08:00
chentaisen b22e3f54ef feat：合并w 2024-10-08 09:17:10 +08:00
chentaisen 5894089eef Merge branch 'dev.car.gateway' into dev 
# Conflicts:
#	cloud-auth/src/main/resources/bootstrap.yml
#	cloud-common/cloud-common-rabbit/pom.xml
#	cloud-common/cloud-common-rabbit/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	cloud-gateway/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-data-processing/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-openbusiness/cloud-modules-openbusiness-server/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/bootstrap.yml
#	cloud-modules/pom.xml
#	cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
#	init-file/cloud-system.sql
 2024-10-08 09:11:14 +08:00
chentaisen 3bd6aeb39d feat：合并 2024-10-07 22:38:34 +08:00
chentaisen cd41265b79 解决冲突文件 2024-10-07 22:06:53 +08:00
chentaisen 5bb57ecbb2 feat：合并 2024-10-07 20:51:58 +08:00
chentaisen eb59a2400a fix：合并 2024-10-07 20:28:52 +08:00
法外狂徒张三 8edcff3094 完成添加数据源，切换数据源功能 2024-10-07 18:36:36 +08:00
DongZeLiang 53426bf396 合并分支，移除多余代码 2024-10-07 14:35:26 +08:00
DongZeLiang b7a6278257 Merge branch 'dev.data.processing' into dev 
# Conflicts:
#	cloud-data-processing/pom.xml
#	cloud-data-processing/src/main/java/com/muyu/data/processing/MyDataApplication.java
#	cloud-data-processing/src/main/java/com/muyu/data/processing/controller/DataProcessingController.java
#	cloud-data-processing/src/main/java/com/muyu/data/processing/controller/TestController.java
#	cloud-data-processing/src/main/java/com/muyu/data/processing/domain/IotDbData.java
#	cloud-data-processing/src/main/java/com/muyu/data/processing/kafka/KafkaConsumerService.java
#	cloud-data-processing/src/main/java/com/muyu/data/processing/mapper/DataProcessingMapper.java
#	cloud-data-processing/src/main/java/com/muyu/data/processing/service/DataProcessingService.java
#	cloud-data-processing/src/main/java/com/muyu/data/processing/service/impl/DataProcessingServiceImpl.java
#	cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/StrategyHandler.java
#	cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/abstractStrategyRouter.java
#	cloud-data-processing/src/main/resources/bootstrap.yml
#	cloud-data-processing/src/main/resources/mapper/processing/DataProcessingMapper.xml
 2024-10-07 14:32:54 +08:00
张毅大神 a095941152 星星推送整合saas平台娜美克星人版 2024-10-07 14:22:20 +08:00
面包骑士 c29a08b0ff feat: 优化路由逻辑 2024-10-07 14:04:18 +08:00
面包骑士 c98804b1f4 feat: 完成kafka消费到数据处理的数据持久化 2024-10-07 11:34:36 +08:00
chentaisen b12076b5d5 feat():二次优化格式，增加firmCode 2024-10-07 10:22:59 +08:00
chentaisen ff492390b1 feat():修改格式 2024-10-07 09:58:50 +08:00
面包骑士 f10fe5c241 test: 测试持久化处理 2024-10-06 20:55:15 +08:00
面包骑士 6cb6c8d1fd test: 测试Caffeine缓存管理器的新增Caffeine缓存功能 2024-10-06 18:55:31 +08:00
法外狂徒张三 0160da8322 完成添加数据源，切换数据源功能 2024-10-06 11:27:40 +08:00
面包骑士 fcb6f81a12 test: 基础测试 2024-10-04 15:13:03 +08:00
法外狂徒张三 18baa2abe6 添加公司时赋予相应权限 2024-10-02 15:28:20 +08:00
面包骑士 854df0aab5 fix: 解决责任树测试死循环问题 2024-10-02 10:42:07 +08:00
面包骑士 469eedacb5 test: 可以使用责任树进行测试 2024-10-02 10:36:16 +08:00
面包骑士 eb37fb5072 feat: 更改Caffeine缓存管理器的初始化配置,初始化信息来源从配置文件改为了枚举 2024-10-02 09:34:38 +08:00
面包骑士 a28e5d751b feat: 新增通过配置信息完成Caffeine缓存管理器的分区 2024-10-01 19:54:43 +08:00
面包骑士 0f0883a781 feat: 完成Caffeine缓存管理 2024-10-01 19:15:06 +08:00
面包骑士 f6eaf6b05f feat: 部分补全框架 2024-09-30 20:37:53 +08:00
面包骑士 4cdd40fdc8 feat: 完成车辆数据处理的流程框架搭建 2024-09-30 20:26:25 +08:00
法外狂徒张三 6d6f5c709c 注册用户 2024-09-30 19:17:26 +08:00
面包骑士 58d49f9d8b feat: 完成Rabbit+Redis测试 2024-09-30 16:52:12 +08:00
面包骑士 479b55ec18 测试Rabbit上下线监听器 2024-09-30 11:14:56 +08:00
面包骑士 441e362f09 新增注解 2024-09-30 10:38:01 +08:00
chentaisen 4765f0bb58 feat():修改ktlv 2024-09-30 10:06:32 +08:00
法外狂徒张三 e4e65c6448 注册用户 2024-09-30 09:54:59 +08:00
面包骑士 7e77b4c0c0 使用Session原生IotDB 2024-09-30 09:28:14 +08:00
法外狂徒张三 f1fc409573 实现创建数据库 2024-09-30 09:25:16 +08:00
法外狂徒张三 56f8ce6967 创建数据库 2024-09-30 09:10:01 +08:00
面包骑士 53311e2f98 测试 2024-09-29 22:38:44 +08:00
chentaisen ba6ac5b76d 合并 2024-09-29 20:33:09 +08:00
chentaisen 07bafd5eb4 合并 2024-09-29 20:32:57 +08:00
chentaisen 8585f65ff9 合并 2024-09-29 15:31:40 +08:00
面包骑士 b7351ee49e 完成kafka,iotdb测试 2024-09-29 10:34:46 +08:00
张毅大神 1e9002ea93 更改 2024-09-29 10:11:43 +08:00
法外狂徒张三 0f9e2f4624 初始化 2024-09-29 09:03:00 +08:00
chentaisen c90f3fa056 合并 2024-09-29 08:43:52 +08:00
chentaisen 1a3b267685 合并 2024-09-29 01:29:47 +08:00
面包骑士 2c1765b3a6 优化并更改kafka实现方式 2024-09-28 20:08:09 +08:00
面包骑士 0c0d9fca3c 优化 2024-09-28 19:34:55 +08:00
面包骑士 1e668ce238 完成责任树模式设计测试 2024-09-28 15:29:38 +08:00
chentaisen 052a0012fc Merge remote-tracking branch 'origin/dev.data.processing' into dev.data.processing 2024-09-28 15:05:53 +08:00
面包骑士 b0f3162ceb 完成kafka测试 2024-09-28 15:05:30 +08:00
面包骑士 92ffcd21bd 优化 2024-09-28 15:05:30 +08:00
面包骑士 aaff10bc40 解决数据处理模块无法启动问题,优化 2024-09-28 15:05:30 +08:00
面包骑士 09353cd0e9 优化 2024-09-28 15:05:29 +08:00
面包骑士 a1fca6b081 创建数据处理模块,完成车辆上下线Rabbit监听器 2024-09-28 15:05:29 +08:00
面包骑士 8741c20ddb Caffeine缓存公共模块 2024-09-28 15:05:29 +08:00
面包骑士 9b3da53c6b 初始化调整 2024-09-28 15:05:29 +08:00
chentaisen d26b1bc5e5 合并 2024-09-28 14:52:41 +08:00
chentaisen aa619a7be0 合并 2024-09-28 12:27:05 +08:00
面包骑士 f0a69766d4 完成kafka测试 2024-09-27 22:00:16 +08:00
面包骑士 c980f0d46b 优化 2024-09-27 14:58:03 +08:00
面包骑士 16cf9b5603 解决数据处理模块无法启动问题,优化 2024-09-27 14:57:11 +08:00
chentaisen 04285aea80 合并 2024-09-26 23:54:48 +08:00
面包骑士 8332507e79 优化 2024-09-26 21:09:57 +08:00
面包骑士 2f12f3d2e0 创建数据处理模块,完成车辆上下线Rabbit监听器 2024-09-26 20:28:07 +08:00
面包骑士 f3c057352f Caffeine缓存公共模块 2024-09-26 19:26:50 +08:00
面包骑士 85fdb57b17 初始化调整 2024-09-26 19:26:19 +08:00
18 changed files with 162 additions and 57 deletions
Show Stats Expand all files Collapse all files

2
cloud-auth/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 47.116.173.119:8848
user-name: nacos
password: nacos
namespace: one-saas
namespace: oneone
# Spring
spring:
application:

2
cloud-gateway/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 47.116.173.119:8848
user-name: nacos
password: nacos
namespace: one-saas
namespace: oneone
# Spring
spring:

2
cloud-modules/cloud-modules-car-gateway/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 47.116.173.119:8848
user-name: nacos
password: nacos
namespace: one-saas
namespace: oneone
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:

48
cloud-modules/cloud-modules-data-processing/pom.xml
View File

@ -8,20 +8,18 @@
<artifactId>cloud-modules</artifactId>
<version>3.6.3</version>
</parent>
<artifactId>cloud-modules-data-processing</artifactId>
<description>
cloud-data-processing 数据处理模块
cloud-modules-data-processing 数据处理模块
</description>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependencies>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-kafka</artifactId>
@ -90,8 +88,47 @@
<groupId>com.muyu</groupId>
<artifactId>cloud-common-datasource</artifactId>
</dependency>
</dependencies>
<!-- 接口模块 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-api-doc</artifactId>
</dependency>
<!-- XllJob定时任务 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-xxl</artifactId>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-rabbit</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.70</version>
</dependency>
<!-- kafka-->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-kafka</artifactId>
</dependency>
<!-- mqtt-->
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
<version>1.2.2</version>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-modules-car-gateway</artifactId>
<version>3.6.3</version>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
@ -108,5 +145,4 @@
</plugin>
</plugins>
</build>
</project>

2
cloud-modules/cloud-modules-data-processing/src/main/java/com/muyu/data/processing/rebbit/DownlineRabbitConsumer.java
View File

@ -1,4 +1,4 @@
package com.muyu.data.processing.rebbit;//package com.muyu.data.processing.rebbit;
//package com.muyu.data.processing.rebbit;
//
//
//import com.muyu.common.rabbit.constants.RabbitConstants;

2
cloud-modules/cloud-modules-data-processing/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 47.116.173.119:8848
user-name: nacos
password: nacos
namespace: one-saas
namespace: oneone
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:

2
cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 47.116.173.119:8848
user-name: nacos
password: nacos
namespace: one-saas
namespace: oneone
# Spring
spring:

2
cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 47.116.173.119:8848
user-name: nacos
password: nacos
namespace: one-saas
namespace: oneone
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:

2
cloud-modules/cloud-modules-carmanage/.gitignore → cloud-modules/cloud-modules-openbusiness/.gitignore vendored
View File

@ -35,4 +35,4 @@ build/
.vscode/
### Mac OS ###
.DS_Store
.DS_Store

38
cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/.gitignore vendored 100644
View File

@ -0,0 +1,38 @@
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
### IntelliJ IDEA ###
.idea/modules.xml
.idea/jarRepositories.xml
.idea/compiler.xml
.idea/libraries/
*.iws
*.iml
*.ipr
### Eclipse ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/
### VS Code ###
.vscode/
### Mac OS ###
.DS_Store

38
cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/.gitignore vendored 100644
View File

@ -0,0 +1,38 @@
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
### IntelliJ IDEA ###
.idea/modules.xml
.idea/jarRepositories.xml
.idea/compiler.xml
.idea/libraries/
*.iws
*.iml
*.ipr
### Eclipse ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/
### VS Code ###
.vscode/
### Mac OS ###
.DS_Store

2
cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/cahce/apply/SysCarCacheRemoteData.java
View File

@ -1,4 +1,4 @@
package com.muyu.openbusiness.cahce.apply;//package com.muyu.openbusiness.cahce.apply;
//package com.muyu.openbusiness.cahce.apply;
//
//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
//import com.muyu.common.cache.BasicCacheData;

2
cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/SysCarMessageService.java
View File

@ -1,4 +1,4 @@
package com.muyu.openbusiness.service;//package com.muyu.openbusiness.service;
//package com.muyu.openbusiness.service;
//
//import com.baomidou.mybatisplus.extension.service.IService;
//import com.muyu.openbusiness.domain.SysCarMessage;

2
cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 47.116.173.119:8848
user-name: nacos
password: nacos
namespace: one-saas
namespace: oneone
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:

67
cloud-modules/cloud-modules-parsing/pom.xml
View File

@ -13,12 +13,36 @@
<description>
cloud-modules-parsing 协议解析模块
</description>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-kafka</artifactId>
<version>3.6.3</version>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-caffeine</artifactId>
<version>3.6.3</version>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-rabbit</artifactId>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-iotdb</artifactId>
<version>3.6.3</version>
</dependency>
<!-- SpringCloud Alibaba Nacos -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
@ -43,51 +67,26 @@
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</dependency>
<!-- Mysql Connector -->
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
<!-- MuYu Common DataSource -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-datasource</artifactId>
</dependency>
<!-- MuYu Common DataScope -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-datascope</artifactId>
</dependency>
<!-- MuYu Common Log -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-log</artifactId>
</dependency>
<!-- 接口模块 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-api-doc</artifactId>
</dependency>
<!-- XllJob定时任务 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-xxl</artifactId>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-rabbit</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.70</version>
<artifactId>cloud-common-datasource</artifactId>
</dependency>
<!-- kafka-->
<dependency>
@ -100,12 +99,6 @@
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
<version>1.2.2</version>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-modules-car-gateway</artifactId>
<version>3.6.3</version>
</dependency>
</dependencies>
<build>

2
cloud-modules/cloud-modules-parsing/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 47.116.173.119:8848
user-name: nacos
password: nacos
namespace: one-saas
namespace: oneone
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:

2
cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 47.116.173.119:8848
user-name: nacos
password: nacos
namespace: one-saas
namespace: oneone
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:

2
cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 47.116.173.119:8848
user-name: nacos
password: nacos
namespace: one-saas
namespace: oneone
# Spring
spring: