diff --git a/config/config.yaml b/config/config.yaml index 9f7969466..05159f0b9 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -1,14 +1,14 @@ # The class cannot be named by Pascal or camel case. # If it is not used, the corresponding structure will not be set, # and it will not be read naturally. -serverversion: 1.0.2 +serverversion: 1.0.3 #---------------Infrastructure configuration---------------------# etcd: etcdSchema: openIM etcdAddr: [ 127.0.0.1:2379 ] mysql: - dbMysqlAddress: [ 127.0.0.1:3306 ] + dbMysqlAddress: [ 127.0.0.1:13306 ] dbMysqlUserName: root dbMysqlPassword: openIM dbMysqlDatabaseName: openIM @@ -19,18 +19,18 @@ mysql: dbMaxLifeTime: 120 mongo: - dbAddress: [ 127.0.0.1:27017 ] + dbAddress: [ 127.0.0.1:37017 ] dbDirect: false dbTimeout: 10 dbDatabase: openIM dbSource: admin - dbUserName: - dbPassword: + dbUserName: openIM + dbPassword: openIM dbMaxPoolSize: 20 dbRetainChatRecords: 7 redis: - dbAddress: 127.0.0.1:6379 + dbAddress: 127.0.0.1:16379 dbMaxIdle: 128 dbMaxActive: 0 dbIdleTimeout: 120 @@ -123,6 +123,7 @@ push: appKey: cf47465a368f24c659608e7e masterSecret: 02204efe3f3832947a236ee5 pushUrl: "https://api.jpush.cn/v3/push" + pushIntent: "intent:#Intent;component=io.openim.app.enterprisechat/io.openim.app.enterprisechat.MainActivity;end" manager: appManagerUid: ["openIM123456","openIM654321"] secrets: ["openIM1","openIM2"] @@ -142,4 +143,6 @@ tokenpolicy: messagecallback: callbackSwitch: false - callbackUrl: "http://www.xxx.com/msg/judge" \ No newline at end of file + callbackUrl: "http://www.xxx.com/msg/judge" + #TimeOut use second as unit + callbackTimeOut: 10 diff --git a/docker-compose.yaml b/docker-compose.yaml index 1d64dcd9f..cbdc6a27b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,7 +5,8 @@ services: mysql: image: mysql:5.7 ports: - - 3306:3306 + - 13306:3306 + - 23306:33060 container_name: mysql volumes: - ./components/mysql/data:/var/lib/mysql @@ -15,20 +16,25 @@ services: restart: always mongodb: - image: mongo:4.0 + image: mongo:5.0 ports: - - 27017:27017 + - 37017:27017 container_name: mongo volumes: - - ./components/mongodb/data:/data/db + - ./components/mongodb/data/db:/data/db + - ./components/mongodb/data/logs:/data/logs + - ./components/mongodb/data/conf:/etc/mongo environment: - TZ: Asia/Shanghai + - MONGO_INITDB_ROOT_USERNAME=openIM + - MONGO_INITDB_ROOT_PASSWORD=openIM + + #TZ: Asia/Shanghai restart: always redis: image: redis ports: - - 6379:6379 + - 16379:6379 container_name: redis volumes: - ./components/redis/data:/data @@ -82,38 +88,13 @@ services: restart: always command: /usr/local/bin/etcd --name etcd0 --data-dir /etcd-data --listen-client-urls http://0.0.0.0:2379 --advertise-client-urls http://0.0.0.0:2379 --listen-peer-urls http://0.0.0.0:2380 --initial-advertise-peer-urls http://0.0.0.0:2380 --initial-cluster etcd0=http://0.0.0.0:2380 --initial-cluster-token tkn --initial-cluster-state new - - #fixme-----build from dockerfile--------- - # open-im-server: - # image: open_im_server - # container_name: open-im-server - # volumes: - # - ./logs:/Open-IM-Server/logs - # - ./config/config.yaml:/Open-IM-Server/config/config.yaml - # restart: always - # build: - # context: . - # dockerfile: deploy.Dockerfile - # depends_on: - # - mysql - # - mongodb - # - redis - # - kafka - # - etcd - # network_mode: "host" - # logging: - # driver: json-file - # options: - # max-size: "1g" - # max-file: "2" - - #fixme----build from docker hub------ - open-im-server: - image: lyt1123/open_im_server - container_name: open-im-server + open_im_server: + image: openim/open_im_server + container_name: open_im_server volumes: - ./logs:/Open-IM-Server/logs - ./config/config.yaml:/Open-IM-Server/config/config.yaml + - ./db/sdk:/Open-IM-Server/db/sdk restart: always depends_on: - kafka