mirror of
				https://github.com/openimsdk/open-im-server.git
				synced 2025-10-26 21:22:16 +08:00 
			
		
		
		
	fix: fix chat bug
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
This commit is contained in:
		
							parent
							
								
									270e14dcfc
								
							
						
					
					
						commit
						8f1732155a
					
				| @ -29,8 +29,8 @@ | |||||||
| zookeeper: | zookeeper: | ||||||
|   schema: openim |   schema: openim | ||||||
|   address: [ 127.0.0.1:2181 ] |   address: [ 127.0.0.1:2181 ] | ||||||
|   username: |   username: '' | ||||||
|   password: |   password: '' | ||||||
| 
 | 
 | ||||||
| ###################### Mysql ###################### | ###################### Mysql ###################### | ||||||
| # MySQL configuration | # MySQL configuration | ||||||
| @ -60,7 +60,7 @@ mysql: | |||||||
| # Default MongoDB database name | # Default MongoDB database name | ||||||
| # Maximum connection pool size | # Maximum connection pool size | ||||||
| mongo: | mongo: | ||||||
|   uri: |   uri: '' | ||||||
|   address: [ 127.0.0.1:37017 ] |   address: [ 127.0.0.1:37017 ] | ||||||
|   database: openIM_v3 |   database: openIM_v3 | ||||||
|   username: root |   username: root | ||||||
| @ -73,7 +73,7 @@ mongo: | |||||||
| # Username is required only for Redis version 6.0+ | # Username is required only for Redis version 6.0+ | ||||||
| redis: | redis: | ||||||
|   address: [ 127.0.0.1:16379 ] |   address: [ 127.0.0.1:16379 ] | ||||||
|   username: |   username: '' | ||||||
|   password: openIM123 |   password: openIM123 | ||||||
| 
 | 
 | ||||||
| ###################### Kafka configuration information ###################### | ###################### Kafka configuration information ###################### | ||||||
| @ -84,8 +84,8 @@ redis: | |||||||
| # It's not recommended to modify this topic name | # It's not recommended to modify this topic name | ||||||
| # Consumer group ID, it's not recommended to modify | # Consumer group ID, it's not recommended to modify | ||||||
| kafka: | kafka: | ||||||
|   username: |   username: '' | ||||||
|   password: |   password: '' | ||||||
|   addr: [ 127.0.0.1:9092 ] |   addr: [ 127.0.0.1:9092 ] | ||||||
|   latestMsgToRedis: |   latestMsgToRedis: | ||||||
|     topic: "latestMsgToRedis" |     topic: "latestMsgToRedis" | ||||||
| @ -105,7 +105,7 @@ kafka: | |||||||
| # IP address to register with zookeeper when starting RPC, the IP and corresponding rpcPort should be accessible by api/gateway | # IP address to register with zookeeper when starting RPC, the IP and corresponding rpcPort should be accessible by api/gateway | ||||||
| # Default listen IP is 0.0.0.0 | # Default listen IP is 0.0.0.0 | ||||||
| rpc: | rpc: | ||||||
|   registerIP: |   registerIP: '' | ||||||
|   listenIP: 0.0.0.0 |   listenIP: 0.0.0.0 | ||||||
| 
 | 
 | ||||||
| ###################### API configuration information ###################### | ###################### API configuration information ###################### | ||||||
| @ -132,26 +132,27 @@ api: | |||||||
| # minio.signEndpoint is minio public network address | # minio.signEndpoint is minio public network address | ||||||
| object: | object: | ||||||
|   enable: "minio" |   enable: "minio" | ||||||
|   apiURL: "http://127.0.0.1:10002" |   apiURL: "http://14.153.17.42:10002" | ||||||
|   minio: |   minio: | ||||||
|     bucket: "openim" |     bucket: "openim" | ||||||
|     endpoint: "http://127.0.0.1:10005" |     endpoint: "http://127.0.0.1:10005" | ||||||
|     accessKeyID: "root" |     accessKeyID: "root" | ||||||
|     secretAccessKey: "openIM123" |     secretAccessKey: "openIM123" | ||||||
|     sessionToken: "" |     sessionToken: '' | ||||||
|     signEndpoint: "http://127.0.0.1:10005" |     signEndpoint: "http://14.153.17.42:10005" | ||||||
|   cos: |   cos: | ||||||
|     bucketURL: "https://temp-1252357374.cos.ap-chengdu.myqcloud.com" |     bucketURL: https://temp-1252357374.cos.ap-chengdu.myqcloud.com | ||||||
|     secretID: "" |     secretID: '' | ||||||
|     secretKey: "" |     secretKey: '' | ||||||
|     sessionToken: "" |     sessionToken: '' | ||||||
|   oss: |   oss: | ||||||
|     endpoint: "https://oss-cn-chengdu.aliyuncs.com" |     endpoint: "https://oss-cn-chengdu.aliyuncs.com" | ||||||
|     bucket: "demo-9999999" |     bucket: "demo-9999999" | ||||||
|     bucketURL: "https://demo-9999999.oss-cn-chengdu.aliyuncs.com" |     bucketURL: "https://demo-9999999.oss-cn-chengdu.aliyuncs.com" | ||||||
|     accessKeyID: "" |     accessKeyID: '' | ||||||
|     accessKeySecret: "" |     accessKeySecret: '' | ||||||
|     sessionToken: "" |     sessionToken: '' | ||||||
|  | 
 | ||||||
| 
 | 
 | ||||||
| ###################### RPC Port Configuration ###################### | ###################### RPC Port Configuration ###################### | ||||||
| # RPC service ports | # RPC service ports | ||||||
| @ -193,7 +194,7 @@ rpcRegisterName: | |||||||
| # Whether to output in json format | # Whether to output in json format | ||||||
| # Whether to include stack trace in logs | # Whether to include stack trace in logs | ||||||
| log: | log: | ||||||
|   storageLocation: ../../../../../logs/ |   storageLocation: /root/workspaces/openim/openim-server/logs/ | ||||||
|   rotationTime: 24 |   rotationTime: 24 | ||||||
|   remainRotationCount: 2 |   remainRotationCount: 2 | ||||||
|   remainLogLevel: 6 |   remainLogLevel: 6 | ||||||
|  | |||||||
| @ -14,6 +14,10 @@ | |||||||
| # See the License for the specific language governing permissions and | # See the License for the specific language governing permissions and | ||||||
| # limitations under the License. | # limitations under the License. | ||||||
| 
 | 
 | ||||||
|  | set -o errexit | ||||||
|  | set -o nounset | ||||||
|  | set -o pipefail | ||||||
|  | 
 | ||||||
| #fixme This scripts is the total startup scripts | #fixme This scripts is the total startup scripts | ||||||
| #fixme The full name of the shell scripts that needs to be started is placed in the need_to_start_server_shell array | #fixme The full name of the shell scripts that needs to be started is placed in the need_to_start_server_shell array | ||||||
| 
 | 
 | ||||||
| @ -22,10 +26,7 @@ source "${OPENIM_ROOT}/scripts/install/common.sh" | |||||||
| 
 | 
 | ||||||
| trap 'openim::util::onCtrlC' INT | trap 'openim::util::onCtrlC' INT | ||||||
| 
 | 
 | ||||||
| nohup "${OPENIM_ROOT}"/scripts/start-all.sh >> ${LOG_FILE} 2>&1 & | "${OPENIM_ROOT}"/scripts/start-all.sh | ||||||
| 
 | "${OPENIM_ROOT}"/scripts/check-all.sh | ||||||
| sleep 15 |  | ||||||
| 
 |  | ||||||
| nohup "${OPENIM_ROOT}"/scripts/check-all.sh >> ${LOG_FILE} 2>&1 & |  | ||||||
| 
 | 
 | ||||||
| tail -f ${LOG_FILE} | tail -f ${LOG_FILE} | ||||||
| @ -102,7 +102,7 @@ function openim::tools::start_service() { | |||||||
|     cmd="${cmd} --prometheus_port ${prometheus_port}" |     cmd="${cmd} --prometheus_port ${prometheus_port}" | ||||||
|   fi |   fi | ||||||
|   openim::log::info "Starting ${binary_name}..." |   openim::log::info "Starting ${binary_name}..." | ||||||
|   ${cmd} >> "${LOG_FILE}" 2>&1 & |   ${cmd} | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function openim::tools::start() { | function openim::tools::start() { | ||||||
|  | |||||||
| @ -212,12 +212,12 @@ openim::log::success() | |||||||
| 
 | 
 | ||||||
| function openim::log::test_log() { | function openim::log::test_log() { | ||||||
|     echo_log "test log" |     echo_log "test log" | ||||||
|     openim::log::error "openim::log::error" |  | ||||||
|     openim::log::info "openim::log::info" |     openim::log::info "openim::log::info" | ||||||
|     openim::log::progress "openim::log::progress" |     openim::log::progress "openim::log::progress" | ||||||
|     openim::log::status "openim::log::status" |     openim::log::status "openim::log::status" | ||||||
|     openim::log::success "openim::log::success" |     openim::log::success "openim::log::success" | ||||||
|  |     openim::log::error "openim::log::error" | ||||||
|     openim::log::error_exit "openim::log::error_exit" |     openim::log::error_exit "openim::log::error_exit" | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| # openim::log::test_log | openim::log::test_log | ||||||
| @ -61,10 +61,11 @@ function execute_scripts() { | |||||||
|         else |         else | ||||||
|             openim::log::errexit "Script ${script_path##*/} is missing or not executable." |             openim::log::errexit "Script ${script_path##*/} is missing or not executable." | ||||||
|         fi |         fi | ||||||
|         sleep 0.5 |  | ||||||
|     done |     done | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | sleep 0.5 | ||||||
|  | 
 | ||||||
| # TODO Prelaunch tools, simple for now, can abstract functions later | # TODO Prelaunch tools, simple for now, can abstract functions later | ||||||
| TOOLS_START_SCRIPTS_PATH=${START_SCRIPTS_PATH}/openim-tools.sh | TOOLS_START_SCRIPTS_PATH=${START_SCRIPTS_PATH}/openim-tools.sh | ||||||
| ${TOOLS_START_SCRIPTS_PATH} openim::tools::pre-start | ${TOOLS_START_SCRIPTS_PATH} openim::tools::pre-start | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user