Skip to content

Commit

Permalink
Merge pull request crossoverJie#144 from crossoverJie/support-integraโ€ฆ
Browse files Browse the repository at this point in the history 
โ€ฆtion-test

[test] support integration test
  • Loading branch information
@crossoverJie
crossoverJie authored Sep 1, 2024
2 parents cc83c74 + a13b664 commit 5896837
Show file tree
Hide file tree
Showing 26 changed files with 338 additions and 347 deletions.
14 changes: 9 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<img src="https://i.loli.net/2020/02/21/rfOGvKlTcHCmM92.png" />
<br/>

[![codecov](https://codecov.io/gh/crossoverJie/cim/graph/badge.svg?token=oW5Gd1oKmf)](https://codecov.io/gh/crossoverJie/cim)
[![Build Status](https://img.shields.io/badge/cim-cross--im-brightgreen.svg)](https://github.com/crossoverJie/cim)
[![](https://badge.juejin.im/entry/5c2c000e6fb9a049f5713e26/likes.svg?style=flat-square)](https://juejin.im/post/5c2bffdc51882509181395d7)

Expand All @@ -16,15 +17,16 @@

# V2.0
- [x] Upgrade to JDK17 & springboot3.0
- [x] Client SDK
- [ ] Client use [picocli](https://picocli.info/) instead of springboot.
- [ ] Supports binary client(build with golang).
- [ ] Support integration testing.
- [x] Support integration testing.
- [ ] Integrate OpenTelemetry .
- [ ] Support single node startup(Contains no components).
- [ ] Third-party components support replacement(Redis/Zookeeper, etc.).
- [ ] Support web client(websocket).
- [ ] Support docker container.
- [ ] Support kubernetes operation.
- [ ] Supports binary client(build with golang).

## ไป‹็ป

Expand Down Expand Up @@ -106,14 +108,16 @@
้ฆ–ๅ…ˆ้œ€่ฆๅฎ‰่ฃ… `Zookeeperใ€Redis` ๅนถไฟ่ฏ็ฝ‘็ปœ้€š็•…ใ€‚

```shell
docker run --name zookeeper -d -p 2181:2181 zookeeper
docker run --rm --name redis -d -p 6379:6379 redis
docker run --name zookeeper -d -p 2181:2181 zookeeper:
docker run --rm --name redis -d -p 6379:6379 redis:7.4.0
```

```shell
git clone https://github.com/crossoverJie/cim.git
cd cim
mvn -Dmaven.test.skip=true clean package
mvn clean package -DskipTests=true
cd cim-server && cim-client && cim-forward-route
mvn clean package spring-boot:repackage -DskipTests=true
```

### ้ƒจ็ฝฒ IM-server(cim-server)
Expand Down
16 changes: 0 additions & 16 deletions cim-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,21 +88,5 @@

</dependencies>

<build>
<plugins>
<!-- spring-boot-maven-plugin (ๆไพ›ไบ†็›ดๆŽฅ่ฟ่กŒ้กน็›ฎ็š„ๆ’ไปถ๏ผšๅฆ‚ๆžœๆ˜ฏ้€š่ฟ‡parentๆ–นๅผ็ปงๆ‰ฟspring-boot-starter-parentๅˆ™ไธ็”จๆญคๆ’ไปถ) -->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
15 changes: 4 additions & 11 deletions cim-client/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@

โ–„โ–ˆโ–ˆโ–ˆโ–ˆโ–„ โ–ˆโ–ˆโ–“ โ–ˆโ–ˆโ–ˆโ–„ โ–„โ–ˆโ–ˆโ–ˆโ–“
โ–’โ–ˆโ–ˆโ–€ โ–€โ–ˆ โ–“โ–ˆโ–ˆโ–’โ–“โ–ˆโ–ˆโ–’โ–€โ–ˆโ–€ โ–ˆโ–ˆโ–’
โ–’โ–“โ–ˆ โ–„ โ–’โ–ˆโ–ˆโ–’โ–“โ–ˆโ–ˆ โ–“โ–ˆโ–ˆโ–‘
โ–’โ–“โ–“โ–„ โ–„โ–ˆโ–ˆโ–’โ–‘โ–ˆโ–ˆโ–‘โ–’โ–ˆโ–ˆ โ–’โ–ˆโ–ˆ
โ–’ โ–“โ–ˆโ–ˆโ–ˆโ–€ โ–‘โ–‘โ–ˆโ–ˆโ–‘โ–’โ–ˆโ–ˆโ–’ โ–‘โ–ˆโ–ˆโ–’
โ–‘ โ–‘โ–’ โ–’ โ–‘โ–‘โ–“ โ–‘ โ–’โ–‘ โ–‘ โ–‘
โ–‘ โ–’ โ–’ โ–‘โ–‘ โ–‘ โ–‘
โ–‘ โ–’ โ–‘โ–‘ โ–‘
โ–‘ โ–‘ โ–‘ โ–‘
โ–‘
_ ___ __
____(_)_ _ ____/ (_)__ ___ / /_
/ __/ / ' \ / __/ / / -_) _ \/ __/
\__/_/_/_/_/ \__/_/_/\__/_//_/\__/
Power by @crossoverJie


Expand Down
2 changes: 1 addition & 1 deletion cim-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.0.1-SNAPSHOT</version>
<version>1.0.0-SNAPSHOT</version>

<artifactId>cim-common</artifactId>

Expand Down
16 changes: 0 additions & 16 deletions cim-forward-route/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,21 +88,5 @@

</dependencies>

<build>
<plugins>
<!-- spring-boot-maven-plugin (ๆไพ›ไบ†็›ดๆŽฅ่ฟ่กŒ้กน็›ฎ็š„ๆ’ไปถ๏ผšๅฆ‚ๆžœๆ˜ฏ้€š่ฟ‡parentๆ–นๅผ็ปงๆ‰ฟspring-boot-starter-parentๅˆ™ไธ็”จๆญคๆ’ไปถ) -->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
85 changes: 0 additions & 85 deletions cim-forward-route/src/main/java/com/crossoverjie/cim/route/cache/ServerCache.java
View file

This file was deleted.

4 changes: 0 additions & 4 deletions cim-forward-route/src/main/java/com/crossoverjie/cim/route/config/BeanConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ public class BeanConfig {
@Autowired
private AppConfiguration appConfiguration;

@Bean
public ZkClient buildZKClient() {
return new ZkClient(appConfiguration.getZkAddr(), appConfiguration.getZkConnectTimeout());
}

@Bean
public MetaStore metaStore() throws Exception {
Expand Down
63 changes: 0 additions & 63 deletions cim-forward-route/src/main/java/com/crossoverjie/cim/route/kit/ServerListListener.java
View file

This file was deleted.

44 changes: 0 additions & 44 deletions cim-forward-route/src/main/java/com/crossoverjie/cim/route/kit/ZKit.java
View file

This file was deleted.

15 changes: 4 additions & 11 deletions cim-forward-route/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@

โ–„โ–ˆโ–ˆโ–ˆโ–ˆโ–„ โ–ˆโ–ˆโ–“ โ–ˆโ–ˆโ–ˆโ–„ โ–„โ–ˆโ–ˆโ–ˆโ–“
โ–’โ–ˆโ–ˆโ–€ โ–€โ–ˆ โ–“โ–ˆโ–ˆโ–’โ–“โ–ˆโ–ˆโ–’โ–€โ–ˆโ–€ โ–ˆโ–ˆโ–’
โ–’โ–“โ–ˆ โ–„ โ–’โ–ˆโ–ˆโ–’โ–“โ–ˆโ–ˆ โ–“โ–ˆโ–ˆโ–‘
โ–’โ–“โ–“โ–„ โ–„โ–ˆโ–ˆโ–’โ–‘โ–ˆโ–ˆโ–‘โ–’โ–ˆโ–ˆ โ–’โ–ˆโ–ˆ
โ–’ โ–“โ–ˆโ–ˆโ–ˆโ–€ โ–‘โ–‘โ–ˆโ–ˆโ–‘โ–’โ–ˆโ–ˆโ–’ โ–‘โ–ˆโ–ˆโ–’
โ–‘ โ–‘โ–’ โ–’ โ–‘โ–‘โ–“ โ–‘ โ–’โ–‘ โ–‘ โ–‘
โ–‘ โ–’ โ–’ โ–‘โ–‘ โ–‘ โ–‘
โ–‘ โ–’ โ–‘โ–‘ โ–‘
โ–‘ โ–‘ โ–‘ โ–‘
โ–‘
_ __
____(_)_ _ _______ __ __/ /____
/ __/ / ' \ / __/ _ \/ // / __/ -_)
\__/_/_/_/_/ /_/ \___/\_,_/\__/\__/
Power by @crossoverJie


Expand Down
Loading

0 comments on commit 5896837

Please sign in to comment.