Merge branch 'master' of https://gitee.com/rowger_217/im-system
This commit is contained in:
1
hs-im-server/.gitignore
vendored
1
hs-im-server/.gitignore
vendored
@@ -3,5 +3,4 @@
|
||||
/im-service/target
|
||||
/im-common/target
|
||||
/build/**
|
||||
/dev
|
||||
/hd
|
||||
|
||||
BIN
hs-im-server/dev/app-service-1.0-SNAPSHOT.jar
Normal file
BIN
hs-im-server/dev/app-service-1.0-SNAPSHOT.jar
Normal file
Binary file not shown.
77
hs-im-server/dev/docker-compose.yml
Normal file
77
hs-im-server/dev/docker-compose.yml
Normal file
@@ -0,0 +1,77 @@
|
||||
version: '3'
|
||||
services:
|
||||
app-web:
|
||||
image: nginx:1.25
|
||||
restart: always
|
||||
privileged: true
|
||||
container_name: app-web
|
||||
# ports:
|
||||
# - 80:80
|
||||
# - 443:443
|
||||
network_mode: host
|
||||
volumes:
|
||||
- ./:/usr/share/nginx/html/
|
||||
- ./nginx.conf:/etc/nginx/nginx.conf
|
||||
im-tcp:
|
||||
image: 172.16.2.1:8083/java:8_server-jre_unlimited
|
||||
restart: always
|
||||
privileged: true
|
||||
environment:
|
||||
LANG: en_US.UTF-8
|
||||
LC_ALL: en_US.UTF-8
|
||||
TZ: Asia/Shanghai
|
||||
IM_HOST: 172.16.3.18
|
||||
container_name: im-tcp
|
||||
volumes:
|
||||
- ./:/hd-znzq/config
|
||||
- ./:/hd-znzq/system
|
||||
network_mode: host
|
||||
# ports:
|
||||
# - 29001:29001
|
||||
# - 29000:29000
|
||||
command: java -Dfile.encoding=UTF-8 -jar /hd-znzq/system/im-tcp-1.0.0-SNAPSHOT.jar /hd-znzq/config/hd_1.yml
|
||||
im-message-store:
|
||||
image: 172.16.2.1:8083/java:8_server-jre_unlimited
|
||||
restart: always
|
||||
privileged: true
|
||||
environment:
|
||||
LANG: en_US.UTF-8
|
||||
LC_ALL: en_US.UTF-8
|
||||
TZ: Asia/Shanghai
|
||||
container_name: im-message-store
|
||||
volumes:
|
||||
- ./:/hd-znzq/system
|
||||
# ports:
|
||||
# - 8990:8990
|
||||
network_mode: host
|
||||
command: java -Dfile.encoding=UTF-8 -jar /hd-znzq/system/im-message-store-1.0.0-SNAPSHOT.jar
|
||||
im-service:
|
||||
image: 172.16.2.1:8083/java:8_server-jre_unlimited
|
||||
restart: always
|
||||
privileged: true
|
||||
environment:
|
||||
LANG: en_US.UTF-8
|
||||
LC_ALL: en_US.UTF-8
|
||||
TZ: Asia/Shanghai
|
||||
SRS_HOST: 172.16.3.18
|
||||
container_name: im-service
|
||||
volumes:
|
||||
- ./:/hd-znzq/system
|
||||
ports:
|
||||
- 28000:28000
|
||||
# network_mode: host
|
||||
command: java -Dfile.encoding=UTF-8 -jar /hd-znzq/system/im-service-1.0.0-SNAPSHOT.jar
|
||||
app-service:
|
||||
image: 172.16.2.1:8083/java:8_server-jre_unlimited
|
||||
restart: always
|
||||
privileged: true
|
||||
ports:
|
||||
- 8989:8989
|
||||
environment:
|
||||
LANG: en_US.UTF-8
|
||||
LC_ALL: en_US.UTF-8
|
||||
TZ: Asia/Shanghai
|
||||
container_name: app-service
|
||||
volumes:
|
||||
- ./:/hd-znzq/system
|
||||
command: java -Dfile.encoding=UTF-8 -jar /hd-znzq/system/app-service-1.0-SNAPSHOT.jar
|
||||
34
hs-im-server/dev/hd_1.yml
Normal file
34
hs-im-server/dev/hd_1.yml
Normal file
@@ -0,0 +1,34 @@
|
||||
lim:
|
||||
tcpPort: 29000
|
||||
webSocketPort: 29001
|
||||
bossThreadSize: 1
|
||||
workThreadSize: 8
|
||||
heartBeatTime: 20000 #心跳超时时间 单位毫秒
|
||||
brokerId: 1000
|
||||
loginModel: 3
|
||||
logicUrl: http://172.16.3.18:28000/v1
|
||||
# * 多端同步模式：1 只允许一端在线，手机/电脑/web 踢掉除了本client+imel的设备
|
||||
# * 2 允许手机/电脑的一台设备 + web在线 踢掉除了本client+imel的非web端设备
|
||||
# * 3 允许手机和电脑单设备 + web 同时在线 踢掉非本client+imel的同端设备
|
||||
# * 4 允许所有端多设备登录 不踢任何设备
|
||||
|
||||
redis:
|
||||
mode: single # 单机模式：single 哨兵模式：sentinel 集群模式：cluster
|
||||
database: 8
|
||||
password: Mars@23600800
|
||||
timeout: 3000 # 超时时间
|
||||
poolMinIdle: 8 #最小空闲数
|
||||
poolConnTimeout: 3000 # 连接超时时间(毫秒)
|
||||
poolSize: 10 # 连接池大小
|
||||
single: #redis单机配置
|
||||
address: 172.16.2.3:6379
|
||||
rabbitmq:
|
||||
host: 172.16.2.1
|
||||
port: 5672
|
||||
virtualHost: /
|
||||
userName: guest
|
||||
password: guest
|
||||
|
||||
zkConfig:
|
||||
zkAddr: 172.16.2.1:2181
|
||||
zkConnectTimeOut: 5000
|
||||
BIN
hs-im-server/dev/im-message-store-1.0.0-SNAPSHOT.jar
Normal file
BIN
hs-im-server/dev/im-message-store-1.0.0-SNAPSHOT.jar
Normal file
Binary file not shown.
BIN
hs-im-server/dev/im-service-1.0.0-SNAPSHOT.jar
Normal file
BIN
hs-im-server/dev/im-service-1.0.0-SNAPSHOT.jar
Normal file
Binary file not shown.
BIN
hs-im-server/dev/im-tcp-1.0.0-SNAPSHOT.jar
Normal file
BIN
hs-im-server/dev/im-tcp-1.0.0-SNAPSHOT.jar
Normal file
Binary file not shown.
@@ -4,11 +4,11 @@ spring:
|
||||
datasource:
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
password: beAs0LHX2GyTxMw4
|
||||
url: jdbc:mysql://43.139.191.204:3306:3306/im-core?serverTimezone=UTC&useSSL=false&characterEncoding=UTF8
|
||||
url: jdbc:mysql://43.139.208.48:3306/im-core?serverTimezone=UTC&useSSL=false&characterEncoding=UTF8
|
||||
username: root
|
||||
|
||||
redis:
|
||||
host: 43.139.191.204
|
||||
host: 43.139.208.48
|
||||
port: 6379
|
||||
database: 8
|
||||
jedis:
|
||||
@@ -19,9 +19,9 @@ spring:
|
||||
min-idle: 10
|
||||
password: dSMIXBQrCBXiHHjk123
|
||||
rabbitmq:
|
||||
host: 119.45.242.222
|
||||
host: 43.139.208.48
|
||||
port: 5672
|
||||
addresses: 119.45.242.222
|
||||
addresses: 43.139.208.48
|
||||
username: guest
|
||||
password: guest
|
||||
# virtual-host:
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
spring:
|
||||
profiles:
|
||||
active: prod
|
||||
active: local
|
||||
|
||||
@@ -53,7 +53,7 @@ public class CallHistoryTask {
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void closeAll(ImCallHistoryEntity callHistoryEntity,List<ImRoomEntity> roomList){
|
||||
callHistoryService.closeCallRoomWithError(callHistoryEntity);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -8,11 +8,11 @@ spring:
|
||||
datasource:
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
password: beAs0LHX2GyTxMw4
|
||||
url: jdbc:mysql://43.139.191.204:3306/im-core?serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=UTF8
|
||||
url: jdbc:mysql://43.139.208.48:3306/im-core?serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=UTF8
|
||||
username: root
|
||||
|
||||
redis:
|
||||
host: 43.139.191.204
|
||||
host: 43.139.208.48
|
||||
port: 6379
|
||||
database: 8
|
||||
jedis:
|
||||
@@ -23,9 +23,9 @@ spring:
|
||||
min-idle: 10
|
||||
password: dSMIXBQrCBXiHHjk123
|
||||
rabbitmq:
|
||||
host: 119.45.242.222
|
||||
host: 43.139.208.48
|
||||
port: 5672
|
||||
addresses: 119.45.242.222
|
||||
addresses: 192.168.2.181
|
||||
username: guest
|
||||
password: guest
|
||||
# virtual-host:
|
||||
@@ -59,7 +59,7 @@ server:
|
||||
appConfig:
|
||||
appId: 10000
|
||||
privateKey: 123456
|
||||
zkAddr: 119.45.242.222:2181 # zk连接地址
|
||||
zkAddr: 43.139.208.48:2181 # zk连接地址
|
||||
zkConnectTimeOut: 50000 #zk超时时间
|
||||
imRouteWay: 3 # 路由策略1轮训 2随机 3hash
|
||||
consistentHashWay: 1 # 如果选用一致性hash的话具体hash算法 1 TreeMap 2 自定义Map
|
||||
@@ -75,7 +75,7 @@ appConfig:
|
||||
groupMaxMemberCount: 500
|
||||
sendMessageCheckFriend: false # 发送消息是否校验关系链
|
||||
sendMessageCheckBlack: false # 发送消息是否校验黑名单
|
||||
callbackUrl: http://127.0.0.1:8000/callback
|
||||
callbackUrl: http://43.139.208.48:8000/callback
|
||||
modifyUserAfterCallback: false # 用户资料变更之后回调开关
|
||||
addFriendAfterCallback: false # 添加好友之后回调开关
|
||||
addFriendBeforeCallback: false # 添加好友之前回调开关
|
||||
@@ -130,4 +130,4 @@ minio:
|
||||
bucketName: hd-im
|
||||
|
||||
custom:
|
||||
host: 119.45.242.222
|
||||
host: 43.139.208.48
|
||||
|
||||
@@ -3,4 +3,4 @@ spring:
|
||||
time-zone: GMT+8
|
||||
|
||||
profiles:
|
||||
active: prod
|
||||
active: local
|
||||
|
||||
@@ -6,7 +6,7 @@ lim:
|
||||
heartBeatTime: 20000 #心跳超时时间 单位毫秒
|
||||
brokerId: 1000
|
||||
loginModel: 3
|
||||
logicUrl: http://172.16.2.3:28000/v1
|
||||
logicUrl: http://192.168.2.181:28000/v1
|
||||
# * 多端同步模式：1 只允许一端在线，手机/电脑/web 踢掉除了本client+imel的设备
|
||||
# * 2 允许手机/电脑的一台设备 + web在线 踢掉除了本client+imel的非web端设备
|
||||
# * 3 允许手机和电脑单设备 + web 同时在线 踢掉非本client+imel的同端设备
|
||||
@@ -15,20 +15,20 @@ lim:
|
||||
redis:
|
||||
mode: single # 单机模式：single 哨兵模式：sentinel 集群模式：cluster
|
||||
database: 8
|
||||
password: Mars@23600800
|
||||
password: dSMIXBQrCBXiHHjk123
|
||||
timeout: 3000 # 超时时间
|
||||
poolMinIdle: 8 #最小空闲数
|
||||
poolConnTimeout: 3000 # 连接超时时间(毫秒)
|
||||
poolSize: 10 # 连接池大小
|
||||
single: #redis单机配置
|
||||
address: 172.16.2.3:6379
|
||||
address: 43.139.208.48
|
||||
rabbitmq:
|
||||
host: 172.16.2.1
|
||||
host: 192.168.2.181
|
||||
port: 5672
|
||||
virtualHost: /
|
||||
userName: guest
|
||||
password: guest
|
||||
|
||||
zkConfig:
|
||||
zkAddr: 172.16.2.1:2181
|
||||
zkAddr: 192.168.2.181:2181
|
||||
zkConnectTimeOut: 5000
|
||||
|
||||
Reference in New Issue
Block a user