修复 mac 本地部署遇到的 bug (#54)

* fix jar no with dependencies

* 完善Docker-compose部署 (#53)

* fix jar no with dependencies (#52)

* 完善Docker-compose部署

---------

Co-authored-by: BanTanger <[email protected]>
Co-authored-by: haoran.tian <[email protected]>

* fix errors in docker-compose and properties

* fix errors in docker-compose and properties

---------

Co-authored-by: 田浩然 <[email protected]>
Co-authored-by: haoran.tian <[email protected]>

.gitignore

@@ -20,3 +20,6 @@
 *.njsproj
 *.sln
 .DS_Store
+/docker/mysql/data/
+/docker/redis/data/
+/logs/

copy.sh

@@ -55,12 +55,15 @@ echo ">>>>>>>>>>>>>>>>>"
 jar_files=(
  "im-domain/target/im-domain-1.0-SNAPSHOT.jar"
  "im-message-store/target/im-message-store-1.0-SNAPSHOT.jar"
- "im-tcp/target/im-tcp-1.0-SNAPSHOT.jar"
+ "im-tcp/target/im-tcp-1.0-SNAPSHOT-jar-with-dependencies.jar"
 )
 
 for index in "${!jar_files[@]}"; do
  target_file="${target_directories[$index]}/jar/$(basename "${jar_files[$index]}")"
  target_file_without_version="${target_directories[$index]}/jar/$(basename "${jar_files[$index]}" "-1.0-SNAPSHOT.jar").jar"
+ if [[ "${jar_files[$index]}" == *"jar-with-dependencies.jar" ]]; then
+ target_file_without_version="${target_directories[$index]}/jar/$(basename "${jar_files[$index]}" "-1.0-SNAPSHOT-jar-with-dependencies.jar").jar"
+ fi
  echo "开始复制 ${jar_files[$index]} .."
  cp "${jar_files[$index]}" "$target_file"
  mv "$target_file" "$target_file_without_version"

docker-compose.yml

@@ -4,7 +4,7 @@ services:
  # MySQL 容器
  im-mysql:
  container_name: im-mysql
- image: mysql:8.0.11
+ image: mysql:8.0.33
  build:
  context: ./docker/mysql
  restart: always
@@ -151,3 +151,4 @@ services:
 
 networks:
  im-network:
+ driver: host

docker/mysql/Dockerfile

@@ -1,5 +1,5 @@
 # 基础镜像
-FROM mysql:8.0.11
+FROM mysql:8.0.33
 
 # author
 MAINTAINER BanTanger

im-domain/Dockerfile

@@ -10,4 +10,4 @@ COPY ./jar/im-domain.jar /opt/application/im-domain.jar
 COPY application-docker.yml /opt/application/application.yml
 COPY logback-spring.xml /opt/application/logback-spring.xml
 
-ENTRYPOINT ["java", "-jar" ,"/opt/application/im-domain.jar"]
+ENTRYPOINT ["java", "-jar" ,"/opt/application/im-domain.jar", "--logging.config=/opt/application/logback-spring.xml"]

im-domain/src/main/resources/application-docker.yml

@@ -1,17 +1,17 @@
 server:
- port: 8000
+ port: 18000
 
 spring:
  profiles:
  active: dev
  datasource:
  driver-class-name: com.mysql.cj.jdbc.Driver
- password: 123456
- url: jdbc:mysql://127.0.0.1:3306/im_core?serverTimezone=UTC&useSSL=false&characterEncoding=UTF8
+ password: whalesharkim
+ url: jdbc:mysql://im-mysql:3306/im_core?serverTimezone=UTC&useSSL=false&characterEncoding=UTF8&allowPublicKeyRetrieval=true
  username: root
  # redis
  redis:
- host: 127.0.0.1
+ host: im-redis
  port: 6379
  jedis:
  pool:
@@ -22,9 +22,9 @@ spring:
  password: whalesharkim
  # rabbitmq
  rabbitmq:
- host: localhost
+ host: im-rabbitmq
  port: 5672
- addresses: localhost
+ addresses: im-rabbitmq
  username: admin
  password: admin
 
@@ -33,7 +33,7 @@ spring:
 
 appconfig:
  privateKey: bantanger
- zkAddr: 127.0.0.1:2181 # zk 连接地址
+ zkAddr: im-zookeeper:2181 # zk 连接地址
  zkConnectTimeOut: 5000 # zk 超时时间
  imRouteModel: 3 # 路由策略 1.轮询 2.随机 3.一致性hash
  consistentHashModel: 1 # 一致性哈希底层调用数据结构 1.TreeMap 2.自定义 Map 3.待扩展

im-domain/src/main/resources/application.yml

@@ -6,8 +6,8 @@ spring:
  active: dev
  datasource:
  driver-class-name: com.mysql.cj.jdbc.Driver
- password: 123456
- url: jdbc:mysql://127.0.0.1:3306/im_core?serverTimezone=UTC&useSSL=false&characterEncoding=UTF8
+ password: whalesharkim
+ url: jdbc:mysql://127.0.0.1:3306/im_core?serverTimezone=UTC&useSSL=false&characterEncoding=UTF8&allowPublicKeyRetrieval=true
  username: root
  # redis
  redis:
@@ -19,7 +19,7 @@ spring:
  max-idle: 100
  max-wait: 1000
  min-idle: 10
- password:
+ password: whalesharkim
  # rabbitmq
  rabbitmq:
  host: localhost

im-message-store/Dockerfile

@@ -10,4 +10,4 @@ COPY ./jar/im-message-store.jar /opt/application/im-message-store.jar
 COPY application-docker.yml /opt/application/application.yml
 COPY logback-spring.xml /opt/application/logback-spring.xml
 
-ENTRYPOINT ["java", "-jar" ,"/opt/application/im-message-store.jar"]
+ENTRYPOINT ["java", "-jar" ,"/opt/application/im-message-store.jar", "--logging.config=/opt/application/logback-spring.xml"]

im-message-store/pom.xml

@@ -69,16 +69,20 @@
  <build>
  <plugins>
  <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.2.0</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
  <configuration>
- <archive>
- <manifest>
- <mainClass>com.bantanger.im.message.Application</mainClass>
- </manifest>
- </archive>
+ <!-- 指定该Main Class为全局的唯一入口 -->
+ <mainClass>com.bantanger.im.message.Application</mainClass>
+ <layout>ZIP</layout>
  </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal><!--可以把依赖的包都打包到生成的Jar包中-->
+ </goals>
+ </execution>
+ </executions>
  </plugin>
  </plugins>
  </build>

im-message-store/src/main/resources/application-docker.yml

@@ -6,12 +6,12 @@ spring:
  active: dev
  datasource:
  driver-class-name: com.mysql.jdbc.Driver
- password: 123456
- url: jdbc:mysql://127.0.0.1:3306/im_core?serverTimezone=UTC&useSSL=false&characterEncoding=UTF8
+ password: whalesharkim
+ url: jdbc:mysql://im-mysql:3306/im_core?serverTimezone=UTC&useSSL=false&characterEncoding=UTF8&allowPublicKeyRetrieval=true
  username: root
 
  redis:
- host: 127.0.0.1
+ host: im-redis
  port: 6379
  jedis:
  pool:
@@ -21,9 +21,9 @@ spring:
  min-idle: 10
  password: whalesharkim
  rabbitmq:
- host: localhost
+ host: im-rabbitmq
  port: 5672
- addresses: localhost
+ addresses: im-rabbitmq
  username: admin
  password: admin
  # virtual-host:

im-message-store/src/main/resources/application.yml

@@ -6,8 +6,8 @@ spring:
  active: dev
  datasource:
  driver-class-name: com.mysql.jdbc.Driver
- password: 123456
- url: jdbc:mysql://127.0.0.1:3306/im_core?serverTimezone=UTC&useSSL=false&characterEncoding=UTF8
+ password: whalesharkim
+ url: jdbc:mysql://127.0.0.1:3306/im_core?serverTimezone=UTC&useSSL=false&characterEncoding=UTF8&allowPublicKeyRetrieval=true
  username: root
 
  redis:

im-tcp/pom.xml

@@ -54,7 +54,7 @@
  </manifest>
  </archive>
  <descriptorRefs>
- <descriptorRef>jar</descriptorRef>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
  </descriptorRefs>
  </configuration>
  </execution>

im-tcp/src/main/resources/WebSocket.html

@@ -467,7 +467,7 @@
  //如果浏览器支持WebSocket
  if (window.WebSocket) {
  //参数就是与服务器连接的地址
- socket = new WebSocket("ws://localhost:19001/ws");
+ socket = new WebSocket("ws://localhost:19002/ws");
  //客户端收到服务器消息的时候就会执行这个回调方法
  socket.onmessage = function (event) {
  var ta = document.getElementById("responseText");

im-tcp/src/main/resources/config-docker.yml

@@ -21,15 +21,15 @@ im:
  poolConnTimeout: 3000 # 连接超时时间(秒)
  poolSize: 10 # 连接池大小
  single: #redis单机配置
- address: 127.0.0.1:6379
+ address: im-redis:6379
 
  rabbitmq:
- host: 127.0.0.1
+ host: im-rabbitmq
  port: 5672
  virtualHost: /
  userName: admin
  password: admin
 
  zkConfig:
- zkAddr: 127.0.0.1:2181
+ zkAddr: im-zookeeper:2181
  zkConnectTimeOut: 5000

im-tcp/src/main/resources/config.yml

@@ -1,11 +1,11 @@
 im:
- tcpPort: 9001
+ tcpPort: 19001
  webSocketPort: 19002
  bossThreadSize: 1
  workThreadSize: 8
  heartBeatTime: 3000 # 心跳超时时间 单位毫秒
  brokerId: 1001
- logicUrl: http://127.0.0.1:8000/v1 # Feign RPC 调用业务层
+ logicUrl: http://localhost:18000/v1 # Feign RPC 调用业务层
  loginModel: 3
  # 多端同步模式: 1 只允许一端在线，手机/电脑/web 踢掉除了本 client+imei 的设备
  # 2 允许手机/电脑的一台设备 + web 在线 踢掉除了本 client+imei 的非 web 端设备
@@ -15,7 +15,7 @@ im:
  redis:
  mode: single # 单机模式:single 哨兵式:sentinel 集群模式:cluster
  database: 0
- password:
+ password: whalesharkim
  timeout: 3000 # 超时时间
  poolMinIdle: 4 #最小空闲数
  poolConnTimeout: 3000 # 连接超时时间(秒)

pom.xml

@@ -44,7 +44,13 @@
  <dependency>
  <groupId>io.netty</groupId>
  <artifactId>netty-all</artifactId>
- <version>4.1.77.Final</version>
+ <version>4.1.94.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver-dns-native-macos</artifactId>
+ <version>4.1.94.Final</version>
+ <classifier>osx-aarch_64</classifier>
  </dependency>
  <!-- commons-lang3 -->
  <dependency>