Explorar el Código

提交代码修改

DESKTOP-HN5QP3V\Administrator hace 7 meses
padre
commit
8d7a904041
Se han modificado 4 ficheros con 22 adiciones y 7 borrados
  1. 6 0
      .idea/vcs.xml
  2. 1 1
      app/api/v1/version.go
  3. 14 5
      app/service/version.go
  4. 1 1
      model/mongo/version/version.go

+ 6 - 0
.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

+ 1 - 1
app/api/v1/version.go

@@ -93,7 +93,7 @@ func VersionDelete(c *gin.Context) {
 	var appG = app.Gin{C: c}
 	var appG = app.Gin{C: c}
 	service := service.VersionDeleteService{}
 	service := service.VersionDeleteService{}
 	key := appG.ValidKey()
 	key := appG.ValidKey()
-	service.Version = key
+	service.Id = key
 
 
 	if err := service.Delete(); err == nil {
 	if err := service.Delete(); err == nil {
 		appG.Response(http.StatusOK, e.SUCCESS, nil)
 		appG.Response(http.StatusOK, e.SUCCESS, nil)

+ 14 - 5
app/service/version.go

@@ -6,6 +6,7 @@ import (
 	"dsbqj-admin/model/mongo/version"
 	"dsbqj-admin/model/mongo/version"
 	"github.com/kamva/mgm/v3"
 	"github.com/kamva/mgm/v3"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 )
 
 
 type VersionReloadService struct {
 type VersionReloadService struct {
@@ -59,7 +60,8 @@ func (service *VersionCreateService) Create() error {
 }
 }
 
 
 type VersionEditService struct {
 type VersionEditService struct {
-	Version string  `json:"version" binding:"required"`
+	Id      string  `json:"id" binding:"required"`
+	Version *string `json:"version"`
 	Name    *string `json:"name"`
 	Name    *string `json:"name"`
 	CDN     *string `json:"cdn"`
 	CDN     *string `json:"cdn"`
 	Url     *string `json:"url"`
 	Url     *string `json:"url"`
@@ -69,9 +71,15 @@ type VersionEditService struct {
 func (service *VersionEditService) Edit() error {
 func (service *VersionEditService) Edit() error {
 	version := new(version.Version)
 	version := new(version.Version)
 
 
-	filterDoc := bson.M{"version": service.Version}
+	objectId, _ := primitive.ObjectIDFromHex(service.Id)
+	filterDoc := bson.M{"_id": objectId}
 	updateDoc := bson.M{}
 	updateDoc := bson.M{}
-	version.Version = service.Version
+	if service.Name != nil {
+		updateDoc["name"] = service.Name
+	}
+	if service.Version != nil {
+		updateDoc["version"] = service.Version
+	}
 	if service.CDN != nil {
 	if service.CDN != nil {
 		updateDoc["cdn"] = service.CDN
 		updateDoc["cdn"] = service.CDN
 	}
 	}
@@ -88,12 +96,13 @@ func (service *VersionEditService) Edit() error {
 }
 }
 
 
 type VersionDeleteService struct {
 type VersionDeleteService struct {
-	Version string `json:"version" binding:"required"`
+	Id string `json:"id" binding:"required"`
 }
 }
 
 
 func (service *VersionDeleteService) Delete() error {
 func (service *VersionDeleteService) Delete() error {
 	version := new(version.Version)
 	version := new(version.Version)
-	filterDoc := bson.M{"version": service.Version}
+	objectId, _ := primitive.ObjectIDFromHex(service.Id)
+	filterDoc := bson.M{"_id": objectId}
 
 
 	_, err := mgm.Coll(version).DeleteOne(context.Background(), filterDoc)
 	_, err := mgm.Coll(version).DeleteOne(context.Background(), filterDoc)
 	return err
 	return err

+ 1 - 1
model/mongo/version/version.go

@@ -5,7 +5,7 @@ import (
 )
 )
 
 
 type Version struct {
 type Version struct {
-	mgm.DefaultModel `bson:",inline" json:"-"`
+	mgm.DefaultModel `bson:",inline" json:"id"`
 	Version          string `bson:"version" json:"version"`
 	Version          string `bson:"version" json:"version"`
 	Name             string `bson:"name" json:"name"`
 	Name             string `bson:"name" json:"name"`
 	CDN              string `bson:"cdn" json:"cdn"`
 	CDN              string `bson:"cdn" json:"cdn"`