Commit Graph

917 Commits

Author SHA1 Message Date
wenxu12345 9077b56df1 Refactor code 2022-02-08 15:19:31 +08:00
wenxu12345 3380cab2c3 Refactor code 2022-02-08 14:50:47 +08:00
wenxu12345 1355fa0636 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-08 14:45:34 +08:00
wenxu12345 70fb869852 Refactor code 2022-02-08 14:45:21 +08:00
Gordon 73da15586b Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-08 14:10:41 +08:00
Gordon b3024a6f7c test 2022-02-08 14:06:49 +08:00
wenxu12345 4c42f5a2f5 Refactor code 2022-02-08 12:22:37 +08:00
wenxu12345 14cf30cd98 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-02-08 11:54:52 +08:00
skiffer-git 6cbdc958cd notification 2022-01-28 11:18:31 +08:00
skiffer-git fca092d392 Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	config/config.yaml
#	internal/rpc/chat/send_msg.go
#	internal/rpc/group/create_group.go
#	pkg/common/config/config.go
#	pkg/proto/sdk_ws/ws.pb.go
#	pkg/proto/sdk_ws/ws.proto
2022-01-27 11:51:34 +08:00
Gordon 8525dcb376 fix time convert 2022-01-24 16:44:14 +08:00
skiffer-git 27d402104e Merge remote-tracking branch 'origin/tuoyun' into tuoyun
# Conflicts:
#	cmd/Open-IM-SDK-Core
#	pkg/common/config/config.go
2022-01-22 09:55:54 +08:00
Gordon 1944b24fba push message modify 2022-01-21 09:39:09 +08:00
Gordon 8e10533681 msg test 2022-01-20 19:23:20 +08:00
Gordon 5a9f3f1f5e msg test 2022-01-20 19:20:56 +08:00
Gordon 64f2fb9e73 msg test 2022-01-20 18:38:20 +08:00
Gordon cbed698a1c msg test 2022-01-20 18:36:30 +08:00
Gordon cd7efee49c msg test 2022-01-20 18:28:45 +08:00
Gordon f7ab90724e msg test 2022-01-20 18:04:24 +08:00
Gordon aa7b891150 chat log model update 2022-01-20 17:29:38 +08:00
Gordon 911100923f chat log model update 2022-01-20 17:18:41 +08:00
Gordon 3c64d84980 protocol modify 2022-01-20 11:55:08 +08:00
Gordon e4f87b53b4 protocol modify 2022-01-20 11:53:57 +08:00
Gordon ff779fcc7c protocol modify 2022-01-20 11:42:43 +08:00
Gordon e7c7784fec protocol modify 2022-01-20 11:37:14 +08:00
Gordon 184f0900fb protocol modify 2022-01-20 11:36:43 +08:00
wenxu12345 9ca83b7349 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-01-20 10:02:41 +08:00
Gordon 8b3df83e7e ws proto 2022-01-20 10:00:02 +08:00
Gordon da24249850 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-01-19 18:18:57 +08:00
Gordon 04e509fc49 update user 2022-01-19 18:14:53 +08:00
wenxu12345 99a8eaea91 Refactor code 2022-01-19 18:02:57 +08:00
wenxu12345 4c3474a9f7 Refactor code 2022-01-19 17:29:25 +08:00
wenxu12345 14ccbf335d Refactor code 2022-01-19 17:17:51 +08:00
wenxu12345 14841a44ad Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-01-19 16:11:18 +08:00
Gordon d2b411ecbb nil modify 2022-01-19 14:50:36 +08:00
Gordon 544e60eb6d nil modify 2022-01-19 14:45:23 +08:00
wenxu12345 db80d8f56f Refactor code 2022-01-19 14:12:29 +08:00
wenxu12345 ae09d73257 Refactor code 2022-01-19 14:10:15 +08:00
Gordon ca0f095d6b db charset set utf-8 2022-01-19 14:00:25 +08:00
Gordon 1a0f626a80 model length add 2022-01-19 12:31:28 +08:00
Gordon c23426425e Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-01-19 12:02:55 +08:00
Gordon de52439276 model length add 2022-01-19 11:49:01 +08:00
Gordon 757b296fd0 model length add 2022-01-19 11:47:40 +08:00
wenxu12345 83e842d121 Refactor code 2022-01-19 09:33:31 +08:00
wenxu12345 7f00a3075f Refactor code 2022-01-19 09:32:46 +08:00
wenxu12345 1c362e4871 Refactor code 2022-01-18 21:42:27 +08:00
wenxu12345 0dc5c9dbac Refactor code 2022-01-18 21:17:35 +08:00
wenxu12345 28d9304ec6 Refactor code 2022-01-18 20:27:46 +08:00
wenxu12345 d132e53c06 Refactor code 2022-01-18 20:04:58 +08:00
wenxu12345 e28a8db3b4 Refactor code 2022-01-18 19:46:17 +08:00