feat mod

feat 修改包路径
2026-10-28 16:30:37 +08:00 · 2026-10-28 16:21:45 +08:00 · 2026-10-28 15:58:44 +08:00 · 2026-03-11 20:17:59 +08:00 · 2026-02-11 14:49:46 +08:00 · 2026-02-07 13:15:29 +08:00
35 changed files with 239 additions and 189 deletions
--- a/app/app.go
+++ b/app/app.go
@@ -2,11 +2,11 @@ package app

 import (
 	"fmt"
-	"git.hlsq.asia/mmorpg/service-common/discover/common"
-	"git.hlsq.asia/mmorpg/service-common/log"
-	"git.hlsq.asia/mmorpg/service-common/module"
-	"git.hlsq.asia/mmorpg/service-qgdzs/config"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/grpc_server"
+	"git.hlsq.asia/alex/service-common/discover/common"
+	"git.hlsq.asia/alex/service-common/log"
+	"git.hlsq.asia/alex/service-common/module"
+	"git.hlsq.asia/alex/service-qgdzs/config"
+	"git.hlsq.asia/alex/service-qgdzs/internal/grpcserver"
 	"github.com/judwhite/go-svc"
 	"sync"
 )
@@ -16,22 +16,16 @@ type Program struct {
 }

 func (p *Program) Init(_ svc.Environment) error {
-	base := &ModuleBase{}
-	if err := base.Init(); err != nil {
-		return err
-	}
-	p.moduleList = append(p.moduleList, base)
-	p.moduleList = append(p.moduleList, (&module.DB{}).Bind(config.Get().DB, config.Get().App.Name))
-	p.moduleList = append(p.moduleList, (&module.Grpc{}).Bind(grpc_server.NewServer(config.Get().Serve.Grpc)))
+	p.moduleList = append(p.moduleList, &module.Log{Cfg: config.Get().Log})
+	p.moduleList = append(p.moduleList, &module.DB{Cfg: config.Get().DB, AppName: config.Get().App.Name})
+	p.moduleList = append(p.moduleList, &module.Snowflake{})
+	p.moduleList = append(p.moduleList, &module.Grpc{Server: grpcserver.NewServer(config.Get().Serve.Grpc)})
 	p.moduleList = append(p.moduleList, &ModuleTimer{})
-	p.moduleList = append(p.moduleList, (&module.Prometheus{}).Bind(config.Get().Metric))
-	p.moduleList = append(p.moduleList, (&module.Tracer{}).Bind(config.Get().Metric, common.KeyDiscoverServiceNameQgdzs))
+	p.moduleList = append(p.moduleList, &module.Prometheus{Cfg: config.Get().Metric})
+	p.moduleList = append(p.moduleList, &module.Tracer{Cfg: config.Get().Metric, ServiceName: common.KeyDiscoverServiceNameQgdzs})
 	p.moduleList = append(p.moduleList, &module.Discover{})

-	for i, m := range p.moduleList {
-		if i == 0 {
-			continue
-		}
+	for _, m := range p.moduleList {
 		if err := m.Init(); err != nil {
 			return err
 		}
--- a/app/base.go
+++ b/app/base.go
@@ -1,27 +0,0 @@
-package app
-
-import (
-	"git.hlsq.asia/mmorpg/service-common/log"
-	"git.hlsq.asia/mmorpg/service-common/module"
-	"git.hlsq.asia/mmorpg/service-common/utils"
-	"git.hlsq.asia/mmorpg/service-qgdzs/config"
-	"math/rand"
-)
-
-// ModuleBase 基础模块，或者一些零散的模块
-type ModuleBase struct {
-	module.DefaultModule
-}
-
-func (m *ModuleBase) Init() error {
-	// 配置
-	if err := config.LoadConfig(); err != nil {
-		return err
-	}
-	cfg := config.Get()
-	// 日志
-	log.Init(cfg.Log.Debug, cfg.Log.MaxSize, cfg.Log.MaxBackups, cfg.Log.MaxAge, cfg.Log.Level)
-	// 雪花
-	utils.InitSnowflake(int64(rand.Intn(1000)))
-	return nil
-}
--- a/app/timer.go
+++ b/app/timer.go
@@ -1,8 +1,8 @@
 package app

 import (
-	"git.hlsq.asia/mmorpg/service-common/module"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/timer"
+	"git.hlsq.asia/alex/service-common/module"
+	"git.hlsq.asia/alex/service-qgdzs/internal/timer"
 	"sync"
 )

--- a/config/config.go
+++ b/config/config.go
@@ -1,6 +1,6 @@
 package config

-import "git.hlsq.asia/mmorpg/service-common/config"
+import "git.hlsq.asia/alex/service-common/config"

 const path = "./config"

--- a/deploy/Jenkinsfile
+++ b/deploy/Jenkinsfile
@@ -3,7 +3,7 @@ pipeline {

    environment {
        // 仓库
-        REPO_URL = 'https://git.hlsq.asia/mmorpg/service-qgdzs.git'
+        REPO_URL = 'https://git.hlsq.asia/alex/service-qgdzs.git'
        REPO_CREDENTIALS_ID = '80805ba2-f4ac-4d84-aee6-d4cce5fc0a96'

        // Registry
--- a/go.mod
+++ b/go.mod
@@ -1,9 +1,9 @@
-module git.hlsq.asia/mmorpg/service-qgdzs
+module git.hlsq.asia/alex/service-qgdzs

 go 1.24.0

 require (
-	git.hlsq.asia/mmorpg/service-common v0.0.0-20260130035320-5dc5391b07ed
+	git.hlsq.asia/alex/service-common master
 	github.com/judwhite/go-svc v1.2.1
 	github.com/robfig/cron/v3 v3.0.1
 	google.golang.org/grpc v1.77.0
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,7 @@
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
-git.hlsq.asia/mmorpg/service-common v0.0.0-20260130035320-5dc5391b07ed h1:O08p0egfekFqQSnc4sfEJUTI5dGiEyiDRNW/VYa/Ce4=
-git.hlsq.asia/mmorpg/service-common v0.0.0-20260130035320-5dc5391b07ed/go.mod h1:mMhZcumphj6gaVTppVYsMTkd+5HupmQgAc53Pd4MH9I=
+git.hlsq.asia/alex/service-common v0.0.0-20260211064821-558677bc3a2e h1:MNVS1NXNVn4DeTZPcvvA8YFM8afCzZedLPUYMffNgZs=
+git.hlsq.asia/alex/service-common v0.0.0-20260211064821-558677bc3a2e/go.mod h1:mMhZcumphj6gaVTppVYsMTkd+5HupmQgAc53Pd4MH9I=
 github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
 github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/IBM/sarama v1.46.3 h1:njRsX6jNlnR+ClJ8XmkO+CM4unbrNr/2vB5KK6UA+IE=
--- a/internal/ai/ai_client.go
+++ b/internal/ai/ai_client.go
@@ -1,7 +1,7 @@
 package ai

 import (
-	"git.hlsq.asia/mmorpg/service-common/log"
+	"git.hlsq.asia/alex/service-common/log"
 )

 type Client struct {
--- a/internal/dao/model/categories.gen.go
+++ b/internal/dao/model/categories.gen.go
@@ -7,7 +7,7 @@ package model
 import (
 	"time"

-	"git.hlsq.asia/mmorpg/service-common/utils"
+	"git.hlsq.asia/alex/service-common/utils"
 	"gorm.io/gorm"
 )

--- a/internal/dao/model/point_card.gen.go
+++ b/internal/dao/model/point_card.gen.go
@@ -7,7 +7,7 @@ package model
 import (
 	"time"

-	"git.hlsq.asia/mmorpg/service-common/utils"
+	"git.hlsq.asia/alex/service-common/utils"
 	"gorm.io/gorm"
 )

--- a/internal/dao/model/point_records.gen.go
+++ b/internal/dao/model/point_records.gen.go
@@ -7,7 +7,7 @@ package model
 import (
 	"time"

-	"git.hlsq.asia/mmorpg/service-common/utils"
+	"git.hlsq.asia/alex/service-common/utils"
 	"gorm.io/gorm"
 )

--- a/internal/dao/model/questions.gen.go
+++ b/internal/dao/model/questions.gen.go
@@ -7,7 +7,7 @@ package model
 import (
 	"time"

-	"git.hlsq.asia/mmorpg/service-common/utils"
+	"git.hlsq.asia/alex/service-common/utils"
 	"gorm.io/gorm"
 )

--- a/internal/dao/model/records.gen.go
+++ b/internal/dao/model/records.gen.go
@@ -7,7 +7,7 @@ package model
 import (
 	"time"

-	"git.hlsq.asia/mmorpg/service-common/utils"
+	"git.hlsq.asia/alex/service-common/utils"
 	"gorm.io/gorm"
 )

--- a/internal/dao/query/categories.gen.go
+++ b/internal/dao/query/categories.gen.go
@@ -16,7 +16,7 @@ import (

 	"gorm.io/plugin/dbresolver"

-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/model"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/model"
 )

 func newCategory(db *gorm.DB, opts ...gen.DOOption) category {
--- a/internal/dao/query/point_card.gen.go
+++ b/internal/dao/query/point_card.gen.go
@@ -16,7 +16,7 @@ import (

 	"gorm.io/plugin/dbresolver"

-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/model"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/model"
 )

 func newPointCard(db *gorm.DB, opts ...gen.DOOption) pointCard {
--- a/internal/dao/query/point_records.gen.go
+++ b/internal/dao/query/point_records.gen.go
@@ -16,7 +16,7 @@ import (

 	"gorm.io/plugin/dbresolver"

-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/model"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/model"
 )

 func newPointRecord(db *gorm.DB, opts ...gen.DOOption) pointRecord {
--- a/internal/dao/query/questions.gen.go
+++ b/internal/dao/query/questions.gen.go
@@ -16,7 +16,7 @@ import (

 	"gorm.io/plugin/dbresolver"

-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/model"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/model"
 )

 func newQuestion(db *gorm.DB, opts ...gen.DOOption) question {
--- a/internal/dao/query/records.gen.go
+++ b/internal/dao/query/records.gen.go
@@ -16,7 +16,7 @@ import (

 	"gorm.io/plugin/dbresolver"

-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/model"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/model"
 )

 func newRecord(db *gorm.DB, opts ...gen.DOOption) record {
--- a/internal/dao/repository/categories.go
+++ b/internal/dao/repository/categories.go
@@ -2,9 +2,9 @@ package repository

 import (
 	"context"
-	"git.hlsq.asia/mmorpg/service-common/db/redis"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/model"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/query"
+	"git.hlsq.asia/alex/service-common/db/redis"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/model"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/query"
 )

 type CategoryDao struct {
--- a/internal/dao/repository/define.go
+++ b/internal/dao/repository/define.go
@@ -2,8 +2,8 @@ package repository

 import (
 	"fmt"
-	"git.hlsq.asia/mmorpg/service-common/db/mysql"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/query"
+	"git.hlsq.asia/alex/service-common/db/mysql"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/query"
 )

 var dbName mysql.DBName = "qgdzs_db"
--- a/internal/dao/repository/point_card.go
+++ b/internal/dao/repository/point_card.go
@@ -3,10 +3,10 @@ package repository
 import (
 	"context"
 	"errors"
-	"git.hlsq.asia/mmorpg/service-common/db/redis"
-	"git.hlsq.asia/mmorpg/service-common/utils"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/model"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/query"
+	"git.hlsq.asia/alex/service-common/db/redis"
+	"git.hlsq.asia/alex/service-common/utils"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/model"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/query"
 )

 type PointCardDao struct {
@@ -45,8 +45,9 @@ func (d *PointCardDao) IncrPointCard(usn int64, point int64) error {
 	return nil
 }

-func (d *PointCardDao) FindByUserSn(usn int64) (*model.PointCard, error) {
+func (d *PointCardDao) FindPointByUserSn(usn int64) (*model.PointCard, error) {
 	return d.query.PointCard.WithContext(d.ctx).
+		Select(d.query.PointCard.Point).
 		Where(d.query.PointCard.UserSn.Eq(usn)).
 		First()
 }
--- a/internal/dao/repository/point_records.go
+++ b/internal/dao/repository/point_records.go
@@ -3,10 +3,10 @@ package repository
 import (
 	"context"
 	"errors"
-	"git.hlsq.asia/mmorpg/service-common/db/redis"
-	"git.hlsq.asia/mmorpg/service-common/utils"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/model"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/query"
+	"git.hlsq.asia/alex/service-common/db/redis"
+	"git.hlsq.asia/alex/service-common/utils"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/model"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/query"
 	"gorm.io/gorm"
 )

@@ -35,7 +35,7 @@ func (d *PointRecordsDao) CreateAndIncrPointCard(pointRecord *model.PointRecord)
 		}

 		pcd := NewPointCardDao(d.ctx, tx)
-		if _, err := pcd.FindByUserSn(pointRecord.UserSn); err != nil {
+		if _, err := pcd.FindPointByUserSn(pointRecord.UserSn); err != nil {
 			if errors.Is(err, gorm.ErrRecordNotFound) {
 				_, err = pcd.Create(&model.PointCard{
 					UserSn: pointRecord.UserSn,
@@ -56,3 +56,20 @@ func (d *PointRecordsDao) CreateAndIncrPointCard(pointRecord *model.PointRecord)
 		return nil
 	})
 }
+
+func (d *PointRecordsDao) FindByUSN(usn int64, page, pageSize int) ([]*model.PointRecord, int64, error) {
+	result := make([]*model.PointRecord, 0)
+	count, err := d.query.PointRecord.WithContext(d.ctx).
+		Select(
+			d.query.PointRecord.Source,
+			d.query.PointRecord.Point,
+			d.query.PointRecord.CreatedAt,
+		).
+		Where(d.query.PointRecord.UserSn.Eq(usn)).
+		Order(d.query.PointRecord.CreatedAt.Desc()).
+		ScanByPage(&result, (page-1)*pageSize, pageSize)
+	if err != nil {
+		return nil, 0, err
+	}
+	return result, count, nil
+}
--- a/internal/dao/repository/questions.go
+++ b/internal/dao/repository/questions.go
@@ -2,10 +2,10 @@ package repository

 import (
 	"context"
-	"git.hlsq.asia/mmorpg/service-common/db/redis"
-	"git.hlsq.asia/mmorpg/service-common/utils"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/model"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/query"
+	"git.hlsq.asia/alex/service-common/db/redis"
+	"git.hlsq.asia/alex/service-common/utils"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/model"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/query"
 	"gorm.io/gorm"
 	"time"
 )
--- a/internal/dao/repository/records.go
+++ b/internal/dao/repository/records.go
@@ -2,9 +2,9 @@ package repository

 import (
 	"context"
-	"git.hlsq.asia/mmorpg/service-common/db/redis"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/model"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/query"
+	"git.hlsq.asia/alex/service-common/db/redis"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/model"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/query"
 	"time"
 )

--- a/internal/grpc_server/server_category.go
+++ b/internal/grpc_server/server_category.go
@@ -1,37 +1,36 @@
-package grpc_server
+package grpcserver

 import (
 	"context"
 	"encoding/json"
-	"git.hlsq.asia/mmorpg/service-common/db/kafka"
-	"git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb"
-	"git.hlsq.asia/mmorpg/service-common/utils"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/repository"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/timer"
+	"git.hlsq.asia/alex/service-common/db/kafka"
+	"git.hlsq.asia/alex/service-common/proto/rs/rspb"
+	"git.hlsq.asia/alex/service-common/utils"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/repository"
 )

 // 玩法 - 类目答题

 // GetAllCategory 获取所有类目
-func (s *Server) GetAllCategory(ctx context.Context, req *grpc_pb.GetAllCategoryReq) (*grpc_pb.GetAllCategoryResp, error) {
+func (s *Server) GetAllCategory(ctx context.Context, req *rspb.GetAllCategoryReq) (*rspb.GetAllCategoryResp, error) {
 	categoryList, err := repository.NewCategoryDao(ctx, s.query).FindAll()
 	if err != nil {
 		return nil, utils.ErrorsWrap(err)
 	}
-	categories := make([]*grpc_pb.GetAllCategoryItem, 0)
+	categories := make([]*rspb.GetAllCategoryItem, 0)
 	for _, category := range categoryList {
-		categories = append(categories, &grpc_pb.GetAllCategoryItem{
+		categories = append(categories, &rspb.GetAllCategoryItem{
 			Sn:       category.Sn,
 			Category: category.Category,
 		})
 	}
-	return &grpc_pb.GetAllCategoryResp{
+	return &rspb.GetAllCategoryResp{
 		Categories: categories,
 	}, nil
 }

 // CategoryGetQuestion 获取题目
-func (s *Server) CategoryGetQuestion(ctx context.Context, req *grpc_pb.CategoryGetQuestionReq) (*grpc_pb.CategoryGetQuestionResp, error) {
+func (s *Server) CategoryGetQuestion(ctx context.Context, req *rspb.CategoryGetQuestionReq) (*rspb.CategoryGetQuestionResp, error) {
 	question, err := repository.NewQuestionDao(ctx, s.query).FindByRandom(req.CategorySn)
 	if err != nil {
 		return nil, utils.ErrorsWrap(err)
@@ -41,7 +40,7 @@ func (s *Server) CategoryGetQuestion(ctx context.Context, req *grpc_pb.CategoryG
 		return nil, utils.ErrorsWrapF(err, "data: %v", question.Options)
 	}
 	category, _ := repository.NewCategoryDao(ctx, s.query).FindNameBySn(question.CategorySn)
-	return &grpc_pb.CategoryGetQuestionResp{
+	return &rspb.CategoryGetQuestionResp{
 		Sn:         question.Sn,
 		Question:   question.Question,
 		Options:    options,
@@ -51,7 +50,7 @@ func (s *Server) CategoryGetQuestion(ctx context.Context, req *grpc_pb.CategoryG
 }

 // CategoryAnswerQuestion 回答题目
-func (s *Server) CategoryAnswerQuestion(ctx context.Context, req *grpc_pb.CategoryAnswerQuestionReq) (*grpc_pb.CategoryAnswerQuestionResp, error) {
+func (s *Server) CategoryAnswerQuestion(ctx context.Context, req *rspb.CategoryAnswerQuestionReq) (*rspb.CategoryAnswerQuestionResp, error) {
 	utils.ShouldBindUsn(ctx, &req.USN)

 	question, err := repository.NewQuestionDao(ctx, s.query).FindBySn(req.Sn)
@@ -64,15 +63,25 @@ func (s *Server) CategoryAnswerQuestion(ctx context.Context, req *grpc_pb.Catego
 	}
 	// 保存答题记录
 	if req.USN != 0 {
-		kafka.NewProducer().Produce(ctx, &timer.TopicQuestionAnswer{
+		kafka.NewProducer().Produce(ctx, &kafka.TopicQuestionAnswer{
 			MessageSn:      utils.SnowflakeInstance().Generate().Int64(),
 			USN:            req.USN,
 			QuestionSn:     question.Sn,
 			QuestionAnswer: question.Answer,
 			Answer:         req.Answer,
 		})
+
+		// 类目答题正确给5分，错误不得分
+		if req.Answer == question.Answer {
+			kafka.NewProducer().Produce(ctx, &kafka.TopicAddPoint{
+				MessageSn: utils.SnowflakeInstance().Generate().Int64(),
+				Source:    kafka.AddPointSourceCategory,
+				USN:       req.USN,
+				Point:     5,
+			})
+		}
 	}
-	return &grpc_pb.CategoryAnswerQuestionResp{
+	return &rspb.CategoryAnswerQuestionResp{
 		Answer:      question.Answer,
 		Explanation: question.Explanation,
 	}, nil
--- a/internal/grpcserver/server_custom.go
+++ b/internal/grpcserver/server_custom.go
@@ -0,0 +1,30 @@
+package grpcserver
+
+import (
+	"context"
+	"fmt"
+	"git.hlsq.asia/alex/service-common/proto/rs/rspb"
+	"git.hlsq.asia/alex/service-common/utils"
+	"git.hlsq.asia/alex/service-qgdzs/internal/ai"
+)
+
+func (s *Server) CustomAnswerQuestion(ctx context.Context, req *rspb.CustomAnswerQuestionReq) (*rspb.CustomAnswerQuestionResp, error) {
+	answer := ""
+	err := ai.NewAIClient(false, "", 0.9).
+		RequestAI(
+			[]string{
+				fmt.Sprintf(req.Question),
+			},
+			func(content string, i int) error {
+				if i == 0 {
+					return nil
+				}
+				answer = content
+				return nil
+			},
+		)
+	if err != nil {
+		return nil, utils.ErrorsWrap(err)
+	}
+	return &rspb.CustomAnswerQuestionResp{Answer: answer}, nil
+}
--- a/internal/grpc_server/server_init.go
+++ b/internal/grpc_server/server_init.go
@@ -1,17 +1,17 @@
-package grpc_server
+package grpcserver

 import (
-	"git.hlsq.asia/mmorpg/service-common/config"
-	"git.hlsq.asia/mmorpg/service-common/discover/common"
-	"git.hlsq.asia/mmorpg/service-common/net/grpc/service"
-	"git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/query"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/repository"
+	"git.hlsq.asia/alex/service-common/config"
+	"git.hlsq.asia/alex/service-common/discover/common"
+	"git.hlsq.asia/alex/service-common/net/grpc/service"
+	"git.hlsq.asia/alex/service-common/proto/rs/rspb"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/query"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/repository"
 	"google.golang.org/grpc"
 )

 type Server struct {
-	grpc_pb.UnimplementedQgdzsServer
+	rspb.UnimplementedQgdzsServer
 	service.Base
 	query *query.Query
 }
@@ -35,7 +35,7 @@ func (s *Server) OnCustomGrpcServerOption() []grpc.ServerOption {
 }

 func (s *Server) OnInit(serve *grpc.Server) {
-	grpc_pb.RegisterQgdzsServer(serve, s)
+	rspb.RegisterQgdzsServer(serve, s)
 	s.query = repository.Query()
 }

--- a/internal/grpc_server/server_leaderboard.go
+++ b/internal/grpc_server/server_leaderboard.go
@@ -1,8 +1,8 @@
-package grpc_server
+package grpcserver

 import (
 	"context"
-	"git.hlsq.asia/mmorpg/service-common/db/redis"
+	"git.hlsq.asia/alex/service-common/db/redis"
 )

 // 答题总数排行榜
--- a/internal/grpcserver/server_point.go
+++ b/internal/grpcserver/server_point.go
@@ -0,0 +1,48 @@
+package grpcserver
+
+import (
+	"context"
+	"git.hlsq.asia/alex/service-common/net/http/httpresp"
+	"git.hlsq.asia/alex/service-common/proto/rs/rspb"
+	"git.hlsq.asia/alex/service-common/utils"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/repository"
+)
+
+// 模块 - 学识分
+
+// GetPointRecord 获取学识分获取记录
+func (s *Server) GetPointRecord(ctx context.Context, req *rspb.GetPointRecordReq) (*rspb.GetPointRecordResp, error) {
+	if !utils.ShouldBindUsn(ctx, &req.USN) {
+		return nil, httpresp.ParamError
+	}
+	records, count, err := repository.NewPointRecordsDao(ctx, s.query).FindByUSN(req.USN, int(req.Page), int(req.PageSize))
+	if err != nil {
+		return nil, utils.ErrorsWrap(err)
+	}
+	resp := make([]*rspb.GetPointRecordItem, 0)
+	for _, record := range records {
+		resp = append(resp, &rspb.GetPointRecordItem{
+			Source:     record.Source,
+			Point:      record.Point,
+			CreateTime: record.CreatedAt.Unix(),
+		})
+	}
+	return &rspb.GetPointRecordResp{
+		Count:   int32(count),
+		Records: resp,
+	}, nil
+}
+
+// GetPoint 获取学识分
+func (s *Server) GetPoint(ctx context.Context, req *rspb.GetPointReq) (*rspb.GetPointResp, error) {
+	if !utils.ShouldBindUsn(ctx, &req.USN) {
+		return nil, httpresp.ParamError
+	}
+	pointCard, err := repository.NewPointCardDao(ctx, s.query).FindPointByUserSn(req.USN)
+	if err != nil {
+		return nil, utils.ErrorsWrap(err)
+	}
+	return &rspb.GetPointResp{
+		Point: pointCard.Point,
+	}, nil
+}
--- a/internal/grpc_server/server_question.go
+++ b/internal/grpc_server/server_question.go
@@ -1,17 +1,17 @@
-package grpc_server
+package grpcserver

 import (
 	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"git.hlsq.asia/mmorpg/service-common/db/redis"
-	"git.hlsq.asia/mmorpg/service-common/log"
-	"git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb"
-	"git.hlsq.asia/mmorpg/service-common/utils"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/ai"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/model"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/repository"
+	"git.hlsq.asia/alex/service-common/db/redis"
+	"git.hlsq.asia/alex/service-common/log"
+	"git.hlsq.asia/alex/service-common/proto/rs/rspb"
+	"git.hlsq.asia/alex/service-common/utils"
+	"git.hlsq.asia/alex/service-qgdzs/internal/ai"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/model"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/repository"
 	"gorm.io/gorm"
 	"time"
 )
@@ -53,7 +53,7 @@ type Question struct {
 	Difficulty  int32    `json:"difficulty"`  // 难度分
 }

-func (s *Server) GenerateQuestion(ctx context.Context, req *grpc_pb.GenerateQuestionReq) (*grpc_pb.GenerateQuestionResp, error) {
+func (s *Server) GenerateQuestion(ctx context.Context, req *rspb.GenerateQuestionReq) (*rspb.GenerateQuestionResp, error) {
 	categoryDao := repository.NewCategoryDao(ctx, s.query, redis.GetCacheClient())
 	category, err := categoryDao.FindAll()
 	if err != nil {
--- a/internal/grpc_server/server_quickly.go
+++ b/internal/grpc_server/server_quickly.go
@@ -1,19 +1,18 @@
-package grpc_server
+package grpcserver

 import (
 	"context"
 	"encoding/json"
-	"git.hlsq.asia/mmorpg/service-common/db/kafka"
-	"git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb"
-	"git.hlsq.asia/mmorpg/service-common/utils"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/repository"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/timer"
+	"git.hlsq.asia/alex/service-common/db/kafka"
+	"git.hlsq.asia/alex/service-common/proto/rs/rspb"
+	"git.hlsq.asia/alex/service-common/utils"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/repository"
 )

 // 玩法 - 随机答题

 // QuicklyGetQuestion 获取题目
-func (s *Server) QuicklyGetQuestion(ctx context.Context, req *grpc_pb.QuicklyGetQuestionReq) (*grpc_pb.QuicklyGetQuestionResp, error) {
+func (s *Server) QuicklyGetQuestion(ctx context.Context, req *rspb.QuicklyGetQuestionReq) (*rspb.QuicklyGetQuestionResp, error) {
 	question, err := repository.NewQuestionDao(ctx, s.query).FindByRandom(0)
 	if err != nil {
 		return nil, utils.ErrorsWrap(err)
@@ -23,7 +22,7 @@ func (s *Server) QuicklyGetQuestion(ctx context.Context, req *grpc_pb.QuicklyGet
 		return nil, utils.ErrorsWrapF(err, "data: %v", question.Options)
 	}
 	category, _ := repository.NewCategoryDao(ctx, s.query).FindNameBySn(question.CategorySn)
-	return &grpc_pb.QuicklyGetQuestionResp{
+	return &rspb.QuicklyGetQuestionResp{
 		Sn:         question.Sn,
 		Question:   question.Question,
 		Options:    options,
@@ -33,7 +32,7 @@ func (s *Server) QuicklyGetQuestion(ctx context.Context, req *grpc_pb.QuicklyGet
 }

 // QuicklyAnswerQuestion 回答题目
-func (s *Server) QuicklyAnswerQuestion(ctx context.Context, req *grpc_pb.QuicklyAnswerQuestionReq) (*grpc_pb.QuicklyAnswerQuestionResp, error) {
+func (s *Server) QuicklyAnswerQuestion(ctx context.Context, req *rspb.QuicklyAnswerQuestionReq) (*rspb.QuicklyAnswerQuestionResp, error) {
 	utils.ShouldBindUsn(ctx, &req.USN)

 	question, err := repository.NewQuestionDao(ctx, s.query).FindBySn(req.Sn)
@@ -46,7 +45,7 @@ func (s *Server) QuicklyAnswerQuestion(ctx context.Context, req *grpc_pb.Quickly
 	}
 	// 保存答题记录
 	if req.USN != 0 {
-		kafka.NewProducer().Produce(ctx, &timer.TopicQuestionAnswer{
+		kafka.NewProducer().Produce(ctx, &kafka.TopicQuestionAnswer{
 			MessageSn:      utils.SnowflakeInstance().Generate().Int64(),
 			USN:            req.USN,
 			QuestionSn:     question.Sn,
@@ -54,7 +53,7 @@ func (s *Server) QuicklyAnswerQuestion(ctx context.Context, req *grpc_pb.Quickly
 			Answer:         req.Answer,
 		})
 	}
-	return &grpc_pb.QuicklyAnswerQuestionResp{
+	return &rspb.QuicklyAnswerQuestionResp{
 		Answer:      question.Answer,
 		Explanation: question.Explanation,
 	}, nil
--- a/internal/grpc_server/server_random.go
+++ b/internal/grpc_server/server_random.go
@@ -1,19 +1,18 @@
-package grpc_server
+package grpcserver

 import (
 	"context"
 	"encoding/json"
-	"git.hlsq.asia/mmorpg/service-common/db/kafka"
-	"git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb"
-	"git.hlsq.asia/mmorpg/service-common/utils"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/repository"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/timer"
+	"git.hlsq.asia/alex/service-common/db/kafka"
+	"git.hlsq.asia/alex/service-common/proto/rs/rspb"
+	"git.hlsq.asia/alex/service-common/utils"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/repository"
 )

 // 玩法 - 随机答题

 // RandomGetQuestion 获取题目
-func (s *Server) RandomGetQuestion(ctx context.Context, req *grpc_pb.RandomGetQuestionReq) (*grpc_pb.RandomGetQuestionResp, error) {
+func (s *Server) RandomGetQuestion(ctx context.Context, req *rspb.RandomGetQuestionReq) (*rspb.RandomGetQuestionResp, error) {
 	question, err := repository.NewQuestionDao(ctx, s.query).FindByRandom(0)
 	if err != nil {
 		return nil, utils.ErrorsWrap(err)
@@ -23,7 +22,7 @@ func (s *Server) RandomGetQuestion(ctx context.Context, req *grpc_pb.RandomGetQu
 		return nil, utils.ErrorsWrapF(err, "data: %v", question.Options)
 	}
 	category, _ := repository.NewCategoryDao(ctx, s.query).FindNameBySn(question.CategorySn)
-	return &grpc_pb.RandomGetQuestionResp{
+	return &rspb.RandomGetQuestionResp{
 		Sn:         question.Sn,
 		Question:   question.Question,
 		Options:    options,
@@ -33,7 +32,7 @@ func (s *Server) RandomGetQuestion(ctx context.Context, req *grpc_pb.RandomGetQu
 }

 // RandomAnswerQuestion 回答题目
-func (s *Server) RandomAnswerQuestion(ctx context.Context, req *grpc_pb.RandomAnswerQuestionReq) (*grpc_pb.RandomAnswerQuestionResp, error) {
+func (s *Server) RandomAnswerQuestion(ctx context.Context, req *rspb.RandomAnswerQuestionReq) (*rspb.RandomAnswerQuestionResp, error) {
 	utils.ShouldBindUsn(ctx, &req.USN)

 	question, err := repository.NewQuestionDao(ctx, s.query).FindBySn(req.Sn)
@@ -46,7 +45,7 @@ func (s *Server) RandomAnswerQuestion(ctx context.Context, req *grpc_pb.RandomAn
 	}
 	// 保存答题记录
 	if req.USN != 0 {
-		kafka.NewProducer().Produce(ctx, &timer.TopicQuestionAnswer{
+		kafka.NewProducer().Produce(ctx, &kafka.TopicQuestionAnswer{
 			MessageSn:      utils.SnowflakeInstance().Generate().Int64(),
 			USN:            req.USN,
 			QuestionSn:     question.Sn,
@@ -56,15 +55,15 @@ func (s *Server) RandomAnswerQuestion(ctx context.Context, req *grpc_pb.RandomAn

 		// 随机答题正确给10分，错误不得分
 		if req.Answer == question.Answer {
-			kafka.NewProducer().Produce(ctx, &timer.TopicAddPoint{
+			kafka.NewProducer().Produce(ctx, &kafka.TopicAddPoint{
 				MessageSn: utils.SnowflakeInstance().Generate().Int64(),
-				Source:    timer.AddPointSourceRandom,
+				Source:    kafka.AddPointSourceRandom,
 				USN:       req.USN,
 				Point:     10,
 			})
 		}
 	}
-	return &grpc_pb.RandomAnswerQuestionResp{
+	return &rspb.RandomAnswerQuestionResp{
 		Answer:      question.Answer,
 		Explanation: question.Explanation,
 	}, nil
--- a/internal/grpc_server/server_record.go
+++ b/internal/grpc_server/server_record.go
@@ -1,28 +1,28 @@
-package grpc_server
+package grpcserver

 import (
 	"context"
 	"encoding/json"
-	"git.hlsq.asia/mmorpg/service-common/net/http/http_resp"
-	"git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb"
-	"git.hlsq.asia/mmorpg/service-common/utils"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/repository"
+	"git.hlsq.asia/alex/service-common/net/http/httpresp"
+	"git.hlsq.asia/alex/service-common/proto/rs/rspb"
+	"git.hlsq.asia/alex/service-common/utils"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/repository"
 )

 // 模块 - 答题记录

 // GetRecord 获取答题记录
-func (s *Server) GetRecord(ctx context.Context, req *grpc_pb.GetRecordReq) (*grpc_pb.GetRecordResp, error) {
+func (s *Server) GetRecord(ctx context.Context, req *rspb.GetRecordReq) (*rspb.GetRecordResp, error) {
 	if !utils.ShouldBindUsn(ctx, &req.USN) {
-		return nil, http_resp.ParamError
+		return nil, httpresp.ParamError
 	}
 	records, count, err := repository.NewRecordDao(ctx, s.query).FindByUSN(req.USN, int(req.Page), int(req.PageSize))
 	if err != nil {
 		return nil, utils.ErrorsWrap(err)
 	}
-	resp := make([]*grpc_pb.GetRecordItem, 0)
+	resp := make([]*rspb.GetRecordItem, 0)
 	for _, record := range records {
-		resp = append(resp, &grpc_pb.GetRecordItem{
+		resp = append(resp, &rspb.GetRecordItem{
 			QuestionSn:     record.QuestionSn,
 			Question:       record.Question,
 			Difficulty:     record.Difficulty,
@@ -32,14 +32,14 @@ func (s *Server) GetRecord(ctx context.Context, req *grpc_pb.GetRecordReq) (*grp
 			CreateTime:     record.CreatedAt.Unix(),
 		})
 	}
-	return &grpc_pb.GetRecordResp{
+	return &rspb.GetRecordResp{
 		Count:   int32(count),
 		Records: resp,
 	}, nil
 }

 // GetQuestionInfo 获取具体的题目
-func (s *Server) GetQuestionInfo(ctx context.Context, req *grpc_pb.GetQuestionInfoReq) (*grpc_pb.GetQuestionInfoResp, error) {
+func (s *Server) GetQuestionInfo(ctx context.Context, req *rspb.GetQuestionInfoReq) (*rspb.GetQuestionInfoResp, error) {
 	question, err := repository.NewQuestionDao(ctx, s.query).FindBySn(req.QuestionSn)
 	if err != nil {
 		return nil, utils.ErrorsWrap(err)
@@ -49,7 +49,7 @@ func (s *Server) GetQuestionInfo(ctx context.Context, req *grpc_pb.GetQuestionIn
 		return nil, utils.ErrorsWrapF(err, "data: %v", question.Options)
 	}
 	category, _ := repository.NewCategoryDao(ctx, s.query).FindNameBySn(question.CategorySn)
-	return &grpc_pb.GetQuestionInfoResp{
+	return &rspb.GetQuestionInfoResp{
 		Question:    question.Question,
 		Options:     options,
 		Category:    category,
--- a/internal/timer/consumer.go
+++ b/internal/timer/consumer.go
@@ -3,11 +3,11 @@ package timer
 import (
 	"context"
 	"errors"
-	"git.hlsq.asia/mmorpg/service-common/db/kafka"
-	"git.hlsq.asia/mmorpg/service-common/log"
-	"git.hlsq.asia/mmorpg/service-common/utils"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/model"
-	"git.hlsq.asia/mmorpg/service-qgdzs/internal/dao/repository"
+	"git.hlsq.asia/alex/service-common/db/kafka"
+	"git.hlsq.asia/alex/service-common/log"
+	"git.hlsq.asia/alex/service-common/utils"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/model"
+	"git.hlsq.asia/alex/service-qgdzs/internal/dao/repository"
 	"gorm.io/gorm"
 )

@@ -20,15 +20,7 @@ func startConsumer() {
 }

 type TopicQuestionAnswer struct {
-	MessageSn      int64  `json:"messageSn"`
-	USN            int64  `json:"usn"`
-	QuestionSn     int64  `json:"questionSn"`
-	QuestionAnswer string `json:"questionAnswer"`
-	Answer         string `json:"answer"`
-}
-
-func (t *TopicQuestionAnswer) Name() string {
-	return "qgdzs.question.answer"
+	kafka.TopicQuestionAnswer
 }

 func (t *TopicQuestionAnswer) OnMessage(ctx context.Context) error {
@@ -60,23 +52,7 @@ func (t *TopicQuestionAnswer) OnMessage(ctx context.Context) error {
 }

 type TopicAddPoint struct {
-	MessageSn int64          `json:"messageSn"`
-	Source    AddPointSource `json:"source"`
-	USN       int64          `json:"usn"`
-	Point     int64          `json:"point"`
-}
-
-type AddPointSource int32
-
-const (
-	AddPointSourceUnKnown  = 0
-	AddPointSourceRandom   = 1
-	AddPointSourceCategory = 2
-	AddPointSourceQuickly  = 3
-)
-
-func (t *TopicAddPoint) Name() string {
-	return "qgdzs.user.point"
+	kafka.TopicAddPoint
 }

 func (t *TopicAddPoint) OnMessage(ctx context.Context) error {
--- a/main.go
+++ b/main.go
@@ -2,12 +2,16 @@ package main

 import (
 	"fmt"
-	"git.hlsq.asia/mmorpg/service-qgdzs/app"
+	"git.hlsq.asia/alex/service-qgdzs/app"
+	"git.hlsq.asia/alex/service-qgdzs/config"
 	"github.com/judwhite/go-svc"
 	"syscall"
 )

 func main() {
+	if err := config.LoadConfig(); err != nil {
+		fmt.Println(err)
+	}
 	if err := svc.Run(&app.Program{}, syscall.SIGINT, syscall.SIGTERM, syscall.SIGKILL); err != nil {
 		fmt.Println(err)
 	}
Author	SHA1	Message	Date
DESKTOP-V763RJ7\Administrator	7cf72e7897	feat mod	2026-10-28 16:30:37 +08:00
DESKTOP-V763RJ7\Administrator	fde4720fcc	feat 修改包路径	2026-10-28 16:21:45 +08:00
DESKTOP-V763RJ7\Administrator	6ae504818d	feat 修改包路径	2026-10-28 15:58:44 +08:00
BuildingBlocksLin	f73783b742	feat 自定义问答	2026-03-11 20:17:59 +08:00
DESKTOP-V763RJ7\Administrator	77cc02fc95	feat 包命名规范	2026-02-11 14:49:46 +08:00
DESKTOP-V763RJ7\Administrator	1a42e055ae	feat 基础模块拆分为雪花和日志模块	2026-02-07 13:15:29 +08:00
DESKTOP-V763RJ7\Administrator	c2807b54df	feat 模块删除bind函数	2026-02-06 22:54:00 +08:00
DESKTOP-V763RJ7\Administrator	96f0919c05	feat 废弃jwt 、学识分	2026-02-06 22:31:31 +08:00