golangci-lint run

2025-11-13 12:43:45 +08:00 · 2023-07-24 09:35:30 +08:00
parent 071b6224c9
commit 996ed818ee
61 changed files with 527 additions and 271 deletions
--- a/server/internal/library/addons/module.go
+++ b/server/internal/library/addons/module.go
@@ -137,9 +137,9 @@ func NewView(ctx context.Context, name string) *gview.View {
 	}
 	view.SetDelimiters(delimiters[0], delimiters[1])

-	//// 更多配置
-	//view.SetI18n()
-	//// ...
+	// 更多配置
+	// view.SetI18n()
+	// ...
 	return view
 }

--- a/server/internal/library/captcha/captcha.go
+++ b/server/internal/library/captcha/captcha.go
@@ -3,7 +3,6 @@
 // @Copyright  Copyright (c) 2023 HotGo CLI
 // @Author  Ms <133814250@qq.com>
 // @License  https://github.com/bufanyun/hotgo/blob/master/LICENSE
-//
 package captcha

 import (
@@ -17,21 +16,21 @@ import (
 // Generate 生成验证码
 func Generate(ctx context.Context) (id string, base64 string) {
 	// 字符
-	//driver := &base64Captcha.DriverString{
-	//	Height: 42,
-	//	Width:  100,
-	//	//NoiseCount:      50,
-	//	//ShowLineOptions: 20,
-	//	Length: 4,
-	//	BgColor: &color.RGBA{
-	//		R: 255,
-	//		G: 250,
-	//		B: 250,
-	//		A: 250,
-	//	},
-	//	Source: "0123456789", // abcdefghjkmnpqrstuvwxyz23456789
-	//	Fonts:  []string{"chromohv.ttf"},
-	//}
+	//	driver := &base64Captcha.DriverString{
+	//		Height: 42,
+	//		Width:  100,
+	//		//NoiseCount:      50,
+	//		//ShowLineOptions: 20,
+	//		Length: 4,
+	//		BgColor: &color.RGBA{
+	//			R: 255,
+	//			G: 250,
+	//			B: 250,
+	//			A: 250,
+	//		},
+	//		Source: "0123456789", // abcdefghjkmnpqrstuvwxyz23456789
+	//		Fonts:  []string{"chromohv.ttf"},
+	//	}

 	// 算数
 	driver := &base64Captcha.DriverMath{
--- a/server/internal/library/hggen/internal/cmd/genenums/genenums_parser.go
+++ b/server/internal/library/hggen/internal/cmd/genenums/genenums_parser.go
@@ -33,15 +33,15 @@ type EnumItem struct {

 var standardPackages = make(map[string]struct{})

-func init() {
-	stdPackages, err := packages.Load(nil, "std")
-	if err != nil {
-		panic(err)
-	}
-	for _, p := range stdPackages {
-		standardPackages[p.ID] = struct{}{}
-	}
-}
+//func init() {
+//	stdPackages, err := packages.Load(nil, "std")
+//	if err != nil {
+//		panic(err)
+//	}
+//	for _, p := range stdPackages {
+//		standardPackages[p.ID] = struct{}{}
+//	}
+//}

 func NewEnumsParser(prefixes []string) *EnumsParser {
 	return &EnumsParser{
--- a/server/internal/library/hggen/views/column_default.go
+++ b/server/internal/library/hggen/views/column_default.go
@@ -97,7 +97,6 @@ var defaultWhereModeMap = map[string]string{

 // setDefault 设置默认属性
 func setDefault(field *sysin.GenCodesColumnListModel) {
-
 	setDefaultEdit(field)

 	setDefaultFormMode(field)
@@ -192,7 +191,6 @@ func setDefaultFormMode(field *sysin.GenCodesColumnListModel) {
 		field.FormMode = FormModeInputEditor
 		return
 	}
-
 }

 // setDefaultFormRole 设置默认表单验证
--- a/server/internal/library/hggen/views/curd_generate_logic.go
+++ b/server/internal/library/hggen/views/curd_generate_logic.go
@@ -19,7 +19,7 @@ const (
 	LogicWhereComments      = "\n\t// 查询%s\n"
 	LogicWhereNoSupport     = "\t// TODO 暂不支持生成[ %s ]查询方式，请自行补充此处代码！"
 	LogicListSimpleSelect   = "\tfields, err := hgorm.GenSelect(ctx, sysin.%sListModel{}, dao.%s)\n\tif err != nil {\n\t\treturn\n\t}"
-	LogicListJoinSelect     = "\t//关联表select\n\tfields, err := hgorm.GenJoinSelect(ctx, %sin.%sListModel{}, &dao.%s, []*hgorm.Join{\n%v\t})\n\n\tif err != nil {\n\t\terr = gerror.Wrap(err, \"获取%s关联字段失败，请稍后重试！\")\n\t\treturn\n\t}"
+	LogicListJoinSelect     = "\t// 关联表select\n\tfields, err := hgorm.GenJoinSelect(ctx, %sin.%sListModel{}, &dao.%s, []*hgorm.Join{\n%v\t})\n\n\tif err != nil {\n\t\terr = gerror.Wrap(err, \"获取%s关联字段失败，请稍后重试！\")\n\t\treturn\n\t}"
 	LogicListJoinOnRelation = "\t// 关联表%s\n\tmod = mod.%s(hgorm.GenJoinOnRelation(\n\t\tdao.%s.Table(), dao.%s.Columns().%s, // 主表表名,关联字段\n\t\tdao.%s.Table(), \"%s\", dao.%s.Columns().%s, // 关联表表名,别名,关联字段\n\t)...)\n\n"
 	LogicEditUpdate         = "\tif _, err = s.Model(ctx%s).\n\t\t\tFields(%sin.%sUpdateFields{}).\n\t\t\tWherePri(in.%s).Data(in).Update(); err != nil {\n\t\t\terr = gerror.Wrap(err, \"修改%s失败，请稍后重试！\")\n\t\t}\n\t\treturn"
 	LogicEditInsert         = "\tif _, err = s.Model(ctx, &handler.Option{FilterAuth: false}).\n\t\tFields(%sin.%sInsertFields{}).\n\t\tData(in).Insert(); err != nil {\n\t\terr = gerror.Wrap(err, \"新增%s失败，请稍后重试！\")\n\t}"
--- a/server/internal/library/hggen/views/curd_generate_web_edit.go
+++ b/server/internal/library/hggen/views/curd_generate_web_edit.go
@@ -56,12 +56,12 @@ func (l *gCurd) generateWebEditFormItem(ctx context.Context, in *CurdPreviewInpu
 		case FormModeDate:
 			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <DatePicker v-model:formValue=\"params.%s\" type=\"date\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)

-		//case FormModeDateRange:  // 必须要有两个字段，后面优化下
+		// case FormModeDateRange:  // 必须要有两个字段，后面优化下

 		case FormModeTime:
 			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <DatePicker v-model:formValue=\"params.%s\" type=\"datetime\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)

-		//case FormModeTimeRange: // 必须要有两个字段，后面优化下
+		// case FormModeTimeRange: // 必须要有两个字段，后面优化下

 		case FormModeRadio:
 			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-radio-group v-model:value=\"params.%s\" name=\"%s\">\n            <n-radio-button\n              v-for=\"%s in options.%s\"\n              :key=\"%s.value\"\n              :value=\"%s.value\"\n              :label=\"%s.label\"\n            />\n          </n-radio-group>\n          </n-form-item>", field.Dc, field.TsName, field.TsName, field.TsName, field.TsName, in.options.dictMap[field.TsName], field.TsName, field.TsName, field.TsName)
@@ -109,7 +109,6 @@ func (l *gCurd) generateWebEditFormItem(ctx context.Context, in *CurdPreviewInpu
 		} else {
 			buffer.WriteString("          " + component + "\n\n")
 		}
-
 	}
 	return buffer.String()
 }
@@ -167,7 +166,6 @@ func (l *gCurd) generateWebEditScript(ctx context.Context, in *CurdPreviewInput)
 				importBuffer.WriteString("  import CitySelector from '@/components/CitySelector/citySelector.vue';\n")
 			}
 		}
-
 	}

 	data["import"] = importBuffer.String()
--- a/server/internal/library/hggen/views/curd_generate_web_index.go
+++ b/server/internal/library/hggen/views/curd_generate_web_index.go
@@ -31,9 +31,9 @@ func (l *gCurd) webIndexTplData(ctx context.Context, in *CurdPreviewInput) (g.Ma
 		iconsImport = append(iconsImport, " PlusOutlined")
 	}

-	//// 编辑
-	//if in.options.Step.HasEdit {
-	//}
+	// 编辑
+	// if in.options.Step.HasEdit {
+	// }

 	// 导出
 	if in.options.Step.HasExport {
--- a/server/internal/library/hggen/views/curd_generate_web_view.go
+++ b/server/internal/library/hggen/views/curd_generate_web_view.go
@@ -31,7 +31,6 @@ func (l *gCurd) generateWebViewItem(ctx context.Context, in *CurdPreviewInput) s
 		)

 		switch field.FormMode {
-
 		case FormModeInputTextarea, FormModeInputEditor:
 			component = fmt.Sprintf("<n-descriptions-item>\n          <template #label>%s</template>\n          <span v-html=\"formValue.%s\"></span></n-descriptions-item>", field.Dc, field.TsName)

--- a/server/internal/library/network/tcp/client.go
+++ b/server/internal/library/network/tcp/client.go
@@ -206,7 +206,7 @@ func (client *Client) read() {
 			client.Close()
 			client.logger.Debugf(client.ctx, "client are about to be reconnected..")
 			time.Sleep(client.config.ConnectInterval)
-			client.Start()
+			_ = client.Start()
 		}()

 		if err := client.conn.Run(); err != nil {
--- a/server/internal/library/network/tcp/client_cron.go
+++ b/server/internal/library/network/tcp/client_cron.go
@@ -14,14 +14,13 @@ import (

 // getCronKey 生成客户端定时任务名称
 func (client *Client) getCronKey(s string) string {
-	return fmt.Sprintf("tcp.client_%s:%s", s, client.conn.LocalAddr().String())
+	return fmt.Sprintf("tcp.client_%s:%d", s, client.conn.CID)
 }

 // stopCron 停止定时任务
 func (client *Client) stopCron() {
-	for _, v := range gcron.Entries() {
-		gcron.Remove(v.Name)
-	}
+	gcron.Remove(client.getCronKey(CronHeartbeatVerify))
+	gcron.Remove(client.getCronKey(CronHeartbeat))
 }

 // startCron 启动定时任务
--- a/server/internal/library/network/tcp/msg.go
+++ b/server/internal/library/network/tcp/msg.go
@@ -34,7 +34,6 @@ func (i *ServerRes) SetMessage(msg ...string) {
 	message := "操作成功"
 	if len(msg) > 0 {
 		message = msg[0]
-		return
 	}
 	i.Message = message
 }
@@ -45,7 +44,6 @@ func (i *ServerRes) SetError(err error) {
 		i.Code = gerror.Code(err).Code()
 		i.Message = err.Error()
 	}
-	return
 }

 // GetError 获取响应中的错误
--- a/server/internal/library/network/tcp/msg_parser.go
+++ b/server/internal/library/network/tcp/msg_parser.go
@@ -90,7 +90,6 @@ func (m *MsgParser) RegisterRPCRouter(routers ...interface{}) (err error) {
 // RegisterInterceptor 注册拦截器
 func (m *MsgParser) RegisterInterceptor(interceptors ...Interceptor) {
 	m.interceptors = append(interceptors, interceptors...)
-	return
 }

 // Encoding 消息编码
@@ -166,7 +165,6 @@ func (m *MsgParser) doHandleRouterMsg(ctx context.Context, handler *RouteHandler
 				responseMsg, deErr := m.doDecoding(ctx, results[0].Interface(), msg.MsgId)
 				if deErr != nil && responseErr == nil {
 					responseErr = deErr
-					return
 				}

 				if responseErr != nil {
--- a/server/internal/library/network/tcp/server.go
+++ b/server/internal/library/network/tcp/server.go
@@ -203,7 +203,6 @@ func (server *Server) RegisterRouter(routers ...interface{}) {
 	if err != nil {
 		server.logger.Fatal(server.ctx, err)
 	}
-	return
 }

 // RegisterRPCRouter 注册RPC路由
@@ -212,7 +211,6 @@ func (server *Server) RegisterRPCRouter(routers ...interface{}) {
 	if err != nil {
 		server.logger.Fatal(server.ctx, err)
 	}
-	return
 }

 // RegisterInterceptor 注册拦截器
--- a/server/internal/library/network/tcp/server_cron.go
+++ b/server/internal/library/network/tcp/server_cron.go
@@ -19,16 +19,15 @@ func (server *Server) getCronKey(s string) string {

 // stopCron 停止定时任务
 func (server *Server) stopCron() {
-	for _, v := range gcron.Entries() {
-		gcron.Remove(v.Name)
-	}
+	gcron.Remove(server.getCronKey(CronHeartbeatVerify))
+	gcron.Remove(server.getCronKey(CronAuthVerify))
 }

 // startCron 启动定时任务
 func (server *Server) startCron() {
 	// 心跳超时检查
 	if gcron.Search(server.getCronKey(CronHeartbeatVerify)) == nil {
-		gcron.AddSingleton(server.ctx, "@every 300s", func(ctx context.Context) {
+		_, _ = gcron.AddSingleton(server.ctx, "@every 300s", func(ctx context.Context) {
 			if server == nil || server.clients == nil {
 				return
 			}
@@ -43,7 +42,7 @@ func (server *Server) startCron() {

 	// 认证检查
 	if gcron.Search(server.getCronKey(CronAuthVerify)) == nil {
-		gcron.AddSingleton(server.ctx, "@every 300s", func(ctx context.Context) {
+		_, _ = gcron.AddSingleton(server.ctx, "@every 300s", func(ctx context.Context) {
 			if server == nil || server.clients == nil {
 				return
 			}
@@ -52,7 +51,7 @@ func (server *Server) startCron() {
 					continue
 				}
 				if client.Auth.EndAt.Before(gtime.Now()) {
-					client.Conn.Close()
+					_ = client.Conn.Close()
 					server.logger.Debugf(server.ctx, "client auth expired, close conn. auth:%+v", client.Auth)
 				}
 			}
--- a/server/internal/library/notify/feishu/sharechat.go
+++ b/server/internal/library/notify/feishu/sharechat.go
@@ -18,7 +18,7 @@ func NewShareChatMessage() *ShareChatMessage {
 	return &ShareChatMessage{}
 }

-func (m *ShareChatMessage) SetShareChatID(ID string) *ShareChatMessage {
-	m.Content.ShareChatID = ID
+func (m *ShareChatMessage) SetShareChatID(id string) *ShareChatMessage {
+	m.Content.ShareChatID = id
 	return m
 }
--- a/server/internal/library/payment/payment.go
+++ b/server/internal/library/payment/payment.go
@@ -114,7 +114,6 @@ func AutoTradeType(payType, userAgent string) (tradeType string) {
 		}
 		return consts.TradeTypeQQWeb
 	default:
-
 	}
 	return
 }
--- a/server/internal/library/queue/consumer.go
+++ b/server/internal/library/queue/consumer.go
@@ -5,24 +5,24 @@ import (
 	"sync"
 )

-// consumerStrategy 消费者策略，实现该接口即可加入到消费队列中
-type consumerStrategy interface {
+// Consumer 消费者接口，实现该接口即可加入到消费队列中
+type Consumer interface {
 	GetTopic() string                                    // 获取消费主题
-	Handle(ctx context.Context, mqMsg MqMsg) (err error) // 处理消息
+	Handle(ctx context.Context, mqMsg MqMsg) (err error) // 处理消息的方法
 }

 // consumerManager 消费者管理
 type consumerManager struct {
 	sync.Mutex
-	list map[string]consumerStrategy // 维护的消费者列表
+	list map[string]Consumer // 维护的消费者列表
 }

 var consumers = &consumerManager{
-	list: make(map[string]consumerStrategy),
+	list: make(map[string]Consumer),
 }

 // RegisterConsumer 注册任务到消费者队列
-func RegisterConsumer(cs consumerStrategy) {
+func RegisterConsumer(cs Consumer) {
 	consumers.Lock()
 	defer consumers.Unlock()
 	topic := cs.GetTopic()
@@ -35,18 +35,18 @@ func RegisterConsumer(cs consumerStrategy) {

 // StartConsumersListener 启动所有已注册的消费者监听
 func StartConsumersListener(ctx context.Context) {
-	for _, consumer := range consumers.list {
-		go func(consumer consumerStrategy) {
-			consumerListen(ctx, consumer)
-		}(consumer)
+	for _, c := range consumers.list {
+		go func(c Consumer) {
+			consumerListen(ctx, c)
+		}(c)
 	}
 }

 // consumerListen 消费者监听
-func consumerListen(ctx context.Context, job consumerStrategy) {
+func consumerListen(ctx context.Context, job Consumer) {
 	var (
-		topic         = job.GetTopic()
-		consumer, err = InstanceConsumer()
+		topic  = job.GetTopic()
+		c, err = InstanceConsumer()
 	)

 	if err != nil {
@@ -54,17 +54,16 @@ func consumerListen(ctx context.Context, job consumerStrategy) {
 		return
 	}

-	if listenErr := consumer.ListenReceiveMsgDo(topic, func(mqMsg MqMsg) {
+	if listenErr := c.ListenReceiveMsgDo(topic, func(mqMsg MqMsg) {
 		err = job.Handle(ctx, mqMsg)

-		//if err != nil {
+		// if err != nil {
 		//	// 遇到错误，重新加入到队列
 		//	//queue.Push(topic, mqMsg.Body)
-		//}
+		// }

 		// 记录消费队列日志
 		ConsumerLog(ctx, topic, mqMsg, err)
-
 	}); listenErr != nil {
 		Logger().Fatalf(ctx, "消费队列：%s 监听失败, err:%+v", topic, listenErr)
 	}
--- a/server/internal/library/queue/disk/reader.go
+++ b/server/internal/library/queue/disk/reader.go
@@ -117,8 +117,9 @@ func (r *reader) close() {
 // sync index and offset
 func (r *reader) sync() {
 	name := path.Join(r.config.Path, indexFile)
-	data, _ := json.Marshal(&r.checkpoint)
-	_ = os.WriteFile(name, data, filePerm)
+	if data, err := json.Marshal(&r.checkpoint); err == nil {
+		_ = os.WriteFile(name, data, filePerm)
+	}
 }

 // restore index and offset
--- a/server/internal/library/queue/kafkamq.go
+++ b/server/internal/library/queue/kafkamq.go
@@ -85,7 +85,7 @@ func (r *KafkaMq) ListenReceiveMsgDo(topic string, receiveDo func(mqMsg MqMsg))
 		return gerror.New("queue kafka consumer not register")
 	}

-	consumer := Consumer{
+	consumer := KaConsumer{
 		ready:        make(chan bool),
 		receiveDoFun: receiveDo,
 	}
@@ -219,26 +219,25 @@ func validateVersion(version sarama.KafkaVersion) bool {
 	return false
 }

-type Consumer struct {
+type KaConsumer struct {
 	ready        chan bool
 	receiveDoFun func(mqMsg MqMsg)
 }

 // Setup is run at the beginning of a new session, before ConsumeClaim
-func (consumer *Consumer) Setup(sarama.ConsumerGroupSession) error {
+func (consumer *KaConsumer) Setup(sarama.ConsumerGroupSession) error {
 	// Mark the consumer as ready
 	close(consumer.ready)
 	return nil
 }

 // Cleanup is run at the end of a session, once all ConsumeClaim goroutines have exited
-func (consumer *Consumer) Cleanup(sarama.ConsumerGroupSession) error {
+func (consumer *KaConsumer) Cleanup(sarama.ConsumerGroupSession) error {
 	return nil
 }

 // ConsumeClaim must start a consumer loop of ConsumerGroupClaim's Messages().
-func (consumer *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim sarama.ConsumerGroupClaim) error {
-
+func (consumer *KaConsumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim sarama.ConsumerGroupClaim) error {
 	// NOTE:
 	// Do not move the code below to a goroutine.
 	// The `ConsumeClaim` itself is called within a goroutine, see:
--- a/server/internal/library/sms/sms_tencent.go
+++ b/server/internal/library/sms/sms_tencent.go
@@ -85,14 +85,14 @@ func (d *TencentDrive) SendCode(ctx context.Context, in *sysin.SendCodeInp) (err
 	 * 示例如：+8613711112222， 其中前面有一个+号 ，86为国家码，13711112222为手机号，最多不要超过200个手机号*/
 	request.PhoneNumberSet = common.StringPtrs([]string{fmt.Sprintf("+86%v", in.Mobile)})

-	///* 用户的 session 内容（无需要可忽略）: 可以携带用户侧 ID 等上下文信息，server 会原样返回 */
-	//request.SessionContext = common.StringPtr("")
-	//
-	///* 短信码号扩展号（无需要可忽略）: 默认未开通，如需开通请联系 [腾讯云短信小助手] */
-	//request.ExtendCode = common.StringPtr("")
-	//
-	///* 国际/港澳台短信 SenderId（无需要可忽略）: 国内短信填空，默认未开通，如需开通请联系 [腾讯云短信小助手] */
-	//request.SenderId = common.StringPtr("")
+	/* 用户的 session 内容（无需要可忽略）: 可以携带用户侧 ID 等上下文信息，server 会原样返回 */
+	// request.SessionContext = common.StringPtr("")
+
+	/* 短信码号扩展号（无需要可忽略）: 默认未开通，如需开通请联系 [腾讯云短信小助手] */
+	// request.ExtendCode = common.StringPtr("")
+
+	/* 国际/港澳台短信 SenderId（无需要可忽略）: 国内短信填空，默认未开通，如需开通请联系 [腾讯云短信小助手] */
+	// request.SenderId = common.StringPtr("")

 	// 通过client对象调用想要访问的接口，需要传入请求对象
 	response, err := client.SendSms(request)