41 Commits

Author SHA1 Message Date
wangchuxiao
02fa9142fe prometheus 2022-09-15 16:27:36 +08:00
wangchuxiao
7f1acb4532 prome 2022-09-15 09:30:23 +08:00
wangchuxiao
144cf279f9 prome 2022-09-15 08:45:10 +08:00
wangchuxiao
aa6b439e8c prome 2022-09-15 01:35:08 +08:00
wangchuxiao
a1f79f4508 prome 2022-09-15 01:22:20 +08:00
wangchuxiao
5ce0cf1aad prome 2022-09-14 18:16:02 +08:00
wangchuxiao
d534f026b0 promethues 2022-09-14 17:45:38 +08:00
wangchuxiao
05b5a0ada3 add 2022-09-05 17:52:43 +08:00
wangchuxiao
6774a8594f cms 2022-09-02 02:01:42 +08:00
Gordon
93f8ed223e group file update 2022-08-26 17:41:58 +08:00
wangchuxiao
d20c89ba21 merge shichuang 2 v2.3.0release 2022-08-21 17:57:44 +08:00
wangchuxiao
d0a200f652 etcd 2022-08-17 14:57:57 +08:00
wangchuxiao
bda96a2175 fix 2022-08-16 23:45:32 +08:00
wangchuxiao
7d1707ca7c fix log 2022-08-15 16:51:41 +08:00
欧阳氏
39606248a1 邀请码功能
1、新增邀请码功能
  needInvitationCode: false 改成 true 后生效
2、完善后台用户注册 修改相关
2022-08-13 10:41:10 +08:00
wangchuxiao
429bee7e6c
Merge pull request #261 from ouyangshi/v2.3.0release
增加注册IP 登陆IP+用户IP限制策略
2022-08-11 11:07:56 +08:00
skiffer-git
5cbea2cab5 Set token kicked status first in forceKickOff 2022-08-09 13:52:20 +08:00
skiffer-git
57a21ab8e6 forceKickOff work 2022-08-09 13:18:02 +08:00
欧阳氏
9358aa1bd8 用户表增加注册IP 登陆IP
1、用户表增加注册IP 登陆IP
2、新增ip_limit表、user_ip_limit表
3、用户创建需要增加createIp参数同步
   用户登录需要增加loginIp参数同步

login_limit 限制说明
0:读取ip_limits表 限制用户注册+用户登陆IP
1:读取user_ip_limits表 限制用户在指定IP登陆
2:读取black_lists表 限制用户在限制时间不能登陆
2022-08-09 10:42:19 +08:00
Gordon
403489865c del conversation bug fix 2022-08-05 16:43:23 +08:00
skiffer-git
4b22eb946c rename 2022-07-20 21:07:46 +08:00
wenxu12345
218340e138 Rpc Register IP 2022-06-23 09:24:05 +08:00
wangchuxiao
5f42748e1b Merge branch 'tuoyun' into superGroup
# Conflicts:
#	internal/msg_gateway/gate/callback.go
#	internal/msg_transfer/logic/online_history_msg_handler.go
#	internal/push/logic/callback.go
#	internal/push/logic/push_to_client.go
#	pkg/common/db/model.go
#	pkg/common/db/newRedisModel.go
#	pkg/proto/group/group.pb.go
#	pkg/proto/group/group.proto
2022-06-07 17:42:24 +08:00
skiffer-git
4418d031e1 log 2022-06-07 16:18:23 +08:00
skiffer-git
eac137a9a9 ForceLogout 2022-06-07 11:50:37 +08:00
skiffer-git
290ae774e0 ForceLogout 2022-06-07 11:42:15 +08:00
Gordon
4678189ed4 pb file 2022-06-07 10:12:15 +08:00
skiffer-git
064b650fac group administrator access 2022-06-06 23:19:07 +08:00
skiffer-git
797e2fea1e group info set 2022-06-06 20:39:45 +08:00
Gordon
a18dcfce9e ws and push update 2022-06-02 16:44:55 +08:00
wangchuxiao
c0a3bdcf99 k8s 2022-05-29 19:44:22 +08:00
Gordon
9303096430 log change 2022-05-10 09:09:37 +08:00
skiffer-git
dca16e83d3 rpc register ip 2022-05-07 17:05:05 +08:00
skiffer-git
2bdaaa5a33 log 2022-04-20 20:58:51 +08:00
wenxu12345
ecd2f0e2bf Merge log files 2022-03-31 11:15:06 +08:00
Gordon
7790686a84 ws add token platform verify 2022-03-17 15:46:32 +08:00
wenxu12345
548c92dc0d Refactor code 2022-01-06 20:17:22 +08:00
wenxu12345
87659b56a4 Refactor code 2021-12-31 10:57:45 +08:00
wenxu12345
da73347231 tidy code 2021-12-28 20:28:01 +08:00
wenxu12345
12ebf232d5 tidy code 2021-12-28 18:37:16 +08:00
wenxu12345
e439ef4ddd tidy code 2021-12-27 16:48:05 +08:00