update

src/api/router.go

@@ -28,9 +28,6 @@ func RegRouters(svc *Service) {
 	crrouter.POSTJWT("/exam/history/create", ExamHistoryCreate)
 	crrouter.GETJWT("/exam/history/list", ExamHistoryList)
 
-	Upload(crrouter)
-	Version(crrouter)
-
 }
 
 func Logger() gin.HandlerFunc {

src/api/test-excel.go

@@ -1,15 +1,14 @@
 package api
 
 import (
-	"copter-train/db/model"
 	"fmt"
+	"nrhe-train/db/model"
 	"strings"
 
 	"github.com/xuri/excelize/v2"
 )
 
 type TestExcel struct {
-	Offset           int
 	Row              int
 	Title            string //标题
 	Excel            *excelize.File
@@ -183,7 +182,6 @@ func NewTestExcel(f *excelize.File) *TestExcel {
 		Title:            "考核试题",
 		SheetName:        "Sheet1",
 		Excel:            f,
-		Offset:           0,
 		AlignCenterStyle: styleLeft,
 		RowMap:           map[string]int{"A": 0, "B": 1, "C": 2, "D": 3, "E": 4, "F": 5, "G": 6, "H": 7},
 		RowWidthArray:    []float64{17, 17, 12, 10, 12, 12, 12, 20},

src/api/test.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"copter-train/db/model"
 	"errors"
 	"fmt"
 	"net/url"
@@ -14,6 +15,8 @@ import (
 	"go.mongodb.org/mongo-driver/bson"
 )
 
+const TESTS_TMPLATE_FILE = "./template"
+
 // 导入试题
 func ImportTest(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	isAdmin, err := IsAdmin(c, apictx)
@@ -88,7 +91,7 @@ func ImportTest(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 			test.CreateTime = time.Now()
 			test.UpdateTime = time.Now()
 
-			_, err = repo.RepoAddDbDoc(apictx.CreateRepoCtx(), db, repo.CollectionTest, test)
+			_, err = repo.RepoAddDoc(apictx.CreateRepoCtx(), db, repo.CollectionTest, test)
 			if err != nil {
 				errors = append(errors, fmt.Sprintf("第%d行错误: %s", rowNum, "保存数据失败, 请检查数据格式是否正确"))
 				log.Error(err)

src/api/upload.go

@@ -1,56 +0,0 @@
-package api
-
-import (
-	"errors"
-	"fmt"
-	"nrhe-train/db/model"
-	"nrhe-train/db/repo"
-	"path"
-	"path/filepath"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-func Upload(r *GinRouter) {
-	r.POSTJWT("/upload/pkg", UploadPkg)
-}
-
-func UploadPkg(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-
-	version := c.PostForm("version")
-	name := c.PostForm("name")
-	userId, _ := primitive.ObjectIDFromHex(apictx.User.ID)
-	user, err := GetUserById(apictx, (apictx.User.ID))
-	if err != nil {
-		fmt.Println(err)
-	}
-	file, err := c.FormFile("file")
-	if err != nil {
-		return nil, err
-	}
-	fmt.Println(file.Size)
-	size := fmt.Sprintf("%.2fM", float64(file.Size)/float64(1024*1024))
-	fmt.Println(size)
-	if path.Ext(file.Filename) != ".zip" {
-		return nil, errors.New("仅支持zip文件")
-	}
-
-	basePath := "./package/"
-	filename := basePath + filepath.Base(file.Filename)
-	if err := c.SaveUploadedFile(file, filename); err != nil {
-		return nil, err
-	}
-	versions := &model.Versions{
-		UserId:     userId,
-		UserName:   user.LoginName,
-		Name:       name,
-		Url:        fmt.Sprintf("/cr/pkg/%s", file.Filename),
-		Size:       size,
-		Version:    version,
-		CreateTime: time.Now(),
-		UpdateTime: time.Now(),
-	}
-	return repo.RepoAddDoc(apictx.CreateRepoCtx(), repo.CollectionVersions, versions)
-}

src/api/version.go

@@ -1,98 +0,0 @@
-package api
-
-import (
-	"errors"
-	"nrhe-train/db/model"
-	"nrhe-train/db/repo"
-	"nrhe-train/log"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-func Version(r *GinRouter) {
-	// r.GET("/versions", GetVersion)
-	// r.GET("/version/latest", VersionLatest)
-	r.POSTJWT("/version/update", UpdateVersion)
-	r.POSTJWT("/version/delete/:id", DeleteVersion)
-}
-
-// func GetVersion(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-// 	page, size, query := UtilQueryPageSize(c)
-// 	result, err := repo.RepoPageSearch(apictx.CreateRepoCtx(), &repo.PageSearchOptions{
-// 		CollectName: repo.CollectionVersions,
-// 		Page:        page,
-// 		Size:        size,
-// 		Query:       query,
-// 		Sort:        bson.M{"createTime": -1},
-// 	})
-// 	if err != nil {
-// 		return nil, err
-// 	}
-// 	if len(result.List) > 0 {
-// 		for _, v := range result.List {
-// 			url := v["url"]
-// 			v["url"] = fmt.Sprintf("http://%s:%d%s", conf.AppConfig.MasterIp, conf.AppConfig.ServerPort, url)
-// 		}
-// 	}
-// 	return result, nil
-// }
-
-// func VersionLatest(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-// 	out, err := repo.RepoPageSearch(apictx.CreateRepoCtx(), &repo.PageSearchOptions{
-// 		CollectName: repo.CollectionVersions,
-// 		Page:        1,
-// 		Size:        1,
-// 		Sort:        bson.D{bson.E{Key: "createTime", Value: -1}},
-// 	})
-// 	if err != nil {
-// 		return map[string]interface{}{}, nil
-// 	}
-// 	if len(out.List) < 1 {
-// 		return map[string]interface{}{}, nil
-// 	}
-// 	latestVersion := out.List[0]
-// 	url := out.List[0]["url"]
-// 	latestVersion["url"] = fmt.Sprintf("http://%s:%d%s", conf.AppConfig.MasterIp, conf.AppConfig.ServerPort, url)
-// 	return latestVersion, nil
-// }
-
-func UpdateVersion(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	// 验证是否为管理员
-	isAdmin, err := IsAdmin(c, apictx)
-	if err != nil {
-		return nil, err
-	}
-	if !isAdmin {
-		return nil, errors.New("没有权限")
-	}
-	var version model.Versions
-	err = c.ShouldBindJSON(&version)
-	if err != nil {
-		log.Error(err)
-		return nil, err
-	}
-	if version.Id.IsZero() {
-		return nil, errors.New("id错误")
-	}
-	version.UpdateTime = time.Now()
-	return repo.RepoUpdateSetDoc(apictx.CreateRepoCtx(), repo.CollectionVersions, version.Id.Hex(), &version)
-}
-
-func DeleteVersion(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	// 验证是否为管理员
-	isAdmin, err := IsAdmin(c, apictx)
-	if err != nil {
-		return nil, err
-	}
-	if !isAdmin {
-		return nil, errors.New("没有权限")
-	}
-	_id := c.Param("id")
-	id, _ := primitive.ObjectIDFromHex(_id)
-	if id.IsZero() {
-		return nil, errors.New("id错误")
-	}
-	return repo.RepoDeleteDoc(apictx.CreateRepoCtx(), repo.CollectionVersions, _id)
-}

src/db/repo/repo.go

@@ -18,7 +18,6 @@ type RepoSession struct {
 }
 
 const (
-	CollectionVersions    = "versions"
 	CollectionUser        = "users"
 	CollectionExamHistory = "exam-history"
 )