Merge pull request #50 from bufanyun/v2.0

修复删除用户参数错误

server/internal/global/cluster.go

@@ -49,5 +49,4 @@ func PublishClusterSync(ctx context.Context, channel string, message interface{}
 	if err != nil {
 		g.Log().Warningf(ctx, "PublishClusterSync %v LockFunc err:%v", channel, err)
 	}
-	return
 }

server/internal/library/network/tcp/server_cron.go

@@ -28,13 +28,13 @@ func (server *Server) startCron() {
 	// 心跳超时检查
 	if gcron.Search(server.getCronKey(CronHeartbeatVerify)) == nil {
 		_, _ = gcron.AddSingleton(server.ctx, "@every 300s", func(ctx context.Context) {
+			if server == nil || server.clients == nil {
+				return
+			}
 
 			server.mutexConns.Lock()
 			defer server.mutexConns.Unlock()
 
-			if server == nil || server.clients == nil {
-				return
-			}
 			for _, client := range server.clients {
 				if client.Heartbeat < gtime.Timestamp()-HeartbeatTimeout {
 					client.Conn.Close()
@@ -47,13 +47,13 @@ func (server *Server) startCron() {
 	// 认证检查
 	if gcron.Search(server.getCronKey(CronAuthVerify)) == nil {
 		_, _ = gcron.AddSingleton(server.ctx, "@every 300s", func(ctx context.Context) {
+			if server == nil || server.clients == nil {
+				return
+			}
 
 			server.mutexConns.Lock()
 			defer server.mutexConns.Unlock()
 
-			if server == nil || server.clients == nil {
-				return
-			}
 			for _, client := range server.clients {
 				if client.Auth == nil {
 					continue

server/internal/library/token/token.go

@@ -38,7 +38,7 @@ type Token struct {
 var (
 	config          *model.TokenConfig
 	errorLogin      = gerror.New("登录身份已失效，请重新登录！")
-	errorMultiLogin = gerror.New("账号存在异地登录，如非本人操作请及时修改登录密码！")
+	errorMultiLogin = gerror.New("账号已在其他地方登录，如非本人操作请及时修改登录密码！")
 )
 
 func SetConfig(c *model.TokenConfig) {

server/internal/logic/admin/member.go

@@ -431,7 +431,7 @@ func (s *sAdminMember) Delete(ctx context.Context, in *adminin.MemberDeleteInp)
 			return
 		}
 
-		if _, err = dao.AdminMemberPost.Ctx(ctx).Where("member_id", memberId).Delete(); err != nil {
+		if _, err = dao.AdminMemberPost.Ctx(ctx).Where("member_id", in.Id).Delete(); err != nil {
 			err = gerror.Wrap(err, "删除用户岗位失败，请稍后重试！")
 		}
 		return