From d364e874b6edeab696e53e5ff6d2b8dfb5c8d1dd Mon Sep 17 00:00:00 2001
From: JeshuaRen <270813223@qq.com>
Date: Wed, 12 Feb 2025 15:25:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=94=A8=E6=88=B7=E6=97=B6?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A1=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sdks/pcmscheduler/access.go |  6 ++++++
 sdks/pcmscheduler/jobset.go | 14 +++++++-------
 sdks/pcmscheduler/models.go |  3 +++
 sdks/uploader/models.go     |  1 +
 utils/config/config.go      |  2 ++
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/sdks/pcmscheduler/access.go b/sdks/pcmscheduler/access.go
index 8376b48..82b1dc2 100644
--- a/sdks/pcmscheduler/access.go
+++ b/sdks/pcmscheduler/access.go
@@ -46,3 +46,9 @@ type User struct {
 	UserName string    `gorm:"column:username" json:"userName"`
 	Created  time.Time `gorm:"column:created_at" json:"created"`
 }
+
+type Bucket struct {
+	ID       cdssdk.BucketID `gorm:"column:id" json:"id"`
+	UserID   cdssdk.UserID   `gorm:"column:user_id" json:"userID"`
+	DataType string          `gorm:"column:data_type" json:"dataType"`
+}
diff --git a/sdks/pcmscheduler/jobset.go b/sdks/pcmscheduler/jobset.go
index 584561f..1d05570 100644
--- a/sdks/pcmscheduler/jobset.go
+++ b/sdks/pcmscheduler/jobset.go
@@ -58,8 +58,8 @@ func (c *Client) GetClusterInfo(req GetClusterInfoReq) ([]ClusterDetail, error)
 }
 
 type CreateJobReq struct {
-	//Name           string              `json:"name"`
-	//Description    string              `json:"description"`
+	Name           string              `json:"name"`
+	Description    string              `json:"description"`
 	JobResources   schsdk.JobResources `json:"jobResources"`
 	DataDistribute DataDistribute      `json:"dataDistributes"`
 }
@@ -120,11 +120,11 @@ func (c *Client) CreateJob(req CreateJobReq) (*CreateJobResp, error) {
 	}
 
 	// 将req转换成json，并打印
-	req2, err := serder.ObjectToJSONEx(req)
-	if err != nil {
-		return nil, fmt.Errorf("request to json: %w", err)
-	}
-	fmt.Println(string(req2))
+	//req2, err := serder.ObjectToJSONEx(req)
+	//if err != nil {
+	//	return nil, fmt.Errorf("request to json: %w", err)
+	//}
+	//fmt.Println(string(req2))
 
 	resp, err := http2.PostJSON(targetUrl, http2.RequestParam{
 		Body: req,
diff --git a/sdks/pcmscheduler/models.go b/sdks/pcmscheduler/models.go
index 0a09be7..0a0e14b 100644
--- a/sdks/pcmscheduler/models.go
+++ b/sdks/pcmscheduler/models.go
@@ -17,6 +17,8 @@ const (
 	ResourceTypeStorage ResourceType = "STORAGE"
 	ResourceTypeMemory  ResourceType = "MEMORY"
 
+	Split = "/"
+
 	CODE    = "code"
 	DATASET = "dataset"
 	IMAGE   = "image"
@@ -379,6 +381,7 @@ type CodeBinding struct {
 	Description string             `json:"description"`
 	ImageID     string             `json:"imageID"`
 	ObjectID    cdssdk.ObjectID    `json:"objectID"`
+	FilePath    string             `json:"filePath"`
 	PackageID   cdssdk.PackageID   `json:"packageID"`
 }
 
diff --git a/sdks/uploader/models.go b/sdks/uploader/models.go
index cb5b77f..6babe86 100644
--- a/sdks/uploader/models.go
+++ b/sdks/uploader/models.go
@@ -29,6 +29,7 @@ type Binding struct {
 	UserID      cdssdk.UserID `gorm:"column:user_id" json:"userID"`
 	Name        string        `gorm:"column:name" json:"Name"`
 	DataType    string        `gorm:"column:data_type" json:"dataType"`
+	JsonData    string        `gorm:"column:json_data" json:"jsonData"`
 	Content     string        `gorm:"column:content" json:"Content"`
 	AccessLevel string        `gorm:"column:access_level" json:"accessLevel"`
 	CreateTime  time.Time     `gorm:"column:created_at" json:"createTime"`
diff --git a/utils/config/config.go b/utils/config/config.go
index d0f930b..889094b 100644
--- a/utils/config/config.go
+++ b/utils/config/config.go
@@ -33,6 +33,8 @@ func DefaultLoad(modeulName string, defCfg interface{}) error {
 	// filepath.Join用于将多个路径组合成一个路径
 	configFilePath := filepath.Join(filepath.Dir(execPath), "..", "confs", fmt.Sprintf("%s.config.json", modeulName))
 
+	configFilePath = "D:\\Work\\Codes\\workspace\\workspace\\scheduler\\common\\assets\\confs\\middleware.json"
+
 	return Load(configFilePath, defCfg)
 }