Merge remote-tracking branch 'origin/2.0' into 2.0

Former-commit-id: c7b7747f8ed614a4a48dd77707ae55775708764a

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createalgorithmlogic.go

@@ -1,7 +1,6 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
@@ -10,6 +9,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"github.com/zeromicro/go-zero/core/logx"
 	"io/ioutil"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createdatasetlogic.go

@@ -1,20 +1,19 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
+	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
+	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	"PCM/common/tool"
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"
 	"strings"
 
-	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
-	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
-
 	"github.com/zeromicro/go-zero/core/logx"
 )
 

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createmodellogic.go

@@ -6,7 +6,6 @@ package logic
 */
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
@@ -14,12 +13,12 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
+	"github.com/zeromicro/go-zero/core/logx"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"
 	"strings"
-
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type CreateModelLogic struct {

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createnotebooklogic.go

@@ -1,7 +1,6 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
@@ -9,6 +8,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"github.com/zeromicro/go-zero/core/logx"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createprocessortasklogic.go

@@ -6,12 +6,12 @@ package logic
 */
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createservicelogic.go

@@ -6,13 +6,13 @@ package logic
 */
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	"PCM/common/tool"
 	"bytes"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"github.com/zeromicro/go-zero/core/logx"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createtasklogic.go

@@ -1,12 +1,12 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createtrainingjobconfiglogic.go

@@ -1,12 +1,12 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createtrainingjoblogic.go

@@ -1,7 +1,6 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
@@ -9,6 +8,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/createvisualizationjoblogic.go

@@ -1,13 +1,13 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"net/http"
 	"strings"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/deletealgorithmslogic.go

@@ -1,11 +1,11 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/deletedatasetlogic.go

@@ -1,11 +1,11 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/deletemodellogic.go

@@ -6,11 +6,11 @@ package logic
 */
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/deleteservicelogic.go

@@ -6,13 +6,13 @@ package logic
 */
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/deletetrainingjobconfiglogic.go

@@ -1,13 +1,13 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/deletetrainingjoblogic.go

@@ -1,13 +1,13 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"github.com/zeromicro/go-zero/core/logx"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/describeprocessortasklogic.go

@@ -6,13 +6,13 @@ package logic
 */
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/exporttasklogic.go

@@ -6,7 +6,6 @@ package logic
 */
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	_ "PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
@@ -14,6 +13,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getaiengineslistlogic.go

@@ -1,11 +1,11 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getdatasetlistlogic.go

@@ -1,13 +1,13 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"github.com/zeromicro/go-zero/core/logx"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getexporttasksofdatasetlogic.go

@@ -6,12 +6,12 @@ package logic
 */
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getexporttaskstatusofdatasetlogic.go

@@ -6,11 +6,11 @@ package logic
 */
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getimporttasklistlogic.go

@@ -1,11 +1,11 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"log"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getlisttrainingjobslogic.go

@@ -1,13 +1,13 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getnotebookstoragelogic.go

@@ -1,12 +1,12 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"net/http"
 	"strings"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/gettrainingjobflavorslogic.go

@@ -1,13 +1,13 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/getvisualizationjoblogic.go

@@ -1,12 +1,12 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"net/http"
 	"strings"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listalgorithmslogic.go

@@ -1,7 +1,6 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
@@ -9,6 +8,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"github.com/zeromicro/go-zero/core/logx"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
@@ -46,7 +46,7 @@ func (l *ListAlgorithmsLogic) ListAlgorithms(in *modelarts.ListAlgorithmsReq) (*
 
 	if modelArtsType == l.svcCtx.Config.HaweiModelArtsType {
 		modelArtsUrl := l.svcCtx.Config.ModelArtsUrl
-		url := modelArtsUrl + in.ProjectId + "v2/" + "/algorithms?offset=" + offset + "&" + "limit=" + limit
+		url := modelArtsUrl + "v2/" + in.ProjectId + "/algorithms?offset=" + offset + "&" + "limit=" + limit
 		token := common.GetToken()
 		statusCode, body, err := tool.HttpClientWithBodyAndCode(tool.GET, url, nil, token)
 		if err != nil {
@@ -72,7 +72,7 @@ func (l *ListAlgorithmsLogic) ListAlgorithms(in *modelarts.ListAlgorithmsReq) (*
 			Key:    AK,
 			Secret: SK,
 		}
-		r, err := http.NewRequest("GET", NanjingModelArtsUrl+in.ProjectId+"/algorithms?offset="+offset+"&"+"limit="+limit,
+		r, err := http.NewRequest("GET", NanjingModelArtsUrl+"v2/"+in.ProjectId+"/algorithms?offset="+offset+"&"+"limit="+limit,
 			bytes.NewBuffer([]byte("foo=bar")))
 		if err != nil {
 			fmt.Println(err)

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listclusterslogic.go

@@ -6,11 +6,11 @@ package logic
 */
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listmodelslogic.go

@@ -6,12 +6,12 @@ package logic
 */
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listnotebooklogic.go

@@ -1,13 +1,13 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"github.com/zeromicro/go-zero/core/logx"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listserviceslogic.go

@@ -6,7 +6,6 @@ package logic
 */
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
@@ -14,6 +13,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"github.com/zeromicro/go-zero/core/logx"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/listtrainingjobconfiglogic.go

@@ -1,7 +1,6 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
@@ -9,6 +8,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"github.com/bitly/go-simplejson"
 	"github.com/zeromicro/go-zero/core/logx"
 	"io/ioutil"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/mountnotebookstoragelogic.go

@@ -1,13 +1,13 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"net/http"
 	"strings"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/showalgorithmbyuuidlogic.go

@@ -1,12 +1,12 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"bytes"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/showmodelslogic.go

@@ -6,13 +6,13 @@ package logic
 */
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/showservicelogic.go

@@ -6,13 +6,13 @@ package logic
 */
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/svc"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/modelarts"
 	"PCM/common/tool"
 	"context"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/util/json"
 	"net/http"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/startnotebooklogic.go

@@ -1,13 +1,13 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"net/http"
 	"strings"

adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/logic/stopnotebooklogic.go

@@ -1,13 +1,13 @@
 package logic
 
 import (
-	"APIGW-go-sdk/core"
 	"PCM/adaptor/PCM-AI/PCM-MODELARTS/rpc/internal/common"
 	"PCM/common/tool"
 	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/JCCE-nudt/apigw-go-sdk/core"
 	"io/ioutil"
 	"net/http"
 	"strings"

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/config/octopusConfig.go

@@ -20,7 +20,6 @@ type OctopusApi struct {
 	GetMydatasetList          string
 	CreateImage               string
 	DeleteImage               string
-
 	CreateDataSet             string
 	DeleteDataSet             string
 	GetAlgorithmApplyList     string
@@ -40,4 +39,11 @@ type OctopusApi struct {
 	DeleteDataSetVersion      string
 	GetDatasetVersionList     string
 	DeleteNotebook            string
+	StartNotebook             string
+	StopNotebook              string
+	CreateNotebook            string
+	GetNotebook               string
+	CreateTrainJob            string
+	GetDatasetApplyList       string
+	GetDatasetTypeList        string
 }

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createdatasetversionlogic.go

@@ -37,7 +37,7 @@ func (l *CreateDataSetVersionLogic) CreateDataSetVersion(in *octopus.CreateDataS
 	_, err := req.
 		SetHeader("Authorization", "Bearer "+token).
 		SetPathParam("datasetId", in.DatasetId).
-		SetBody(in.Desc).
+		SetBody(in.Params).
 		SetResult(resp).
 		Post(reqUrl)
 

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createnotebooklogic.go

@@ -0,0 +1,47 @@
+package logic
+
+import (
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
+	"PCM/common/tool"
+	"context"
+
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CreateNotebookLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewCreateNotebookLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CreateNotebookLogic {
+	return &CreateNotebookLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *CreateNotebookLogic) CreateNotebook(in *octopus.CreateNotebookReq) (*octopus.CreateNotebookResp, error) {
+	resp := &octopus.CreateNotebookResp{}
+
+	var url_prefix = common.OctopusUrls[in.Platform]
+	var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.CreateNotebook
+
+	token := common.GetToken(in.Platform)
+
+	req := tool.GetACHttpRequest()
+	_, err := req.
+		SetHeader("Authorization", "Bearer "+token).
+		SetBody(in.Params).
+		SetResult(resp).
+		Post(reqUrl)
+
+	if err != nil {
+		return nil, err
+	}
+	return resp, nil
+}

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/createtrainjoblogic.go

@@ -0,0 +1,48 @@
+package logic
+
+import (
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
+	"PCM/common/tool"
+	"context"
+
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CreateTrainJobLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewCreateTrainJobLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CreateTrainJobLogic {
+	return &CreateTrainJobLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+// TrainJobService
+func (l *CreateTrainJobLogic) CreateTrainJob(in *octopus.CreateTrainJobReq) (*octopus.CreateTrainJobResp, error) {
+	resp := &octopus.CreateTrainJobResp{}
+
+	var url_prefix = common.OctopusUrls[in.Platform]
+	var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.CreateTrainJob
+
+	token := common.GetToken(in.Platform)
+
+	req := tool.GetACHttpRequest()
+	_, err := req.
+		SetHeader("Authorization", "Bearer "+token).
+		SetBody(in.Params).
+		SetResult(resp).
+		Post(reqUrl)
+
+	if err != nil {
+		return nil, err
+	}
+	return resp, nil
+}

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getalgorithmlistlogic.go

@@ -37,8 +37,9 @@ func (l *GetAlgorithmListLogic) GetAlgorithmList(in *octopus.GetAlgorithmListReq
 	req := tool.GetACHttpRequest()
 	_, err := req.
 		SetHeader("Authorization", "Bearer "+token).
-		SetQueryString("pageIndex=" + strconv.Itoa(int(in.PageIndex))).
+		SetQueryString("pageIndex="+strconv.Itoa(int(in.PageIndex))).
-		SetQueryString("pageSize=" + strconv.Itoa(int(in.PageSize))).
+		SetQueryString("pageSize="+strconv.Itoa(int(in.PageSize))).
+		SetPathParam("algorithmId", in.AlgorithmId).
 		SetResult(resp).
 		Get(reqUrl)
 

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getdatasetapplylistlogic.go

@@ -0,0 +1,50 @@
+package logic
+
+import (
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
+	"PCM/common/tool"
+	"context"
+	"strconv"
+
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetDatasetApplyListLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewGetDatasetApplyListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetDatasetApplyListLogic {
+	return &GetDatasetApplyListLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *GetDatasetApplyListLogic) GetDatasetApplyList(in *octopus.GetDatasetApplyListReq) (*octopus.GetDatasetApplyListResp, error) {
+	resp := &octopus.GetDatasetApplyListResp{}
+
+	var url_prefix = common.OctopusUrls[in.Platform]
+	var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetDatasetApplyList
+
+	token := common.GetToken(in.Platform)
+
+	req := tool.GetACHttpRequest()
+	_, err := req.
+		SetHeader("Authorization", "Bearer "+token).
+		SetQueryString("pageIndex=" + strconv.Itoa(int(in.PageIndex))).
+		SetQueryString("pageSize=" + strconv.Itoa(int(in.PageSize))).
+		SetResult(resp).
+		Get(reqUrl)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return resp, nil
+}

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getdatasettypelistlogic.go

@@ -0,0 +1,50 @@
+package logic
+
+import (
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
+	"PCM/common/tool"
+	"context"
+	"strconv"
+
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetDatasetTypeListLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewGetDatasetTypeListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetDatasetTypeListLogic {
+	return &GetDatasetTypeListLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *GetDatasetTypeListLogic) GetDatasetTypeList(in *octopus.GetDatasetTypeListRep) (*octopus.GetDatasetTypeListResp, error) {
+	resp := &octopus.GetDatasetTypeListResp{}
+
+	var url_prefix = common.OctopusUrls[in.Platform]
+	var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetDatasetTypeList
+
+	token := common.GetToken(in.Platform)
+
+	req := tool.GetACHttpRequest()
+	_, err := req.
+		SetHeader("Authorization", "Bearer "+token).
+		SetQueryString("pageIndex=" + strconv.Itoa(int(in.PageIndex))).
+		SetQueryString("pageSize=" + strconv.Itoa(int(in.PageSize))).
+		SetResult(resp).
+		Get(reqUrl)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return resp, nil
+}

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/getnotebooklogic.go

@@ -0,0 +1,47 @@
+package logic
+
+import (
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
+	"PCM/common/tool"
+	"context"
+
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetNotebookLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewGetNotebookLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetNotebookLogic {
+	return &GetNotebookLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *GetNotebookLogic) GetNotebook(in *octopus.GetNotebookReq) (*octopus.GetNotebookResp, error) {
+	resp := &octopus.GetNotebookResp{}
+
+	var url_prefix = common.OctopusUrls[in.Platform]
+	var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.GetNotebook
+
+	token := common.GetToken(in.Platform)
+
+	req := tool.GetACHttpRequest()
+	_, err := req.
+		SetHeader("Authorization", "Bearer "+token).
+		SetPathParam("id", in.Id).
+		SetResult(resp).
+		Get(reqUrl)
+
+	if err != nil {
+		return nil, err
+	}
+	return resp, nil
+}

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/startnotebooklogic.go

@@ -0,0 +1,47 @@
+package logic
+
+import (
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
+	"PCM/common/tool"
+	"context"
+
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type StartNotebookLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewStartNotebookLogic(ctx context.Context, svcCtx *svc.ServiceContext) *StartNotebookLogic {
+	return &StartNotebookLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *StartNotebookLogic) StartNotebook(in *octopus.StartNotebookReq) (*octopus.StartNotebookResp, error) {
+	resp := &octopus.StartNotebookResp{}
+
+	var url_prefix = common.OctopusUrls[in.Platform]
+	var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.StartNotebook
+
+	token := common.GetToken(in.Platform)
+
+	req := tool.GetACHttpRequest()
+	_, err := req.
+		SetHeader("Authorization", "Bearer "+token).
+		SetPathParam("id", in.Id).
+		SetResult(resp).
+		Post(reqUrl)
+
+	if err != nil {
+		return nil, err
+	}
+	return resp, nil
+}

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/stopnotebooklogic.go

@@ -0,0 +1,47 @@
+package logic
+
+import (
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/common"
+	"PCM/common/tool"
+	"context"
+
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/svc"
+	"PCM/adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type StopNotebookLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewStopNotebookLogic(ctx context.Context, svcCtx *svc.ServiceContext) *StopNotebookLogic {
+	return &StopNotebookLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *StopNotebookLogic) StopNotebook(in *octopus.StopNotebookReq) (*octopus.StopNotebookResp, error) {
+	resp := &octopus.StopNotebookResp{}
+
+	var url_prefix = common.OctopusUrls[in.Platform]
+	var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.StopNotebook
+
+	token := common.GetToken(in.Platform)
+
+	req := tool.GetACHttpRequest()
+	_, err := req.
+		SetHeader("Authorization", "Bearer "+token).
+		SetPathParam("id", in.Id).
+		SetResult(resp).
+		Post(reqUrl)
+
+	if err != nil {
+		return nil, err
+	}
+	return resp, nil
+}

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadalgorithmconfirmlogic.go

@@ -38,7 +38,7 @@ func (l *UploadAlgorithmConfirmLogic) UploadAlgorithmConfirm(in *octopus.UploadA
 		SetHeader("Authorization", "Bearer "+token).
 		SetPathParam("algorithmId", in.AlgorithmId).
 		SetPathParam("version", in.Version).
-		SetBody(in.FileName).
+		SetBody(in.Params).
 		SetResult(resp).
 		Put(reqUrl)
 

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadalgorithmlogic.go

@@ -38,7 +38,7 @@ func (l *UploadAlgorithmLogic) UploadAlgorithm(in *octopus.UploadAlgorithmReq) (
 		SetHeader("Authorization", "Bearer "+token).
 		SetPathParam("algorithmId", in.AlgorithmId).
 		SetPathParam("version", in.Version).
-		SetBody(in.UploadAlgorithmParam).
+		SetBody(in.Params).
 		SetResult(resp).
 		Post(reqUrl)
 

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploaddatasetconfirmlogic.go

@@ -29,7 +29,7 @@ func (l *UploadDataSetConfirmLogic) UploadDataSetConfirm(in *octopus.UploadDataS
 	resp := &octopus.UploadDataSetConfirmResp{}
 
 	var url_prefix = common.OctopusUrls[in.Platform]
-	var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.UploadAlgorithmConfirm
+	var reqUrl = url_prefix + l.svcCtx.Config.OctopusApi.UploadDataSetConfirm
 
 	token := common.GetToken(in.Platform)
 
@@ -38,7 +38,7 @@ func (l *UploadDataSetConfirmLogic) UploadDataSetConfirm(in *octopus.UploadDataS
 		SetHeader("Authorization", "Bearer "+token).
 		SetPathParam("datasetId", in.DatasetId).
 		SetPathParam("version", in.Version).
-		SetBody(in.FileName).
+		SetBody(in.Params).
 		SetResult(resp).
 		Put(reqUrl)
 

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploaddatasetlogic.go

@@ -38,7 +38,7 @@ func (l *UploadDataSetLogic) UploadDataSet(in *octopus.UploadDataSetReq) (*octop
 		SetHeader("Authorization", "Bearer "+token).
 		SetPathParam("datasetId", in.DatasetId).
 		SetPathParam("version", in.Version).
-		SetBody(in.UploadDataSetParam).
+		SetBody(in.Params).
 		SetResult(resp).
 		Post(reqUrl)
 

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/logic/uploadimagelogic.go

@@ -37,7 +37,7 @@ func (l *UploadImageLogic) UploadImage(in *octopus.UploadImageReq) (*octopus.Upl
 	_, err := req.
 		SetHeader("Authorization", "Bearer "+token).
 		SetPathParam("imageId", in.ImageId).
-		SetBody(in.UploadImageParam).
+		SetBody(in.Params).
 		SetResult(resp).
 		Post(reqUrl)
 

adaptor/PCM-AI/PCM-OCTOPUS/rpc/internal/server/octopusserver.go

@@ -124,17 +124,47 @@ func (s *OctopusServer) DeleteDataSetVersion(ctx context.Context, in *octopus.De
 	return l.DeleteDataSetVersion(in)
 }
 
-// ModelDeployService
+func (s *OctopusServer) GetDatasetApplyList(ctx context.Context, in *octopus.GetDatasetApplyListReq) (*octopus.GetDatasetApplyListResp, error) {
+	l := logic.NewGetDatasetApplyListLogic(ctx, s.svcCtx)
+	return l.GetDatasetApplyList(in)
+}
+
+func (s *OctopusServer) GetDatasetTypeList(ctx context.Context, in *octopus.GetDatasetTypeListRep) (*octopus.GetDatasetTypeListResp, error) {
+	l := logic.NewGetDatasetTypeListLogic(ctx, s.svcCtx)
+	return l.GetDatasetTypeList(in)
+}
+
+// Develop
 func (s *OctopusServer) GetNotebookList(ctx context.Context, in *octopus.GetNotebookListReq) (*octopus.GetNotebookListResp, error) {
 	l := logic.NewGetNotebookListLogic(ctx, s.svcCtx)
 	return l.GetNotebookList(in)
 }
 
+func (s *OctopusServer) GetNotebook(ctx context.Context, in *octopus.GetNotebookReq) (*octopus.GetNotebookResp, error) {
+	l := logic.NewGetNotebookLogic(ctx, s.svcCtx)
+	return l.GetNotebook(in)
+}
+
 func (s *OctopusServer) DeleteNotebook(ctx context.Context, in *octopus.DeleteNotebookReq) (*octopus.DeleteNotebookResp, error) {
 	l := logic.NewDeleteNotebookLogic(ctx, s.svcCtx)
 	return l.DeleteNotebook(in)
 }
 
+func (s *OctopusServer) CreateNotebook(ctx context.Context, in *octopus.CreateNotebookReq) (*octopus.CreateNotebookResp, error) {
+	l := logic.NewCreateNotebookLogic(ctx, s.svcCtx)
+	return l.CreateNotebook(in)
+}
+
+func (s *OctopusServer) StartNotebook(ctx context.Context, in *octopus.StartNotebookReq) (*octopus.StartNotebookResp, error) {
+	l := logic.NewStartNotebookLogic(ctx, s.svcCtx)
+	return l.StartNotebook(in)
+}
+
+func (s *OctopusServer) StopNotebook(ctx context.Context, in *octopus.StopNotebookReq) (*octopus.StopNotebookResp, error) {
+	l := logic.NewStopNotebookLogic(ctx, s.svcCtx)
+	return l.StopNotebook(in)
+}
+
 // ImageService
 func (s *OctopusServer) GetUserImageList(ctx context.Context, in *octopus.GetUserImageListReq) (*octopus.GetUserImageListResp, error) {
 	l := logic.NewGetUserImageListLogic(ctx, s.svcCtx)
@@ -160,3 +190,9 @@ func (s *OctopusServer) UploadImageConfirm(ctx context.Context, in *octopus.Uplo
 	l := logic.NewUploadImageConfirmLogic(ctx, s.svcCtx)
 	return l.UploadImageConfirm(in)
 }
+
+// TrainJobService
+func (s *OctopusServer) CreateTrainJob(ctx context.Context, in *octopus.CreateTrainJobReq) (*octopus.CreateTrainJobResp, error) {
+	l := logic.NewCreateTrainJobLogic(ctx, s.svcCtx)
+	return l.CreateTrainJob(in)
+}

adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopus/octopus_grpc.pb.go

@@ -44,16 +44,23 @@ type OctopusClient interface {
 	UploadDataSetConfirm(ctx context.Context, in *UploadDataSetConfirmReq, opts ...grpc.CallOption) (*UploadDataSetConfirmResp, error)
 	CreateDataSetVersion(ctx context.Context, in *CreateDataSetVersionReq, opts ...grpc.CallOption) (*CreateDataSetVersionResp, error)
 	DeleteDataSetVersion(ctx context.Context, in *DeleteDataSetVersionReq, opts ...grpc.CallOption) (*DeleteDataSetVersionResp, error)
-	// ModelDeployService
+	GetDatasetApplyList(ctx context.Context, in *GetDatasetApplyListReq, opts ...grpc.CallOption) (*GetDatasetApplyListResp, error)
+	GetDatasetTypeList(ctx context.Context, in *GetDatasetTypeListRep, opts ...grpc.CallOption) (*GetDatasetTypeListResp, error)
 	// Develop
 	GetNotebookList(ctx context.Context, in *GetNotebookListReq, opts ...grpc.CallOption) (*GetNotebookListResp, error)
+	GetNotebook(ctx context.Context, in *GetNotebookReq, opts ...grpc.CallOption) (*GetNotebookResp, error)
 	DeleteNotebook(ctx context.Context, in *DeleteNotebookReq, opts ...grpc.CallOption) (*DeleteNotebookResp, error)
+	CreateNotebook(ctx context.Context, in *CreateNotebookReq, opts ...grpc.CallOption) (*CreateNotebookResp, error)
+	StartNotebook(ctx context.Context, in *StartNotebookReq, opts ...grpc.CallOption) (*StartNotebookResp, error)
+	StopNotebook(ctx context.Context, in *StopNotebookReq, opts ...grpc.CallOption) (*StopNotebookResp, error)
 	// ImageService
 	GetUserImageList(ctx context.Context, in *GetUserImageListReq, opts ...grpc.CallOption) (*GetUserImageListResp, error)
 	CreateImage(ctx context.Context, in *CreateImageReq, opts ...grpc.CallOption) (*CreateImageResp, error)
 	DeleteImage(ctx context.Context, in *DeleteImageReq, opts ...grpc.CallOption) (*DeleteImageResp, error)
 	UploadImage(ctx context.Context, in *UploadImageReq, opts ...grpc.CallOption) (*UploadImageResp, error)
 	UploadImageConfirm(ctx context.Context, in *UploadImageConfirmReq, opts ...grpc.CallOption) (*UploadImageConfirmResp, error)
+	// TrainJobService
+	CreateTrainJob(ctx context.Context, in *CreateTrainJobReq, opts ...grpc.CallOption) (*CreateTrainJobResp, error)
 }
 
 type octopusClient struct {
@@ -244,6 +251,24 @@ func (c *octopusClient) DeleteDataSetVersion(ctx context.Context, in *DeleteData
 	return out, nil
 }
 
+func (c *octopusClient) GetDatasetApplyList(ctx context.Context, in *GetDatasetApplyListReq, opts ...grpc.CallOption) (*GetDatasetApplyListResp, error) {
+	out := new(GetDatasetApplyListResp)
+	err := c.cc.Invoke(ctx, "/octopus.Octopus/GetDatasetApplyList", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *octopusClient) GetDatasetTypeList(ctx context.Context, in *GetDatasetTypeListRep, opts ...grpc.CallOption) (*GetDatasetTypeListResp, error) {
+	out := new(GetDatasetTypeListResp)
+	err := c.cc.Invoke(ctx, "/octopus.Octopus/GetDatasetTypeList", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *octopusClient) GetNotebookList(ctx context.Context, in *GetNotebookListReq, opts ...grpc.CallOption) (*GetNotebookListResp, error) {
 	out := new(GetNotebookListResp)
 	err := c.cc.Invoke(ctx, "/octopus.Octopus/GetNotebookList", in, out, opts...)
@@ -253,6 +278,15 @@ func (c *octopusClient) GetNotebookList(ctx context.Context, in *GetNotebookList
 	return out, nil
 }
 
+func (c *octopusClient) GetNotebook(ctx context.Context, in *GetNotebookReq, opts ...grpc.CallOption) (*GetNotebookResp, error) {
+	out := new(GetNotebookResp)
+	err := c.cc.Invoke(ctx, "/octopus.Octopus/GetNotebook", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *octopusClient) DeleteNotebook(ctx context.Context, in *DeleteNotebookReq, opts ...grpc.CallOption) (*DeleteNotebookResp, error) {
 	out := new(DeleteNotebookResp)
 	err := c.cc.Invoke(ctx, "/octopus.Octopus/DeleteNotebook", in, out, opts...)
@@ -262,6 +296,33 @@ func (c *octopusClient) DeleteNotebook(ctx context.Context, in *DeleteNotebookRe
 	return out, nil
 }
 
+func (c *octopusClient) CreateNotebook(ctx context.Context, in *CreateNotebookReq, opts ...grpc.CallOption) (*CreateNotebookResp, error) {
+	out := new(CreateNotebookResp)
+	err := c.cc.Invoke(ctx, "/octopus.Octopus/CreateNotebook", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *octopusClient) StartNotebook(ctx context.Context, in *StartNotebookReq, opts ...grpc.CallOption) (*StartNotebookResp, error) {
+	out := new(StartNotebookResp)
+	err := c.cc.Invoke(ctx, "/octopus.Octopus/StartNotebook", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *octopusClient) StopNotebook(ctx context.Context, in *StopNotebookReq, opts ...grpc.CallOption) (*StopNotebookResp, error) {
+	out := new(StopNotebookResp)
+	err := c.cc.Invoke(ctx, "/octopus.Octopus/StopNotebook", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *octopusClient) GetUserImageList(ctx context.Context, in *GetUserImageListReq, opts ...grpc.CallOption) (*GetUserImageListResp, error) {
 	out := new(GetUserImageListResp)
 	err := c.cc.Invoke(ctx, "/octopus.Octopus/GetUserImageList", in, out, opts...)
@@ -307,6 +368,15 @@ func (c *octopusClient) UploadImageConfirm(ctx context.Context, in *UploadImageC
 	return out, nil
 }
 
+func (c *octopusClient) CreateTrainJob(ctx context.Context, in *CreateTrainJobReq, opts ...grpc.CallOption) (*CreateTrainJobResp, error) {
+	out := new(CreateTrainJobResp)
+	err := c.cc.Invoke(ctx, "/octopus.Octopus/CreateTrainJob", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // OctopusServer is the server API for Octopus service.
 // All implementations must embed UnimplementedOctopusServer
 // for forward compatibility
@@ -333,16 +403,23 @@ type OctopusServer interface {
 	UploadDataSetConfirm(context.Context, *UploadDataSetConfirmReq) (*UploadDataSetConfirmResp, error)
 	CreateDataSetVersion(context.Context, *CreateDataSetVersionReq) (*CreateDataSetVersionResp, error)
 	DeleteDataSetVersion(context.Context, *DeleteDataSetVersionReq) (*DeleteDataSetVersionResp, error)
-	// ModelDeployService
+	GetDatasetApplyList(context.Context, *GetDatasetApplyListReq) (*GetDatasetApplyListResp, error)
+	GetDatasetTypeList(context.Context, *GetDatasetTypeListRep) (*GetDatasetTypeListResp, error)
 	// Develop
 	GetNotebookList(context.Context, *GetNotebookListReq) (*GetNotebookListResp, error)
+	GetNotebook(context.Context, *GetNotebookReq) (*GetNotebookResp, error)
 	DeleteNotebook(context.Context, *DeleteNotebookReq) (*DeleteNotebookResp, error)
+	CreateNotebook(context.Context, *CreateNotebookReq) (*CreateNotebookResp, error)
+	StartNotebook(context.Context, *StartNotebookReq) (*StartNotebookResp, error)
+	StopNotebook(context.Context, *StopNotebookReq) (*StopNotebookResp, error)
 	// ImageService
 	GetUserImageList(context.Context, *GetUserImageListReq) (*GetUserImageListResp, error)
 	CreateImage(context.Context, *CreateImageReq) (*CreateImageResp, error)
 	DeleteImage(context.Context, *DeleteImageReq) (*DeleteImageResp, error)
 	UploadImage(context.Context, *UploadImageReq) (*UploadImageResp, error)
 	UploadImageConfirm(context.Context, *UploadImageConfirmReq) (*UploadImageConfirmResp, error)
+	// TrainJobService
+	CreateTrainJob(context.Context, *CreateTrainJobReq) (*CreateTrainJobResp, error)
 	mustEmbedUnimplementedOctopusServer()
 }
 
@@ -410,12 +487,30 @@ func (UnimplementedOctopusServer) CreateDataSetVersion(context.Context, *CreateD
 func (UnimplementedOctopusServer) DeleteDataSetVersion(context.Context, *DeleteDataSetVersionReq) (*DeleteDataSetVersionResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteDataSetVersion not implemented")
 }
+func (UnimplementedOctopusServer) GetDatasetApplyList(context.Context, *GetDatasetApplyListReq) (*GetDatasetApplyListResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetDatasetApplyList not implemented")
+}
+func (UnimplementedOctopusServer) GetDatasetTypeList(context.Context, *GetDatasetTypeListRep) (*GetDatasetTypeListResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetDatasetTypeList not implemented")
+}
 func (UnimplementedOctopusServer) GetNotebookList(context.Context, *GetNotebookListReq) (*GetNotebookListResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetNotebookList not implemented")
 }
+func (UnimplementedOctopusServer) GetNotebook(context.Context, *GetNotebookReq) (*GetNotebookResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetNotebook not implemented")
+}
 func (UnimplementedOctopusServer) DeleteNotebook(context.Context, *DeleteNotebookReq) (*DeleteNotebookResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteNotebook not implemented")
 }
+func (UnimplementedOctopusServer) CreateNotebook(context.Context, *CreateNotebookReq) (*CreateNotebookResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method CreateNotebook not implemented")
+}
+func (UnimplementedOctopusServer) StartNotebook(context.Context, *StartNotebookReq) (*StartNotebookResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method StartNotebook not implemented")
+}
+func (UnimplementedOctopusServer) StopNotebook(context.Context, *StopNotebookReq) (*StopNotebookResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method StopNotebook not implemented")
+}
 func (UnimplementedOctopusServer) GetUserImageList(context.Context, *GetUserImageListReq) (*GetUserImageListResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUserImageList not implemented")
 }
@@ -431,6 +526,9 @@ func (UnimplementedOctopusServer) UploadImage(context.Context, *UploadImageReq)
 func (UnimplementedOctopusServer) UploadImageConfirm(context.Context, *UploadImageConfirmReq) (*UploadImageConfirmResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UploadImageConfirm not implemented")
 }
+func (UnimplementedOctopusServer) CreateTrainJob(context.Context, *CreateTrainJobReq) (*CreateTrainJobResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method CreateTrainJob not implemented")
+}
 func (UnimplementedOctopusServer) mustEmbedUnimplementedOctopusServer() {}
 
 // UnsafeOctopusServer may be embedded to opt out of forward compatibility for this service.
@@ -804,6 +902,42 @@ func _Octopus_DeleteDataSetVersion_Handler(srv interface{}, ctx context.Context,
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Octopus_GetDatasetApplyList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetDatasetApplyListReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(OctopusServer).GetDatasetApplyList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/octopus.Octopus/GetDatasetApplyList",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(OctopusServer).GetDatasetApplyList(ctx, req.(*GetDatasetApplyListReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Octopus_GetDatasetTypeList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetDatasetTypeListRep)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(OctopusServer).GetDatasetTypeList(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/octopus.Octopus/GetDatasetTypeList",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(OctopusServer).GetDatasetTypeList(ctx, req.(*GetDatasetTypeListRep))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Octopus_GetNotebookList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetNotebookListReq)
 	if err := dec(in); err != nil {
@@ -822,6 +956,24 @@ func _Octopus_GetNotebookList_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Octopus_GetNotebook_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetNotebookReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(OctopusServer).GetNotebook(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/octopus.Octopus/GetNotebook",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(OctopusServer).GetNotebook(ctx, req.(*GetNotebookReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Octopus_DeleteNotebook_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(DeleteNotebookReq)
 	if err := dec(in); err != nil {
@@ -840,6 +992,60 @@ func _Octopus_DeleteNotebook_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Octopus_CreateNotebook_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateNotebookReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(OctopusServer).CreateNotebook(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/octopus.Octopus/CreateNotebook",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(OctopusServer).CreateNotebook(ctx, req.(*CreateNotebookReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Octopus_StartNotebook_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(StartNotebookReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(OctopusServer).StartNotebook(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/octopus.Octopus/StartNotebook",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(OctopusServer).StartNotebook(ctx, req.(*StartNotebookReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _Octopus_StopNotebook_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(StopNotebookReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(OctopusServer).StopNotebook(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/octopus.Octopus/StopNotebook",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(OctopusServer).StopNotebook(ctx, req.(*StopNotebookReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Octopus_GetUserImageList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetUserImageListReq)
 	if err := dec(in); err != nil {
@@ -930,6 +1136,24 @@ func _Octopus_UploadImageConfirm_Handler(srv interface{}, ctx context.Context, d
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Octopus_CreateTrainJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(CreateTrainJobReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(OctopusServer).CreateTrainJob(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/octopus.Octopus/CreateTrainJob",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(OctopusServer).CreateTrainJob(ctx, req.(*CreateTrainJobReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Octopus_ServiceDesc is the grpc.ServiceDesc for Octopus service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -1017,14 +1241,38 @@ var Octopus_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "DeleteDataSetVersion",
 			Handler:    _Octopus_DeleteDataSetVersion_Handler,
 		},
+		{
+			MethodName: "GetDatasetApplyList",
+			Handler:    _Octopus_GetDatasetApplyList_Handler,
+		},
+		{
+			MethodName: "GetDatasetTypeList",
+			Handler:    _Octopus_GetDatasetTypeList_Handler,
+		},
 		{
 			MethodName: "GetNotebookList",
 			Handler:    _Octopus_GetNotebookList_Handler,
 		},
+		{
+			MethodName: "GetNotebook",
+			Handler:    _Octopus_GetNotebook_Handler,
+		},
 		{
 			MethodName: "DeleteNotebook",
 			Handler:    _Octopus_DeleteNotebook_Handler,
 		},
+		{
+			MethodName: "CreateNotebook",
+			Handler:    _Octopus_CreateNotebook_Handler,
+		},
+		{
+			MethodName: "StartNotebook",
+			Handler:    _Octopus_StartNotebook_Handler,
+		},
+		{
+			MethodName: "StopNotebook",
+			Handler:    _Octopus_StopNotebook_Handler,
+		},
 		{
 			MethodName: "GetUserImageList",
 			Handler:    _Octopus_GetUserImageList_Handler,
@@ -1045,6 +1293,10 @@ var Octopus_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "UploadImageConfirm",
 			Handler:    _Octopus_UploadImageConfirm_Handler,
 		},
+		{
+			MethodName: "CreateTrainJob",
+			Handler:    _Octopus_CreateTrainJob_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "octopus.proto",

adaptor/PCM-AI/PCM-OCTOPUS/rpc/octopusclient/octopus.go

@@ -16,10 +16,12 @@ type (
 	AlgorithmDetail               = octopus.AlgorithmDetail
 	Algorithms                    = octopus.Algorithms
 	Applies                       = octopus.Applies
+	Config                        = octopus.Config
 	CpResp                        = octopus.CpResp
 	CreateDataSet                 = octopus.CreateDataSet
 	CreateDataSetReq              = octopus.CreateDataSetReq
 	CreateDataSetResp             = octopus.CreateDataSetResp
+	CreateDataSetVersionParam     = octopus.CreateDataSetVersionParam
 	CreateDataSetVersionReq       = octopus.CreateDataSetVersionReq
 	CreateDataSetVersionResp      = octopus.CreateDataSetVersionResp
 	CreateImage                   = octopus.CreateImage
@@ -28,6 +30,12 @@ type (
 	CreateMyAlgorithm             = octopus.CreateMyAlgorithm
 	CreateMyAlgorithmReq          = octopus.CreateMyAlgorithmReq
 	CreateMyAlgorithmResp         = octopus.CreateMyAlgorithmResp
+	CreateNotebookParam           = octopus.CreateNotebookParam
+	CreateNotebookReq             = octopus.CreateNotebookReq
+	CreateNotebookResp            = octopus.CreateNotebookResp
+	CreateTrainJobParam           = octopus.CreateTrainJobParam
+	CreateTrainJobReq             = octopus.CreateTrainJobReq
+	CreateTrainJobResp            = octopus.CreateTrainJobResp
 	DatasetVersion                = octopus.DatasetVersion
 	Datasets                      = octopus.Datasets
 	DeleteDataSetReq              = octopus.DeleteDataSetReq
@@ -42,6 +50,7 @@ type (
 	DeleteNotebookResp            = octopus.DeleteNotebookResp
 	DownloadAlgorithmReq          = octopus.DownloadAlgorithmReq
 	DownloadAlgorithmResp         = octopus.DownloadAlgorithmResp
+	Envs                          = octopus.Envs
 	Error                         = octopus.Error
 	GetAlgorithmApplyListReq      = octopus.GetAlgorithmApplyListReq
 	GetAlgorithmApplyListResp     = octopus.GetAlgorithmApplyListResp
@@ -51,6 +60,10 @@ type (
 	GetAlgorithmListResp          = octopus.GetAlgorithmListResp
 	GetAlgorithmReq               = octopus.GetAlgorithmReq
 	GetAlgorithmResp              = octopus.GetAlgorithmResp
+	GetDatasetApplyListReq        = octopus.GetDatasetApplyListReq
+	GetDatasetApplyListResp       = octopus.GetDatasetApplyListResp
+	GetDatasetTypeListRep         = octopus.GetDatasetTypeListRep
+	GetDatasetTypeListResp        = octopus.GetDatasetTypeListResp
 	GetDatasetVersionListReq      = octopus.GetDatasetVersionListReq
 	GetDatasetVersionListResp     = octopus.GetDatasetVersionListResp
 	GetMyAlgorithmListReq         = octopus.GetMyAlgorithmListReq
@@ -59,6 +72,8 @@ type (
 	GetMyDatasetListResp          = octopus.GetMyDatasetListResp
 	GetNotebookListReq            = octopus.GetNotebookListReq
 	GetNotebookListResp           = octopus.GetNotebookListResp
+	GetNotebookReq                = octopus.GetNotebookReq
+	GetNotebookResp               = octopus.GetNotebookResp
 	GetUserImageListReq           = octopus.GetUserImageListReq
 	GetUserImageListResp          = octopus.GetUserImageListResp
 	GiResp                        = octopus.GiResp
@@ -66,13 +81,18 @@ type (
 	Image                         = octopus.Image
 	Images                        = octopus.Images
 	Lables                        = octopus.Lables
-	Notebooks                     = octopus.Notebooks
+	Mounts                        = octopus.Mounts
+	Nfs                           = octopus.Nfs
+	Notebook                      = octopus.Notebook
+	Parameters                    = octopus.Parameters
 	PayloadAlgorithmFrameworkList = octopus.PayloadAlgorithmFrameworkList
 	PayloadAlgorithmList          = octopus.PayloadAlgorithmList
 	PayloadCreateDataSet          = octopus.PayloadCreateDataSet
 	PayloadCreateDataSetVersion   = octopus.PayloadCreateDataSetVersion
 	PayloadCreateImage            = octopus.PayloadCreateImage
 	PayloadCreateMyAlgorithm      = octopus.PayloadCreateMyAlgorithm
+	PayloadCreateNotebook         = octopus.PayloadCreateNotebook
+	PayloadCreateTrainJob         = octopus.PayloadCreateTrainJob
 	PayloadDeleteDataSet          = octopus.PayloadDeleteDataSet
 	PayloadDeleteDataSetVersion   = octopus.PayloadDeleteDataSetVersion
 	PayloadDeleteImage            = octopus.PayloadDeleteImage
@@ -81,10 +101,15 @@ type (
 	PayloadDownloadAlgorithm      = octopus.PayloadDownloadAlgorithm
 	PayloadGetAlgorithm           = octopus.PayloadGetAlgorithm
 	PayloadGetAlgorithmApplyList  = octopus.PayloadGetAlgorithmApplyList
+	PayloadGetDatasetApplyList    = octopus.PayloadGetDatasetApplyList
+	PayloadGetDatasetTypeList     = octopus.PayloadGetDatasetTypeList
 	PayloadGetDatasetVersion      = octopus.PayloadGetDatasetVersion
+	PayloadGetNotebook            = octopus.PayloadGetNotebook
 	PayloadMyAlgorithmList        = octopus.PayloadMyAlgorithmList
 	PayloadMyDatasetList          = octopus.PayloadMyDatasetList
 	PayloadNotebookList           = octopus.PayloadNotebookList
+	PayloadStartNotebook          = octopus.PayloadStartNotebook
+	PayloadStopNotebook           = octopus.PayloadStopNotebook
 	PayloadUploadAlgorithm        = octopus.PayloadUploadAlgorithm
 	PayloadUploadAlgorithmConfirm = octopus.PayloadUploadAlgorithmConfirm
 	PayloadUploadDataSet          = octopus.PayloadUploadDataSet
@@ -92,13 +117,21 @@ type (
 	PayloadUploadImage            = octopus.PayloadUploadImage
 	PayloadUploadImageConfirm     = octopus.PayloadUploadImageConfirm
 	PayloadUserImageList          = octopus.PayloadUserImageList
+	ReplicaStates                 = octopus.ReplicaStates
 	ResourceReq                   = octopus.ResourceReq
+	StartNotebookReq              = octopus.StartNotebookReq
+	StartNotebookResp             = octopus.StartNotebookResp
+	StopNotebookReq               = octopus.StopNotebookReq
+	StopNotebookResp              = octopus.StopNotebookResp
 	Tasks                         = octopus.Tasks
+	TrainJobOctopus               = octopus.TrainJobOctopus
+	UploadAlgorithmConfirmParam   = octopus.UploadAlgorithmConfirmParam
 	UploadAlgorithmConfirmReq     = octopus.UploadAlgorithmConfirmReq
 	UploadAlgorithmConfirmResp    = octopus.UploadAlgorithmConfirmResp
 	UploadAlgorithmParam          = octopus.UploadAlgorithmParam
 	UploadAlgorithmReq            = octopus.UploadAlgorithmReq
 	UploadAlgorithmResp           = octopus.UploadAlgorithmResp
+	UploadDataSetConfirmParam     = octopus.UploadDataSetConfirmParam
 	UploadDataSetConfirmReq       = octopus.UploadDataSetConfirmReq
 	UploadDataSetConfirmResp      = octopus.UploadDataSetConfirmResp
 	UploadDataSetParam            = octopus.UploadDataSetParam
@@ -134,15 +167,23 @@ type (
 		UploadDataSetConfirm(ctx context.Context, in *UploadDataSetConfirmReq, opts ...grpc.CallOption) (*UploadDataSetConfirmResp, error)
 		CreateDataSetVersion(ctx context.Context, in *CreateDataSetVersionReq, opts ...grpc.CallOption) (*CreateDataSetVersionResp, error)
 		DeleteDataSetVersion(ctx context.Context, in *DeleteDataSetVersionReq, opts ...grpc.CallOption) (*DeleteDataSetVersionResp, error)
-		// ModelDeployService
+		GetDatasetApplyList(ctx context.Context, in *GetDatasetApplyListReq, opts ...grpc.CallOption) (*GetDatasetApplyListResp, error)
+		GetDatasetTypeList(ctx context.Context, in *GetDatasetTypeListRep, opts ...grpc.CallOption) (*GetDatasetTypeListResp, error)
+		// Develop
 		GetNotebookList(ctx context.Context, in *GetNotebookListReq, opts ...grpc.CallOption) (*GetNotebookListResp, error)
+		GetNotebook(ctx context.Context, in *GetNotebookReq, opts ...grpc.CallOption) (*GetNotebookResp, error)
 		DeleteNotebook(ctx context.Context, in *DeleteNotebookReq, opts ...grpc.CallOption) (*DeleteNotebookResp, error)
+		CreateNotebook(ctx context.Context, in *CreateNotebookReq, opts ...grpc.CallOption) (*CreateNotebookResp, error)
+		StartNotebook(ctx context.Context, in *StartNotebookReq, opts ...grpc.CallOption) (*StartNotebookResp, error)
+		StopNotebook(ctx context.Context, in *StopNotebookReq, opts ...grpc.CallOption) (*StopNotebookResp, error)
 		// ImageService
 		GetUserImageList(ctx context.Context, in *GetUserImageListReq, opts ...grpc.CallOption) (*GetUserImageListResp, error)
 		CreateImage(ctx context.Context, in *CreateImageReq, opts ...grpc.CallOption) (*CreateImageResp, error)
 		DeleteImage(ctx context.Context, in *DeleteImageReq, opts ...grpc.CallOption) (*DeleteImageResp, error)
 		UploadImage(ctx context.Context, in *UploadImageReq, opts ...grpc.CallOption) (*UploadImageResp, error)
 		UploadImageConfirm(ctx context.Context, in *UploadImageConfirmReq, opts ...grpc.CallOption) (*UploadImageConfirmResp, error)
+		// TrainJobService
+		CreateTrainJob(ctx context.Context, in *CreateTrainJobReq, opts ...grpc.CallOption) (*CreateTrainJobResp, error)
 	}
 
 	defaultOctopus struct {
@@ -258,17 +299,47 @@ func (m *defaultOctopus) DeleteDataSetVersion(ctx context.Context, in *DeleteDat
 	return client.DeleteDataSetVersion(ctx, in, opts...)
 }
 
-// ModelDeployService
+func (m *defaultOctopus) GetDatasetApplyList(ctx context.Context, in *GetDatasetApplyListReq, opts ...grpc.CallOption) (*GetDatasetApplyListResp, error) {
+	client := octopus.NewOctopusClient(m.cli.Conn())
+	return client.GetDatasetApplyList(ctx, in, opts...)
+}
+
+func (m *defaultOctopus) GetDatasetTypeList(ctx context.Context, in *GetDatasetTypeListRep, opts ...grpc.CallOption) (*GetDatasetTypeListResp, error) {
+	client := octopus.NewOctopusClient(m.cli.Conn())
+	return client.GetDatasetTypeList(ctx, in, opts...)
+}
+
+// Develop
 func (m *defaultOctopus) GetNotebookList(ctx context.Context, in *GetNotebookListReq, opts ...grpc.CallOption) (*GetNotebookListResp, error) {
 	client := octopus.NewOctopusClient(m.cli.Conn())
 	return client.GetNotebookList(ctx, in, opts...)
 }
 
+func (m *defaultOctopus) GetNotebook(ctx context.Context, in *GetNotebookReq, opts ...grpc.CallOption) (*GetNotebookResp, error) {
+	client := octopus.NewOctopusClient(m.cli.Conn())
+	return client.GetNotebook(ctx, in, opts...)
+}
+
 func (m *defaultOctopus) DeleteNotebook(ctx context.Context, in *DeleteNotebookReq, opts ...grpc.CallOption) (*DeleteNotebookResp, error) {
 	client := octopus.NewOctopusClient(m.cli.Conn())
 	return client.DeleteNotebook(ctx, in, opts...)
 }
 
+func (m *defaultOctopus) CreateNotebook(ctx context.Context, in *CreateNotebookReq, opts ...grpc.CallOption) (*CreateNotebookResp, error) {
+	client := octopus.NewOctopusClient(m.cli.Conn())
+	return client.CreateNotebook(ctx, in, opts...)
+}
+
+func (m *defaultOctopus) StartNotebook(ctx context.Context, in *StartNotebookReq, opts ...grpc.CallOption) (*StartNotebookResp, error) {
+	client := octopus.NewOctopusClient(m.cli.Conn())
+	return client.StartNotebook(ctx, in, opts...)
+}
+
+func (m *defaultOctopus) StopNotebook(ctx context.Context, in *StopNotebookReq, opts ...grpc.CallOption) (*StopNotebookResp, error) {
+	client := octopus.NewOctopusClient(m.cli.Conn())
+	return client.StopNotebook(ctx, in, opts...)
+}
+
 // ImageService
 func (m *defaultOctopus) GetUserImageList(ctx context.Context, in *GetUserImageListReq, opts ...grpc.CallOption) (*GetUserImageListResp, error) {
 	client := octopus.NewOctopusClient(m.cli.Conn())
@@ -294,3 +365,9 @@ func (m *defaultOctopus) UploadImageConfirm(ctx context.Context, in *UploadImage
 	client := octopus.NewOctopusClient(m.cli.Conn())
 	return client.UploadImageConfirm(ctx, in, opts...)
 }
+
+// TrainJobService
+func (m *defaultOctopus) CreateTrainJob(ctx context.Context, in *CreateTrainJobReq, opts ...grpc.CallOption) (*CreateTrainJobResp, error) {
+	client := octopus.NewOctopusClient(m.cli.Conn())
+	return client.CreateTrainJob(ctx, in, opts...)
+}

adaptor/PCM-AI/PCM-OCTOPUS/rpc/pb/octopus.proto

@@ -5,6 +5,7 @@ option go_package = "/octopus";
 
 
 message resourceReq{
+  string platform =1;
 }
 
 message cpResp{
@@ -60,7 +61,7 @@ message UploadAlgorithmReq{
   string platform =1;
   string algorithmId = 2;
   string version = 3;
-  UploadAlgorithmParam uploadAlgorithmParam = 4;
+  UploadAlgorithmParam params = 4;
 }
 
 message UploadAlgorithmParam{
@@ -82,7 +83,11 @@ message UploadAlgorithmConfirmReq{
   string platform =1;
   string algorithmId = 2;
   string version = 3;
-  string fileName = 4;
+  UploadAlgorithmConfirmParam params = 4;
+}
+
+message UploadAlgorithmConfirmParam{
+  string fileName = 1;
 }
 
 message UploadAlgorithmConfirmResp{
@@ -97,8 +102,9 @@ message PayloadUploadAlgorithmConfirm{
 
 message GetAlgorithmListReq{
   string platform =1;
-  int32 pageIndex =2;
+  string algorithmId = 2;
-  int32 pageSize =3;
+  int32 pageIndex =3;
+  int32 pageSize =4;
 }
 
 message GetAlgorithmListResp{
@@ -344,7 +350,7 @@ message UploadDataSetReq{
   string platform =1;
   string datasetId=2;
   string version=3;
-  UploadDataSetParam UploadDataSetParam = 4;
+  UploadDataSetParam params = 4;
 }
 
 message UploadDataSetParam{
@@ -366,7 +372,11 @@ message UploadDataSetConfirmReq{
   string platform =1;
   string datasetId=2;
   string version=3;
-  string fileName = 4;
+  UploadDataSetConfirmParam params = 4;
+}
+
+message UploadDataSetConfirmParam{
+  string fileName = 1;
 }
 
 message UploadDataSetConfirmResp{
@@ -382,7 +392,11 @@ message PayloadUploadDataSetConfirm{
 message CreateDataSetVersionReq{
   string platform =1;
   string datasetId=2;
-  string desc =3;
+  CreateDataSetVersionParam params =3;
+}
+
+message CreateDataSetVersionParam{
+  string desc =1;
 }
 
 message CreateDataSetVersionResp{
@@ -411,12 +425,95 @@ message DeleteDataSetVersionResp{
 message PayloadDeleteDataSetVersion{
   int64 deletedAt = 1;
 }
+
+message GetDatasetApplyListReq{
+  string platform =1;
+  int32 pageIndex =2;
+  int32 pageSize =3;
+}
+
+message GetDatasetApplyListResp{
+  bool success =1;
+  PayloadGetDatasetApplyList payload =2;
+  Error error = 3;
+}
+
+message PayloadGetDatasetApplyList{
+  int32 totalSize = 1;
+  repeated Lables lables =2;
+}
+
+message GetDatasetTypeListRep{
+  string platform =1;
+  int32 pageIndex =2;
+  int32 pageSize =3;
+}
+
+message GetDatasetTypeListResp{
+  bool success =1;
+  PayloadGetDatasetTypeList payload =2;
+  Error error = 3;
+}
+
+message PayloadGetDatasetTypeList{
+  int32 totalSize = 1;
+  repeated Lables lables =2;
+}
+
+
 /******************DatasetService End*************************/
 
 /******************ModelDeployService Start*************************/
 /******************ModelDeployService End*************************/
 
 /******************Develop Start*************************/
+message CreateNotebookReq{
+  string platform =1;
+  CreateNotebookParam params = 2;
+}
+
+message CreateNotebookParam{
+  string algorithmId = 1;
+  string algorithmVersion = 2;
+  string command = 3;
+  string datasetId = 4;
+  string datasetVersion = 5;
+  string desc = 6;
+  Envs envs = 7;
+  string imageId = 8;
+  string imageUrl = 9;
+  repeated Mounts mounts = 10;
+  string name = 11;
+  string resourcePool = 12;
+  string resourceSpecId = 13;
+  int32 taskNumber = 14;
+}
+
+message CreateNotebookResp{
+  bool success =1;
+  PayloadCreateNotebook payload =2;
+  Error error = 3;
+}
+
+message PayloadCreateNotebook{
+  string id = 1;
+}
+
+message GetNotebookReq{
+  string platform =1;
+  string id =2;
+}
+
+message GetNotebookResp{
+  bool success =1;
+  PayloadGetNotebook payload =2;
+  Error error = 3;
+}
+
+message PayloadGetNotebook{
+  Notebook notebook = 1;
+}
+
 message DeleteNotebookReq{
   string platform =1;
   string id =2;
@@ -446,10 +543,10 @@ message GetNotebookListResp{
 
 message PayloadNotebookList{
   int32 totalSize =1;
-  repeated Notebooks notebooks = 2;
+  repeated Notebook notebooks = 2;
 }
 
-message Notebooks{
+message Notebook{
   int64 createdAt =1;
   int64 updatedAt =2;
   string id = 3;
@@ -479,6 +576,38 @@ message Tasks{
   string url =1;
   string name= 2;
 }
+
+message StartNotebookReq{
+  string platform =1;
+  string id =2;
+}
+
+message StartNotebookResp{
+  bool success =1;
+  PayloadStartNotebook payload =2;
+  Error error = 3;
+}
+
+message PayloadStartNotebook{
+  string id = 1;
+}
+
+message StopNotebookReq{
+  string platform =1;
+  string id =2;
+}
+
+message StopNotebookResp{
+  bool success =1;
+  PayloadStopNotebook payload =2;
+  Error error = 3;
+}
+
+message PayloadStopNotebook{
+  string id = 1;
+}
+
+
 /******************Develop End*************************/
 
 /******************ImageService Start*************************/
@@ -562,7 +691,7 @@ message PayloadCreateImage{
 message UploadImageReq{
   string platform =1;
   string imageId=2;
-  UploadImageParam uploadImageParam = 3;
+  UploadImageParam params = 3;
 }
 
 message UploadImageParam{
@@ -608,6 +737,85 @@ message PayloadUploadImageConfirm{
 /******************Model End*************************/
 
 /******************TrainJobService Start*************************/
+message CreateTrainJobReq{
+  string platform =1;
+  CreateTrainJobParam params = 2;
+}
+
+message CreateTrainJobResp{
+  bool success =1;
+  PayloadCreateTrainJob payload =2;
+  Error error = 3;
+}
+
+message CreateTrainJobParam{
+  string algorithmId = 1;
+  string algorithmVersion = 2;
+  repeated Config config = 3;
+  string dataSetId = 4;
+  string dataSetVersion = 5;
+  string desc = 6;
+  string imageId = 7;
+  string imageUrl = 8;
+  bool isDistributed = 9;
+  repeated Mounts mounts = 10;
+  string name = 11;
+  string resourcePool = 12;
+}
+
+message Config{
+  string command = 1;
+  Envs envs = 2;
+  bool isMainRole = 3;
+  int32 minFailedTaskCount = 4;
+  int32 minSucceededTaskCount =5;
+  string name = 6;
+  repeated Parameters parameters = 7;
+  repeated ReplicaStates replicaStates = 8;
+  string resourceSpecId = 9;
+  string resourceSpecName = 10;
+  int32 resourceSpecPrice = 11;
+  string subTaskState = 12;
+  int32 taskNumber = 13;
+}
+
+message Envs{
+  string additionalProp1 = 1;
+  string additionalProp2 = 2;
+  string additionalProp3 = 3;
+}
+
+message Parameters{
+  string key = 1;
+  string value = 2;
+}
+
+message ReplicaStates{
+  string key = 1;
+  string state = 2;
+}
+
+message Mounts{
+  string containerPath = 1;
+  Nfs nfs = 2;
+  TrainJobOctopus octopus = 3;
+  bool readOnly = 4;
+}
+
+message PayloadCreateTrainJob{
+  string jobId = 1;
+}
+
+message Nfs{
+  string path = 1;
+  string server = 2;
+}
+
+message TrainJobOctopus{
+  string bucket = 1;
+  string object = 2;
+}
+
 /******************TrainJobService End*************************/
 
 message Error{
@@ -638,9 +846,6 @@ service Octopus {
 
 
 
-
-
-
   //DatasetService
   rpc GetMyDatasetList(GetMyDatasetListReq) returns (GetMyDatasetListResp);
   rpc GetDatasetVersionList(GetDatasetVersionListReq) returns (GetDatasetVersionListResp);
@@ -650,15 +855,21 @@ service Octopus {
   rpc UploadDataSetConfirm(UploadDataSetConfirmReq) returns (UploadDataSetConfirmResp);
   rpc CreateDataSetVersion(CreateDataSetVersionReq) returns (CreateDataSetVersionResp); //创建版本
   rpc DeleteDataSetVersion(DeleteDataSetVersionReq) returns (DeleteDataSetVersionResp); //删除版本
-
+  rpc GetDatasetApplyList(GetDatasetApplyListReq) returns (GetDatasetApplyListResp); //查询数据集用途列表
-
+  rpc GetDatasetTypeList(GetDatasetTypeListRep) returns (GetDatasetTypeListResp); //查询数据集类型列表
-
 
 
   //ModelDeployService
+
+
   //Develop
   rpc GetNotebookList(GetNotebookListReq) returns (GetNotebookListResp);
+  rpc GetNotebook(GetNotebookReq) returns (GetNotebookResp);
   rpc DeleteNotebook(DeleteNotebookReq) returns (DeleteNotebookResp);
+  rpc CreateNotebook(CreateNotebookReq) returns (CreateNotebookResp);
+  rpc StartNotebook(StartNotebookReq) returns (StartNotebookResp);
+  rpc StopNotebook(StopNotebookReq) returns (StopNotebookResp);
+
 
 
   //ImageService
@@ -669,9 +880,12 @@ service Octopus {
   rpc UploadImageConfirm(UploadImageConfirmReq) returns (UploadImageConfirmResp);
 
 
-
-
   //Model
+
+
+
   //TrainJobService
+  rpc CreateTrainJob(CreateTrainJobReq) returns (CreateTrainJobResp);
+
 
 }

adaptor/PCM-CORE/api/desc/core/pcm-core.api

@@ -303,3 +303,47 @@ type (
 //        DeleteFlag int64 `json:"delete_flag"`      // 是否删除 0:未删除，1:已经删除
     }
 )
+
+type (
+    ResourcePanelConfigReq {
+        Id int64 `json:"id"`                                    //id
+        Title string `json:"title"`                             //标题
+        TitleColor string `json:"titleColor"`                   //标题色
+        MainColor string `json:"mainColor"`                     //主色调
+        MainColor2 string `json:"mainColor2"`                   //次主色调
+        TextColor string `json:"textColor"`                     //文字颜色
+        BackgroundColor string `json:"backgroundColor"`         //背景底色
+        Center string `json:"center"`                           //中心点
+        CenterPosition string `json:"centerPosition"`           //comment 中心点坐标
+        ProvinceBgColor string `json:"provinceBgColor"`         //三级地图底色
+        StatusIng string `json:"statusIng"`                     //接入中图标
+        StatusUn string `json:"statusUn"`                       //未接入图标
+        StatusEnd string `json:"statusEnd"`                     //已接入图标
+        TitleIcon string `json:"titleIcon"`                     //标题底图
+        SubTitleIcon string `json:"subTitleIcon"`               //小标题底图
+        NumberBg string `json:"numberBg"`                       //数字底图
+        TaskBg string `json:"taskBg"`                           //任务底图
+    }
+
+    ResourcePanelConfigResp {
+        Id int64 `json:"id"`                              //id
+        Title string `json:"title"`                       //标题,
+        TitleColor string `json:"titleColor"`             //标题色,
+        MainColor string `json:"mainColor"`               //主色调,
+        MainColor2 string `json:"mainColor2"`             //次主色调,
+        TextColor string `json:"textColor"`               //文字颜色,
+        BackgroundColor string `json:"backgroundColor"`   //背景底色,
+        Center string `json:"center"`                     //中心点,
+        CenterPosition string `json:"centerPosition"`     //comment 中心点坐标,
+        ProvinceBgColor string `json:"provinceBgColor"`   //三级地图底色,
+        StatusIng string `json:"statusIng"`               //接入中图标,
+        StatusUn string `json:"statusUn"`                 //未接入图标,
+        StatusEnd string `json:"statusEnd"`               //已接入图标,
+        TitleIcon string `json:"titleIcon"`               //标题底图,
+        SubTitleIcon string `json:"subTitleIcon"`         //小标题底图,
+        NumberBg string `json:"numberBg"`                 //数字底图,
+        TaskBg string `json:"taskBg"`                     //任务底图,
+        CreateTime string `json:"createTime"`             //创建时间,
+        UpdateTime string `json:"updateTime"`             //更新时间
+    }
+)

adaptor/PCM-CORE/api/desc/pcm.api

@@ -50,6 +50,12 @@ service pcm {
 	
 	@handler listDomainResourceHandler
 	get /core/listDomainResource returns (DomainResourceResp)
+	
+	@handler getResourcePanelConfigHandler
+	get /core/getResourcePanelConfigHandler () returns (ResourcePanelConfigResp)
+	
+	@handler putResourcePanelConfigHandler
+	put /core/resourcePanelConfigHandler (ResourcePanelConfigReq) returns ()
 }
 
 //hpc二级接口
@@ -181,7 +187,12 @@ service pcm {
 	@handler uploadImageHandler
 	post /image/upload () returns ()
 	
+	@handler chunkImageHandler
+	post /image/chunk () returns ()
+	
 	@handler imageListHandler
 	get /image/list () returns (imageListResp)
 	
+	@handler checkHandler
+	get /image/check (checkReq) returns (checkResp)
 }

adaptor/PCM-CORE/api/desc/storage/pcm-storage.api

@@ -119,3 +119,12 @@ type (
         tags []string `json:"tags" copier:"tags"`
     }
 )
+
+type (
+    checkReq {
+        fileMd5 string `json:"fileMd5"`
+    }
+    checkResp {
+        exist bool `json:"exist"`
+    }
+)

adaptor/PCM-CORE/api/internal/handler/core/getresourcepanelconfighandler.go

@@ -0,0 +1,18 @@
+package core
+
+import (
+	"net/http"
+
+	"PCM/common/result"
+
+	"PCM/adaptor/PCM-CORE/api/internal/logic/core"
+	"PCM/adaptor/PCM-CORE/api/internal/svc"
+)
+
+func GetResourcePanelConfigHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		l := core.NewGetResourcePanelConfigLogic(r.Context(), svcCtx)
+		resp, err := l.GetResourcePanelConfig()
+		result.HttpResult(r, w, resp, err)
+	}
+}

adaptor/PCM-CORE/api/internal/handler/core/putresourcepanelconfighandler.go

@@ -0,0 +1,26 @@
+package core
+
+import (
+	"net/http"
+
+	"PCM/common/result"
+
+	"PCM/adaptor/PCM-CORE/api/internal/logic/core"
+	"PCM/adaptor/PCM-CORE/api/internal/svc"
+	"PCM/adaptor/PCM-CORE/api/internal/types"
+	"github.com/zeromicro/go-zero/rest/httpx"
+)
+
+func PutResourcePanelConfigHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.ResourcePanelConfigReq
+		if err := httpx.Parse(r, &req); err != nil {
+			result.ParamErrorResult(r, w, err)
+			return
+		}
+
+		l := core.NewPutResourcePanelConfigLogic(r.Context(), svcCtx)
+		err := l.PutResourcePanelConfig(&req)
+		result.HttpResult(r, w, nil, err)
+	}
+}

adaptor/PCM-CORE/api/internal/handler/image/checkhandler.go

@@ -0,0 +1,28 @@
+package image
+
+import (
+	"net/http"
+
+	"PCM/adaptor/PCM-CORE/api/internal/logic/image"
+	"PCM/adaptor/PCM-CORE/api/internal/svc"
+	"PCM/adaptor/PCM-CORE/api/internal/types"
+	"github.com/zeromicro/go-zero/rest/httpx"
+)
+
+func CheckHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.CheckReq
+		if err := httpx.Parse(r, &req); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := image.NewCheckLogic(r.Context(), svcCtx)
+		resp, err := l.Check(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

adaptor/PCM-CORE/api/internal/handler/image/chunkimagehandler.go

@@ -0,0 +1,104 @@
+package image
+
+import (
+	result2 "PCM/common/result"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"path"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"sync"
+
+	"PCM/adaptor/PCM-CORE/api/internal/logic/image"
+	"PCM/adaptor/PCM-CORE/api/internal/svc"
+)
+
+var dir, _ = os.Getwd()
+var windowsUploadPath = strings.ReplaceAll(path.Join(dir, "uploads"), "/", "\\")
+var linuxUploadPath = path.Join(dir, "uploads")
+
+func ChunkImageHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		size, _ := strconv.ParseInt(r.PostFormValue("size"), 10, 64)
+		hash := r.PostFormValue("hash")
+		name := r.PostFormValue("name")
+		// 对比合并请求的文件大小和已上传文件夹大小
+		toSize, _ := getDirSize(path.Join(linuxUploadTempPath, hash))
+		if size != toSize {
+			fmt.Fprintf(w, "文件上传错误")
+		}
+		chunksPath := path.Join(linuxUploadTempPath, hash)
+		files, _ := ioutil.ReadDir(chunksPath)
+		// 排序
+		filesSort := make(map[string]string)
+		for _, f := range files {
+			nameArr := strings.Split(f.Name(), "-")
+			filesSort[nameArr[1]] = f.Name()
+		}
+		saveFile := path.Join(linuxUploadPath, name)
+		if exists, _ := PathExists(saveFile); exists {
+			os.Remove(saveFile)
+		}
+		fs, _ := os.OpenFile(saveFile, os.O_CREATE|os.O_RDWR|os.O_APPEND, os.ModeAppend|os.ModePerm)
+		var wg sync.WaitGroup
+		filesCount := len(files)
+		if filesCount != len(filesSort) {
+			fmt.Fprintf(w, "文件上传错误2")
+		}
+		wg.Add(filesCount)
+		for i := 0; i < filesCount; i++ {
+			// 这里一定要注意按顺序读取不然文件就会损坏
+			fileName := path.Join(chunksPath, "/"+filesSort[strconv.Itoa(i)])
+			data, err := ioutil.ReadFile(fileName)
+			fmt.Println(err)
+			fs.Write(data)
+
+			wg.Done()
+		}
+		wg.Wait()
+		os.RemoveAll(path.Join(chunksPath, "/"))
+		defer fs.Close()
+
+		//// 加载镜像文件到docker
+		//body, err := svcCtx.DockerClient.ImageLoad(context.Background(), multipartFile, false)
+		//if err != nil {
+		//	httpx.ErrorCtx(r.Context(), w, err)
+		//	return
+		//}
+		//bytes, err := ioutil.ReadAll(body.Body)
+		//loadBody := LoadBody{}
+		//err = json.Unmarshal(bytes, &loadBody)
+		//if err != nil {
+		//	httpx.ErrorCtx(r.Context(), w, err)
+		//	return
+		//}
+		//imageName := strings.TrimSpace(loadBody.Stream[13:])
+		//req.Name = "hub.jcce.dev:18443/repository/docker-hub/jcce/" + imageName
+		//// 给镜像打上私有仓库的tag
+		//err = svcCtx.DockerClient.ImageTag(context.Background(), imageName, req.Name)
+		//if err != nil {
+		//	httpx.ErrorCtx(r.Context(), w, err)
+		//	return
+		//}
+		//l := image.NewUploadImageLogic(r.Context(), svcCtx)
+		//err = l.UploadImage(&req)
+		l := image.NewChunkImageLogic(r.Context(), svcCtx)
+		err := l.ChunkImage()
+		result2.HttpResult(r, w, nil, err)
+	}
+}
+
+// DirSize 获取整体文件夹大小
+func getDirSize(path string) (int64, error) {
+	var size int64
+	err := filepath.Walk(path, func(_ string, info os.FileInfo, err error) error {
+		if !info.IsDir() {
+			size += info.Size()
+		}
+		return err
+	})
+	return size, err
+}

adaptor/PCM-CORE/api/internal/handler/image/uploadimagehandler.go

@@ -1,15 +1,18 @@
 package image
 
 import (
-	"PCM/adaptor/PCM-CORE/api/internal/logic/image"
+	result2 "PCM/common/result"
-	types2 "PCM/adaptor/PCM-CORE/api/internal/types"
+	"bufio"
-	"PCM/common/result"
+	"encoding/json"
-	"context"
+	"fmt"
-	"github.com/zeromicro/go-zero/rest/httpx"
+	"io"
 	"io/ioutil"
-	"k8s.io/apimachinery/pkg/util/json"
+	"log"
 	"net/http"
+	"os"
+	"path"
 	"strings"
+	"syscall"
 
 	"PCM/adaptor/PCM-CORE/api/internal/svc"
 )
@@ -18,38 +21,71 @@ type LoadBody struct {
 	Stream string `json:"stream"`
 }
 
+var windowsUploadTempPath = strings.ReplaceAll(path.Join(windowsUploadPath, "temp"), "/", "\\")
+var linuxUploadTempPath = path.Join(linuxUploadPath)
+
 func UploadImageHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		var req types2.UploadImageReq
+		file, _, err := r.FormFile("file")
-		// 解析yaml文件
+		index := r.PostFormValue("index")
-		multipartFile, _, err := r.FormFile("file")
+		hash := r.PostFormValue("hash")
-		if err != nil {
+		// 获取uploads下所有的文件夹
-			result.HttpResult(r, w, nil, err)
+		nameList, err := ioutil.ReadDir(linuxUploadPath)
+		m := map[string]interface{}{
+			"code": 46900,
+			"msg":  "文件已上传",
+		}
+		result, _ := json.MarshalIndent(m, "", "    ")
+		// 循环判断hash是否在文件里如果有就返回上传已完成
+		for _, name := range nameList {
+			tmpName := strings.Split(name.Name(), "_")[0]
+			if tmpName == hash {
+				fmt.Fprintf(w, string(result))
 				return
 			}
-		// 加载镜像文件到docker
-		body, err := svcCtx.DockerClient.ImageLoad(context.Background(), multipartFile, false)
-		if err != nil {
-			httpx.ErrorCtx(r.Context(), w, err)
-			return
 		}
-		bytes, err := ioutil.ReadAll(body.Body)
+
-		loadBody := LoadBody{}
+		chunksPath := path.Join(linuxUploadTempPath, hash)
-		err = json.Unmarshal(bytes, &loadBody)
+
-		if err != nil {
+		isPathExists, err := PathExists(chunksPath)
-			httpx.ErrorCtx(r.Context(), w, err)
+		if !isPathExists {
-			return
+			err = os.MkdirAll(chunksPath, os.ModePerm)
 		}
-		imageName := strings.TrimSpace(loadBody.Stream[13:])
+		destFile, err := os.OpenFile(path.Join(chunksPath+"/"+hash+"-"+index), syscall.O_CREAT|syscall.O_WRONLY, 0777)
-		req.Name = "hub.jcce.dev:18443/repository/docker-hub/jcce/" + imageName
+		reader := bufio.NewReader(file)
-		// 给镜像打上私有仓库的tag
+		writer := bufio.NewWriter(destFile)
-		err = svcCtx.DockerClient.ImageTag(context.Background(), imageName, req.Name)
+		buf := make([]byte, 1024*1024) // 1M buf
-		if err != nil {
+		for {
-			httpx.ErrorCtx(r.Context(), w, err)
+			n, err := reader.Read(buf)
+			if err == io.EOF {
+				writer.Flush()
+				break
+			} else if err != nil {
 				return
+			} else {
+				writer.Write(buf[:n])
 			}
-		l := image.NewUploadImageLogic(r.Context(), svcCtx)
+		}
-		err = l.UploadImage(&req)
+
-		result.HttpResult(r, w, nil, err)
+		defer file.Close()
+		defer destFile.Close()
+		if err != nil {
+			log.Fatal("%v", err)
+		}
+		fmt.Printf("第%s:%s块上传完成\n", index, destFile.Name())
+
+		result2.HttpResult(r, w, nil, err)
 	}
 }
+
+// PathExists 判断文件夹是否存在
+func PathExists(path string) (bool, error) {
+	_, err := os.Stat(path)
+	if err == nil {
+		return true, nil
+	}
+	if os.IsNotExist(err) {
+		return false, nil
+	}
+	return false, err
+}

adaptor/PCM-CORE/api/internal/handler/routes.go

@@ -67,6 +67,16 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/core/listDomainResource",
 				Handler: core.ListDomainResourceHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodGet,
+				Path:    "/core/getResourcePanelConfigHandler",
+				Handler: core.GetResourcePanelConfigHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPut,
+				Path:    "/core/resourcePanelConfigHandler",
+				Handler: core.PutResourcePanelConfigHandler(serverCtx),
+			},
 		},
 		rest.WithPrefix("/pcm/v1"),
 	)
@@ -266,11 +276,21 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/image/upload",
 				Handler: image.UploadImageHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/image/chunk",
+				Handler: image.ChunkImageHandler(serverCtx),
+			},
 			{
 				Method:  http.MethodGet,
 				Path:    "/image/list",
 				Handler: image.ImageListHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodGet,
+				Path:    "/image/check",
+				Handler: image.CheckHandler(serverCtx),
+			},
 		},
 		rest.WithPrefix("/pcm/v1"),
 	)

adaptor/PCM-CORE/api/internal/logic/core/getresourcepanelconfiglogic.go

@@ -0,0 +1,32 @@
+package core
+
+import (
+	"PCM/adaptor/PCM-CORE/api/internal/svc"
+	"PCM/adaptor/PCM-CORE/api/internal/types"
+	"PCM/adaptor/PCM-CORE/model"
+	"PCM/common/tool"
+	"context"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetResourcePanelConfigLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewGetResourcePanelConfigLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetResourcePanelConfigLogic {
+	return &GetResourcePanelConfigLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *GetResourcePanelConfigLogic) GetResourcePanelConfig() (resp *types.ResourcePanelConfigResp, err error) {
+	rpcModel := model.ResourcePanelConfig{}
+	l.svcCtx.DbEngin.Find(&rpcModel)
+	tool.Convert(rpcModel, &resp)
+	return resp, nil
+}

adaptor/PCM-CORE/api/internal/logic/core/putresourcepanelconfiglogic.go

@@ -0,0 +1,40 @@
+package core
+
+import (
+	"PCM/adaptor/PCM-CORE/api/internal/svc"
+	"PCM/adaptor/PCM-CORE/api/internal/types"
+	"PCM/adaptor/PCM-CORE/model"
+	"PCM/common/tool"
+	"context"
+	"time"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type PutResourcePanelConfigLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewPutResourcePanelConfigLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PutResourcePanelConfigLogic {
+	return &PutResourcePanelConfigLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *PutResourcePanelConfigLogic) PutResourcePanelConfig(req *types.ResourcePanelConfigReq) error {
+	rpcModel := model.ResourcePanelConfig{}
+	tool.Convert(req, &rpcModel)
+	rpcModel.UpdateTime = time.Now()
+
+	update := l.svcCtx.DbEngin.Model(&rpcModel).Updates(rpcModel)
+	err := update.Error
+	if err != nil {
+		logx.WithContext(l.ctx).Errorf("PCM 资源面板数据更新失败 err: %s", err.Error())
+		return err
+	}
+	return nil
+}

adaptor/PCM-CORE/api/internal/logic/hpc/listjoblogic.go

@@ -31,7 +31,6 @@ func (l *ListJobLogic) ListJob(req *types.ListJobReq) (resp *types.ListJobResp,
 
 	var tasks []types.Job
 	// 查询任务数据
-
 	tx := l.svcCtx.DbEngin.Raw("SELECT h.service_name as SlurmVersion,h.name,h.start_time as JobStartTime,h.running_time as JobRunTime,t.status as StateofJob from hpc h join task t on t.id  = h.task_id and t.status != 'Completed'").Scan(&tasks)
 	if tx.Error != nil {
 		logx.Error(err)

adaptor/PCM-CORE/api/internal/logic/image/checklogic.go

@@ -0,0 +1,31 @@
+package image
+
+import (
+	"context"
+	"path"
+
+	"PCM/adaptor/PCM-CORE/api/internal/svc"
+	"PCM/adaptor/PCM-CORE/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CheckLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewCheckLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CheckLogic {
+	return &CheckLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *CheckLogic) Check(req *types.CheckReq) (resp *types.CheckResp, err error) {
+	// todo: add your logic here and delete this line
+	path.Join()
+	return
+}

adaptor/PCM-CORE/api/internal/logic/image/chunkimagelogic.go

@@ -0,0 +1,28 @@
+package image
+
+import (
+	"context"
+
+	"PCM/adaptor/PCM-CORE/api/internal/svc"
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type ChunkImageLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewChunkImageLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ChunkImageLogic {
+	return &ChunkImageLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *ChunkImageLogic) ChunkImage() error {
+	// todo: add your logic here and delete this line
+
+	return nil
+}

adaptor/PCM-CORE/api/internal/types/types.go

@@ -278,6 +278,48 @@ type DomainResource struct {
 	NodeCount    string `json:"nodeCount"`     //节点数量
 }
 
+type ResourcePanelConfigReq struct {
+	Id              int64  `json:"id,optional"`              //id
+	Title           string `json:"title,optional"`           //标题
+	TitleColor      string `json:"titleColor,optional"`      //标题色
+	MainColor       string `json:"mainColor,optional"`       //主色调
+	MainColor2      string `json:"mainColor2,optional"`      //次主色调
+	TextColor       string `json:"textColor,optional"`       //文字颜色
+	BackgroundColor string `json:"backgroundColor,optional"` //背景底色
+	Center          string `json:"center,optional"`          //中心点
+	CenterPosition  string `json:"centerPosition,optional"`  //comment 中心点坐标
+	ProvinceBgColor string `json:"provinceBgColor,optional"` //三级地图底色
+	StatusIng       string `json:"statusIng,optional"`       //接入中图标
+	StatusUn        string `json:"statusUn,optional"`        //未接入图标
+	StatusEnd       string `json:"statusEnd,optional"`       //已接入图标
+	TitleIcon       string `json:"titleIcon,optional"`       //标题底图
+	SubTitleIcon    string `json:"subTitleIcon,optional"`    //小标题底图
+	NumberBg        string `json:"numberBg,optional"`        //数字底图
+	TaskBg          string `json:"taskBg,optional"`          //任务底图
+}
+
+type ResourcePanelConfigResp struct {
+	Id              int64  `json:"id"`              //id
+	Title           string `json:"title"`           //标题,
+	TitleColor      string `json:"titleColor"`      //标题色,
+	MainColor       string `json:"mainColor"`       //主色调,
+	MainColor2      string `json:"mainColor2"`      //次主色调,
+	TextColor       string `json:"textColor"`       //文字颜色,
+	BackgroundColor string `json:"backgroundColor"` //背景底色,
+	Center          string `json:"center"`          //中心点,
+	CenterPosition  string `json:"centerPosition"`  //comment 中心点坐标,
+	ProvinceBgColor string `json:"provinceBgColor"` //三级地图底色,
+	StatusIng       string `json:"statusIng"`       //接入中图标,
+	StatusUn        string `json:"statusUn"`        //未接入图标,
+	StatusEnd       string `json:"statusEnd"`       //已接入图标,
+	TitleIcon       string `json:"titleIcon"`       //标题底图,
+	SubTitleIcon    string `json:"subTitleIcon"`    //小标题底图,
+	NumberBg        string `json:"numberBg"`        //数字底图,
+	TaskBg          string `json:"taskBg"`          //任务底图,
+	CreateTime      string `json:"createTime"`      //创建时间,
+	UpdateTime      string `json:"updateTime"`      //更新时间
+}
+
 type Job struct {
 	SlurmVersion string `json:"slurmVersion"`
 	Name         string `json:"name"`
@@ -1860,3 +1902,11 @@ type ImageTagsResp struct {
 	Name string   `json:"name"`
 	Tags []string `json:"tags" copier:"tags"`
 }
+
+type CheckReq struct {
+	FileMd5 string `json:"fileMd5"`
+}
+
+type CheckResp struct {
+	Exist bool `json:"exist"`
+}

adaptor/PCM-CORE/api/pcm.go

@@ -44,7 +44,7 @@ func main() {
 	serviceGroup := service.NewServiceGroup()
 	defer serviceGroup.Stop()
 
-	server := rest.MustNewServer(c.RestConf)
+	server := rest.MustNewServer(c.RestConf, rest.WithCors())
 
 	ctx := svc.NewServiceContext(c)
 	// start log component

adaptor/PCM-CORE/model/resourcepanelconfigmodel.go

@@ -0,0 +1,27 @@
+package model
+
+import (
+	"github.com/zeromicro/go-zero/core/stores/cache"
+	"github.com/zeromicro/go-zero/core/stores/sqlx"
+)
+
+var _ ResourcePanelConfigModel = (*customResourcePanelConfigModel)(nil)
+
+type (
+	// ResourcePanelConfigModel is an interface to be customized, add more methods here,
+	// and implement the added methods in customResourcePanelConfigModel.
+	ResourcePanelConfigModel interface {
+		resourcePanelConfigModel
+	}
+
+	customResourcePanelConfigModel struct {
+		*defaultResourcePanelConfigModel
+	}
+)
+
+// NewResourcePanelConfigModel returns a model for the database table.
+func NewResourcePanelConfigModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) ResourcePanelConfigModel {
+	return &customResourcePanelConfigModel{
+		defaultResourcePanelConfigModel: newResourcePanelConfigModel(conn, c, opts...),
+	}
+}

adaptor/PCM-CORE/model/resourcepanelconfigmodel_gen.go

@@ -0,0 +1,126 @@
+// Code generated by goctl. DO NOT EDIT.
+
+package model
+
+import (
+	"context"
+	"database/sql"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/zeromicro/go-zero/core/stores/builder"
+	"github.com/zeromicro/go-zero/core/stores/cache"
+	"github.com/zeromicro/go-zero/core/stores/sqlc"
+	"github.com/zeromicro/go-zero/core/stores/sqlx"
+	"github.com/zeromicro/go-zero/core/stringx"
+)
+
+var (
+	resourcePanelConfigFieldNames          = builder.RawFieldNames(&ResourcePanelConfig{})
+	resourcePanelConfigRows                = strings.Join(resourcePanelConfigFieldNames, ",")
+	resourcePanelConfigRowsExpectAutoSet   = strings.Join(stringx.Remove(resourcePanelConfigFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), ",")
+	resourcePanelConfigRowsWithPlaceHolder = strings.Join(stringx.Remove(resourcePanelConfigFieldNames, "`id`", "`create_at`", "`create_time`", "`created_at`", "`update_at`", "`update_time`", "`updated_at`"), "=?,") + "=?"
+
+	cachePcmResourcePanelConfigIdPrefix = "cache:pcm:resourcePanelConfig:id:"
+)
+
+type (
+	resourcePanelConfigModel interface {
+		Insert(ctx context.Context, data *ResourcePanelConfig) (sql.Result, error)
+		FindOne(ctx context.Context, id int64) (*ResourcePanelConfig, error)
+		Update(ctx context.Context, data *ResourcePanelConfig) error
+		Delete(ctx context.Context, id int64) error
+	}
+
+	defaultResourcePanelConfigModel struct {
+		sqlc.CachedConn
+		table string
+	}
+
+	ResourcePanelConfig struct {
+		Id              int64     `db:"id"`
+		Title           string    `db:"title"`             // 标题
+		TitleColor      string    `db:"title_color"`       // 标题色
+		MainColor       string    `db:"main_color"`        // 主色调
+		MainColor2      string    `db:"main_color2"`       // 次主色调
+		TextColor       string    `db:"text_color"`        // 文字颜色
+		BackgroundColor string    `db:"background_color"`  // 背景底色
+		Center          string    `db:"center"`            // 中心点
+		CenterPosition  string    `db:"center_position"`   // 中心点坐标
+		ProvinceBgColor string    `db:"province_bg_color"` // 三级地图底色
+		StatusIng       string    `db:"status_ing"`        // 接入中图标
+		StatusUn        string    `db:"status_un"`         // 未接入图标
+		StatusEnd       string    `db:"status_end"`        // 已接入图标
+		TitleIcon       string    `db:"title_icon"`        // 标题底图
+		SubTitleIcon    string    `db:"sub_title_icon"`    // 小标题底图
+		NumberBg        string    `db:"number_bg"`         // 数字底图
+		TaskBg          string    `db:"task_bg"`           // 任务底图
+		CreateTime      time.Time `db:"create_time"`       // 创建时间
+		UpdateTime      time.Time `db:"update_time"`       // 更新时间
+	}
+)
+
+func newResourcePanelConfigModel(conn sqlx.SqlConn, c cache.CacheConf, opts ...cache.Option) *defaultResourcePanelConfigModel {
+	return &defaultResourcePanelConfigModel{
+		CachedConn: sqlc.NewConn(conn, c, opts...),
+		table:      "`resource_panel_config`",
+	}
+}
+
+func (m *defaultResourcePanelConfigModel) Delete(ctx context.Context, id int64) error {
+	pcmResourcePanelConfigIdKey := fmt.Sprintf("%s%v", cachePcmResourcePanelConfigIdPrefix, id)
+	_, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
+		query := fmt.Sprintf("delete from %s where `id` = ?", m.table)
+		return conn.ExecCtx(ctx, query, id)
+	}, pcmResourcePanelConfigIdKey)
+	return err
+}
+
+func (m *defaultResourcePanelConfigModel) FindOne(ctx context.Context, id int64) (*ResourcePanelConfig, error) {
+	pcmResourcePanelConfigIdKey := fmt.Sprintf("%s%v", cachePcmResourcePanelConfigIdPrefix, id)
+	var resp ResourcePanelConfig
+	err := m.QueryRowCtx(ctx, &resp, pcmResourcePanelConfigIdKey, func(ctx context.Context, conn sqlx.SqlConn, v any) error {
+		query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", resourcePanelConfigRows, m.table)
+		return conn.QueryRowCtx(ctx, v, query, id)
+	})
+	switch err {
+	case nil:
+		return &resp, nil
+	case sqlc.ErrNotFound:
+		return nil, ErrNotFound
+	default:
+		return nil, err
+	}
+}
+
+func (m *defaultResourcePanelConfigModel) Insert(ctx context.Context, data *ResourcePanelConfig) (sql.Result, error) {
+	pcmResourcePanelConfigIdKey := fmt.Sprintf("%s%v", cachePcmResourcePanelConfigIdPrefix, data.Id)
+	ret, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
+		query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, resourcePanelConfigRowsExpectAutoSet)
+		return conn.ExecCtx(ctx, query, data.Title, data.TitleColor, data.MainColor, data.MainColor2, data.TextColor, data.BackgroundColor, data.Center, data.CenterPosition, data.ProvinceBgColor, data.StatusIng, data.StatusUn, data.StatusEnd, data.TitleIcon, data.SubTitleIcon, data.NumberBg, data.TaskBg)
+	}, pcmResourcePanelConfigIdKey)
+	return ret, err
+}
+
+func (m *defaultResourcePanelConfigModel) Update(ctx context.Context, data *ResourcePanelConfig) error {
+	pcmResourcePanelConfigIdKey := fmt.Sprintf("%s%v", cachePcmResourcePanelConfigIdPrefix, data.Id)
+	_, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
+		query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, resourcePanelConfigRowsWithPlaceHolder)
+		return conn.ExecCtx(ctx, query, data.Title, data.TitleColor, data.MainColor, data.MainColor2, data.TextColor, data.BackgroundColor, data.Center, data.CenterPosition, data.ProvinceBgColor, data.StatusIng, data.StatusUn, data.StatusEnd, data.TitleIcon, data.SubTitleIcon, data.NumberBg, data.TaskBg, data.Id)
+	}, pcmResourcePanelConfigIdKey)
+	return err
+}
+
+func (m *defaultResourcePanelConfigModel) formatPrimary(primary any) string {
+	return fmt.Sprintf("%s%v", cachePcmResourcePanelConfigIdPrefix, primary)
+}
+
+func (m *defaultResourcePanelConfigModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary any) error {
+	query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", resourcePanelConfigRows, m.table)
+	return conn.QueryRowCtx(ctx, v, query, primary)
+}
+
+func (m *defaultResourcePanelConfigModel) tableName() string {
+	return m.table
+}

adaptor/PCM-HPC/PCM-TH/rpc/internal/logic/cronlogic.go

@@ -63,7 +63,7 @@ func submitJob(infoList *pcmcoreclient.InfoListResp, submitJobLogic *SubmitJobLo
 			submitReq := hpcTH.SubmitJobReq{
 				Account: "root",
 				Name:    infoList.HpcInfoList[index].Name,
-				Script:  "#! /bin/bash\\n hostname \\n env | grep SLURM",
+				Script:  infoList.HpcInfoList[index].CmdScript,
 				UserId:  123,
 			}
 			jobResult, _ := submitJobLogic.SubmitJob(&submitReq)

deploy/pcm-core-deployment.yaml

@@ -28,8 +28,13 @@ spec:
             procMount: Default
           ports:
             - containerPort: 80
-          volumeMounts: []
+          volumeMounts:
-      volumes: []
+            - mountPath: /home/uploads
+              name: pcm-image-storage
+      volumes:
+        - name: pcm-image-storage
+          persistentVolumeClaim:
+            claimName: pcm-image-storage
       restartPolicy: Always
       terminationGracePeriodSeconds: 30
       dnsPolicy: ClusterFirst

go.mod

@@ -3,6 +3,7 @@ module PCM
 go 1.18
 
 require (
+	github.com/JCCE-nudt/apigw-go-sdk v0.0.0-20230525024753-ad1a4646385b
 	github.com/JCCE-nudt/zero-contrib/zrpc/registry/nacos v0.0.0-20230419021610-13bbc83fbc3c
 	github.com/Masterminds/squirrel v1.5.4
 	github.com/aliyun/alibaba-cloud-sdk-go v1.61.1704

go.sum

@@ -401,6 +401,8 @@ github.com/ClickHouse/clickhouse-go v1.5.4/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHg
 github.com/ClickHouse/clickhouse-go/v2 v2.0.14/go.mod h1:iq2DUGgpA4BBki2CVwrF8x43zqBjdgHtbexkFkh5a6M=
 github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
 github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
+github.com/JCCE-nudt/apigw-go-sdk v0.0.0-20230525024753-ad1a4646385b h1:Xp3e6dXhnq285cUXa1Qd5bcFKoMSeFY7ISp86/uvqWU=
+github.com/JCCE-nudt/apigw-go-sdk v0.0.0-20230525024753-ad1a4646385b/go.mod h1:j+am5/1URgsvyhOAyURFR9vH3malaW7Tq6d33OyPsnM=
 github.com/JCCE-nudt/zero-contrib/zrpc/registry/nacos v0.0.0-20230419021610-13bbc83fbc3c h1:qoPu5FeE6dsvZ7AmH/l3Y5RxrJPNVKvsQSrjQpWUCMQ=
 github.com/JCCE-nudt/zero-contrib/zrpc/registry/nacos v0.0.0-20230419021610-13bbc83fbc3c/go.mod h1:GuCS4be9IH3bSBTvbzz34nszPQDO33PIOv5nviEaFMw=
 github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM=