From b00431ea07cf0cedfb6b26660d3669a92afc91f8 Mon Sep 17 00:00:00 2001 From: linfengjun Date: Tue, 23 Aug 2022 11:26:23 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E8=AE=AD=E7=BB=83=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E7=AE=97=E6=B3=95=E5=88=B0/code=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=EF=BC=8C=E5=85=81=E8=AE=B8=E5=8F=AF=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../internal/service/trainjob/train_job.go | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/server/base-server/internal/service/trainjob/train_job.go b/server/base-server/internal/service/trainjob/train_job.go index a4020da0..ff12774d 100644 --- a/server/base-server/internal/service/trainjob/train_job.go +++ b/server/base-server/internal/service/trainjob/train_job.go @@ -32,6 +32,7 @@ const ( k8sTaskNamePrefix = "task" NoDistributedJobNum = 1 shmResource = "shm" + readonlyCodeDir = "/readonlycode" ) type trainJobService struct { @@ -164,8 +165,11 @@ func (s *trainJobService) TrainJob(ctx context.Context, req *api.TrainJobRequest return &api.TrainJobReply{JobId: trainJobId}, nil } -func (s *trainJobService) buildCmd(config *model.Config) []string { - cmd := fmt.Sprintf("cd %s;%s ", s.conf.Service.DockerCodePath, config.Command) +func (s *trainJobService) buildCmd(job *model.TrainJob, config *model.Config) []string { + cmd := config.Command + if job.AlgorithmId != "" { + cmd = fmt.Sprintf("cp -r %s/* %s;cd %s;%s ", readonlyCodeDir, s.conf.Service.DockerCodePath, s.conf.Service.DockerCodePath, config.Command) + } if len(config.Parameters) == 0 { return []string{"sh", "-c", cmd} } else { @@ -513,7 +517,7 @@ func (s *trainJobService) submitJob(ctx context.Context, job *model.TrainJob, st volumeMounts := []v1.VolumeMount{ { Name: "data", - MountPath: s.conf.Service.DockerCodePath, + MountPath: readonlyCodeDir, SubPath: startJobInfo.algorithmPath, ReadOnly: true, }, @@ -539,6 +543,11 @@ func (s *trainJobService) submitJob(ctx context.Context, job *model.TrainJob, st Name: "localtime", MountPath: "/etc/localtime", }, + { + Name: "code", + MountPath: s.conf.Service.DockerCodePath, + ReadOnly: false, + }, } volumes := []v1.Volume{ @@ -557,6 +566,11 @@ func (s *trainJobService) submitJob(ctx context.Context, job *model.TrainJob, st Path: "/etc/localtime", }}, }, + { + Name: "code", + VolumeSource: v1.VolumeSource{ + EmptyDir: &v1.EmptyDirVolumeSource{}}, + }, } //add shareMemory for each subTask @@ -594,7 +608,7 @@ func (s *trainJobService) submitJob(ctx context.Context, job *model.TrainJob, st Limits: startJobInfo.specs[i.ResourceSpecId].resources, }, VolumeMounts: volumeMounts, - Command: s.buildCmd(i), + Command: s.buildCmd(job, i), }, }, NodeSelector: startJobInfo.specs[i.ResourceSpecId].nodeSelectors, @@ -627,8 +641,7 @@ func (s *trainJobService) submitJob(ctx context.Context, job *model.TrainJob, st //1. privileged //处理空情况 if task.Template.Spec.Containers[0].SecurityContext == nil { - task.Template.Spec.Containers[0].SecurityContext = &v1.SecurityContext{ - } + task.Template.Spec.Containers[0].SecurityContext = &v1.SecurityContext{} } privileged := true task.Template.Spec.Containers[0].SecurityContext.Privileged = &privileged @@ -640,7 +653,7 @@ func (s *trainJobService) submitJob(ctx context.Context, job *model.TrainJob, st Path: "/usr/local/Ascend/driver", }, }, - },v1.Volume{ + }, v1.Volume{ Name: "ascend-driver-info", VolumeSource: v1.VolumeSource{ HostPath: &v1.HostPathVolumeSource{ @@ -655,9 +668,9 @@ func (s *trainJobService) submitJob(ctx context.Context, job *model.TrainJob, st MountPath: "/usr/local/Ascend/driver", }, v1.VolumeMount{ - Name: "ascend-driver-info", + Name: "ascend-driver-info", MountPath: "/etc/ascend_install.info", - }) + }) } } @@ -879,7 +892,7 @@ func (s *trainJobService) checkParamForTemplate(ctx context.Context, template *m return err } //数据集 - if template.DataSetId != "" { //判空，允许通过API调用不传此参数 + if template.DataSetId != "" { //判空，允许通过API调用不传此参数 _, err = s.getDatasetAndCheckPerm(ctx, template.UserId, template.WorkspaceId, template.DataSetId, template.DataSetVersion) if err != nil { return err -- 2.34.1 From d3765b98550e72942c49567801db3de61708b209 Mon Sep 17 00:00:00 2001 From: denglei <2522636547@qq.com> Date: Tue, 6 Sep 2022 17:27:34 +0800 Subject: [PATCH 02/12] release4.2.3 --- server/admin-server/api/v1/user.proto | 3 +++ server/admin-server/configs/config.yaml | 2 +- server/admin-server/internal/service/user.go | 9 ++++++--- server/base-server/api/v1/user.proto | 4 ++++ server/base-server/configs/config.yaml | 4 ++-- .../internal/data/dao/model/user.go | 6 ++++++ server/base-server/internal/data/dao/user.go | 10 ++++------ .../base-server/internal/service/user/user.go | 13 ++++++++----- server/go.mod | 2 +- server/go.sum | 19 +++++++++++++++++++ 10 files changed, 54 insertions(+), 18 deletions(-) diff --git a/server/admin-server/api/v1/user.proto b/server/admin-server/api/v1/user.proto index fd9936f6..7d2bd305 100644 --- a/server/admin-server/api/v1/user.proto +++ b/server/admin-server/api/v1/user.proto @@ -76,6 +76,7 @@ message UserItem { int32 gender = 7; int32 status = 8; repeated string resourcePools = 9; + string desc=10; } message ListUserRequest { @@ -111,6 +112,7 @@ message AddUserRequest { string phone = 3 [(validate.rules).string = {pattern: "^(13|14|15|17|18|19)[0-9]{9}$", ignore_empty:true}]; string password = 4 [(validate.rules).string = {min_len: 8, max_len: 30}]; int32 gender = 5 [(validate.rules).int32 = {in: [1,2]}]; + string desc = 6 ; } message AddUserReply { @@ -125,6 +127,7 @@ message UpdateUserRequest { string phone = 3 [(validate.rules).string = {pattern: "^(13|14|15|17|18|19)[0-9]{9}$", ignore_empty:true}]; int32 gender = 4 [(validate.rules).int32 = {in: [1,2],ignore_empty: true}]; repeated string resourcePools = 5; + string desc = 6 ; } UpdateItem user = 2 [(validate.rules).message.required = true]; } diff --git a/server/admin-server/configs/config.yaml b/server/admin-server/configs/config.yaml index 112d75f5..e2eca6dc 100644 --- a/server/admin-server/configs/config.yaml +++ b/server/admin-server/configs/config.yaml @@ -12,7 +12,7 @@ data: baseServerAddr: dns:///127.0.0.1:9001 baseServerRequestTimeout: 30s redis: - addr: 192.168.202.73:30635 + addr: 192.168.202.73:30207 username: password: abcde service: diff --git a/server/admin-server/internal/service/user.go b/server/admin-server/internal/service/user.go index c0130542..2af0fad3 100644 --- a/server/admin-server/internal/service/user.go +++ b/server/admin-server/internal/service/user.go @@ -2,6 +2,7 @@ package service import ( "context" + "github.com/jinzhu/copier" pb "server/admin-server/api/v1" "server/admin-server/internal/conf" "server/admin-server/internal/data" @@ -10,8 +11,6 @@ import ( "server/common/errors" "server/common/log" "time" - - "github.com/jinzhu/copier" ) type UserService struct { @@ -58,6 +57,7 @@ func (s *UserService) ListUser(ctx context.Context, req *pb.ListUserRequest) (*p Gender: int32(user.Gender), Status: int32(user.Status), ResourcePools: user.ResourcePools, + Desc: user.Desc, } } @@ -102,6 +102,7 @@ func (s *UserService) GetUser(ctx context.Context, req *pb.GetUserRequest) (*pb. Gender: int32(user.Gender), Status: int32(user.Status), ResourcePools: user.ResourcePools, + Desc: user.Desc, }, Workspaces: workspaces, }, nil @@ -114,12 +115,12 @@ func (s *UserService) AddUser(ctx context.Context, req *pb.AddUserRequest) (*pb. Email: req.Email, Phone: req.Phone, Gender: innterapi.GenderType(req.Gender), + Desc: req.Desc, }) if err != nil { return nil, err } - user := addUserReply.User _, err = s.data.BillingClient.CreateBillingOwner(ctx, &innterapi.CreateBillingOwnerRequest{ @@ -151,6 +152,7 @@ func (s *UserService) UpdateUser(ctx context.Context, req *pb.UpdateUserRequest) Phone: req.User.Phone, Gender: innterapi.GenderType(req.User.Gender), ResourcePools: req.User.ResourcePools, + Desc: req.User.Desc, }) if err != nil { @@ -167,6 +169,7 @@ func (s *UserService) UpdateUser(ctx context.Context, req *pb.UpdateUserRequest) Phone: result.User.Phone, Gender: int32(result.User.Gender), Status: int32(result.User.Status), + Desc: result.User.Desc, }, }, nil } diff --git a/server/base-server/api/v1/user.proto b/server/base-server/api/v1/user.proto index 0cc96f95..807de6a5 100644 --- a/server/base-server/api/v1/user.proto +++ b/server/base-server/api/v1/user.proto @@ -49,6 +49,7 @@ message UserItem { repeated Bind bind = 10; string ftpUserName = 11; repeated string resourcePools = 12; + string desc=13; } message Bind { @@ -64,6 +65,7 @@ message AddUserRequest { string password = 4 [(validate.rules).string = {min_len: 8, max_len: 30}]; GenderType gender = 5 [(validate.rules).enum = {in: [1,2]}]; Bind bind = 6; + string desc=7; } message AddUserReply { @@ -99,6 +101,7 @@ message ListUserRequest { string phone = 7 [(validate.rules).string = {pattern: "^(13|14|15|17|18|19)[0-9]{9}$", ignore_empty:true}]; string searchKey = 8 [(validate.rules).string = {max_len: 50}]; UserStatus status = 9 [(validate.rules).enum = {defined_only: true}]; + string desc = 10; } message ListUserReply { @@ -116,6 +119,7 @@ message UpdateUserRequest { UserStatus status = 7 [(validate.rules).enum = {defined_only: true}]; repeated Bind bind = 8; repeated string resourcePools = 9; + string desc=10; } message UpdateUserReply { diff --git a/server/base-server/configs/config.yaml b/server/base-server/configs/config.yaml index 32e6d7f0..173f4c21 100644 --- a/server/base-server/configs/config.yaml +++ b/server/base-server/configs/config.yaml @@ -16,7 +16,7 @@ data: source: root:root@tcp(192.168.202.73:30336)/octopus?charset=utf8&parseTime=True&loc=Local kubernetes: masterUrl: https://192.168.202.73:6443/ - configPath: ./73kubeconfig + configPath: C:\Users\dell\Desktop/73_k8s_config pipeline: baseUrl: http://127.0.0.1:8080 token: KLtmMug9BDvvRjlg @@ -43,7 +43,7 @@ data: username: password: abcde influxdb: - addr: 192.168.202.73:30086 + addr: 192.168.202.73:8086 username: octopus password: octopus database: octopus diff --git a/server/base-server/internal/data/dao/model/user.go b/server/base-server/internal/data/dao/model/user.go index 10096ffe..21e3e112 100644 --- a/server/base-server/internal/data/dao/model/user.go +++ b/server/base-server/internal/data/dao/model/user.go @@ -54,6 +54,7 @@ type User struct { Bind Binds `gorm:"type:json;comment:'第三方账号绑定信息'"` FtpUserName string `gorm:"type:varchar(100);uniqueIndex:ftpUserName;comment:'ftp用户名'"` ResourcePools ResourcePools `gorm:"type:json;comment:'资源池'"` + Desc string `gorm:"type:varchar(100);default:'';index;comment:'备注'"` } func (User) TableName() string { @@ -74,6 +75,7 @@ type UserList struct { SearchKey string Status int32 Bind Binds + Desc string } func (u UserList) Where(db *gorm.DB) *gorm.DB { @@ -155,6 +157,7 @@ type UserQuery struct { Phone string Bind *Bind FtpUserName string + Desc string } type UserAdd struct { @@ -167,6 +170,7 @@ type UserAdd struct { Status int32 Bind *Bind ResourcePools []string + Desc string } type UserUpdate struct { @@ -179,12 +183,14 @@ type UserUpdate struct { Bind Binds FtpUserName string ResourcePools []string + Desc string } type UserUpdateCond struct { Id string Email string Phone string + Desc string } type UserListIn struct { diff --git a/server/base-server/internal/data/dao/user.go b/server/base-server/internal/data/dao/user.go index e68f289a..2b4babd9 100644 --- a/server/base-server/internal/data/dao/user.go +++ b/server/base-server/internal/data/dao/user.go @@ -10,9 +10,8 @@ import ( "gorm.io/gorm/clause" - commerrors "server/common/errors" - "gorm.io/gorm" + commerrors "server/common/errors" ) type UserDao interface { @@ -69,10 +68,7 @@ func (d *userDao) Find(ctx context.Context, condition *model.UserQuery) (*model. var result *gorm.DB if condition.Bind == nil { result = db.Where(&model.User{ - Id: condition.Id, Email: condition.Email, - Phone: condition.Phone, - FtpUserName: condition.FtpUserName, }).First(&user) } else { querySql := "1 = 1" @@ -97,7 +93,6 @@ func (d *userDao) Find(ctx context.Context, condition *model.UserQuery) (*model. } result = db.Where(querySql, params...).First(&user) } - if result.Error != nil { if errors.Is(result.Error, gorm.ErrRecordNotFound) { return nil, nil @@ -123,6 +118,7 @@ func (d *userDao) Add(ctx context.Context, user *model.UserAdd) (*model.User, er Status: user.Status, Bind: bindInfo, ResourcePools: user.ResourcePools, + Desc: user.Desc, } result := db.Omit("ftp_user_name").Create(&u) @@ -142,6 +138,7 @@ func (d *userDao) Update(ctx context.Context, cond *model.UserUpdateCond, user * Id: cond.Id, Email: cond.Email, Phone: cond.Phone, + Desc: cond.Desc, } result := d.db.Model(&condition).Updates(model.User{ @@ -154,6 +151,7 @@ func (d *userDao) Update(ctx context.Context, cond *model.UserUpdateCond, user * Bind: user.Bind, FtpUserName: user.FtpUserName, ResourcePools: user.ResourcePools, + Desc: user.Desc, }) if result.Error != nil { return nil, result.Error diff --git a/server/base-server/internal/service/user/user.go b/server/base-server/internal/service/user/user.go index a6a9a92f..9ead1af2 100644 --- a/server/base-server/internal/service/user/user.go +++ b/server/base-server/internal/service/user/user.go @@ -2,17 +2,15 @@ package user import ( "context" + "golang.org/x/crypto/bcrypt" api "server/base-server/api/v1" "server/base-server/internal/common" "server/base-server/internal/conf" "server/base-server/internal/data" "server/base-server/internal/data/dao/model" "server/common/errors" - "server/common/utils" - "server/common/log" - - "golang.org/x/crypto/bcrypt" + "server/common/utils" ) type UserService struct { @@ -52,6 +50,7 @@ func (s *UserService) ListUser(ctx context.Context, req *api.ListUserRequest) (* SearchKey: req.SearchKey, Phone: req.Phone, Status: int32(req.Status), + Desc: req.Desc, }) if err != nil { return nil, err @@ -91,6 +90,7 @@ func (s *UserService) ListUser(ctx context.Context, req *api.ListUserRequest) (* UpdatedAt: user.UpdatedAt.Unix(), Bind: bindInfo, ResourcePools: user.ResourcePools, + Desc: user.Desc, } users[idx] = item } @@ -156,6 +156,7 @@ func (s *UserService) FindUser(ctx context.Context, req *api.FindUserRequest) (* UpdatedAt: user.UpdatedAt.Unix(), Bind: bindInfo, ResourcePools: user.ResourcePools, + Desc: user.Desc, }, } @@ -238,6 +239,7 @@ func (s *UserService) AddUser(ctx context.Context, req *api.AddUserRequest) (*ap user.Status = int32(api.UserStatus_ACTIVITY) user.Bind = cond.Bind user.ResourcePools = []string{s.conf.Service.Resource.DefaultPoolName} + user.Desc=req.Desc u, err := s.data.UserDao.Add(ctx, &user) if err != nil { return nil, err @@ -295,6 +297,7 @@ func (s *UserService) UpdateUser(ctx context.Context, req *api.UpdateUserRequest Gender: int32(req.Gender), Status: int32(req.Status), ResourcePools: req.ResourcePools, + Desc: req.Desc, } if len(bindInfo) > 0 { user.Bind = bindInfo @@ -307,7 +310,6 @@ func (s *UserService) UpdateUser(ctx context.Context, req *api.UpdateUserRequest } user.Password = string(password) } - result, err := s.data.UserDao.Update(ctx, &model.UserUpdateCond{Id: userId}, &user) if err != nil { return nil, err @@ -333,6 +335,7 @@ func (s *UserService) UpdateUser(ctx context.Context, req *api.UpdateUserRequest Status: api.UserStatus(result.Status), Password: result.Password, Bind: bindInfo2, + Desc: result.Desc, }, }, nil } diff --git a/server/go.mod b/server/go.mod index 7d582290..41a9958c 100644 --- a/server/go.mod +++ b/server/go.mod @@ -20,7 +20,7 @@ require ( github.com/imdario/mergo v0.3.12 github.com/influxdata/influxdb v1.9.4 github.com/jinzhu/copier v0.2.5 - github.com/json-iterator/go v1.1.11 + github.com/json-iterator/go v1.1.11 // indirect github.com/minio/minio-go/v7 v7.0.11 github.com/seldonio/seldon-core/operator v1.11.2 github.com/sony/sonyflake v1.0.0 diff --git a/server/go.sum b/server/go.sum index c1da0e12..a9ec4847 100644 --- a/server/go.sum +++ b/server/go.sum @@ -54,6 +54,7 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.9.0/go.mod h1:m+/etGaqZbylxaNT876QGXqEHp4PR2Rq5GMqICWb9bU= +cloud.google.com/go/storage v1.10.0 h1:STgFzyU5/8miMl0//zKh2aQeTyeaUH3WN9bSUiJ09bA= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= code.gitea.io/sdk/gitea v0.12.0/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY= collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= @@ -163,6 +164,7 @@ github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxB github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM= github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/autorest/mocks v0.4.1 h1:K0laFcLE6VLTOwNgSxaGbUcLPuGXlNkbVvq4cW4nIHk= github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/autorest/to v0.1.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= @@ -332,9 +334,11 @@ github.com/aws/aws-sdk-go v1.34.18/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZve github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.3.2 h1:RQj8l98yKUm0UV2Wd3w/Ms+TXV9Rs1E6Kr5tRRMfyU4= github.com/aws/aws-sdk-go-v2 v1.3.2/go.mod h1:7OaACgj2SX3XGWnrIjGlJM22h6yD6MEWKvm7levnnM8= +github.com/aws/aws-sdk-go-v2/config v1.1.5 h1:imDWOGwlIrRpHLallJ9mli2SIQ4egtGKtFUFsuGRIaQ= github.com/aws/aws-sdk-go-v2/config v1.1.5/go.mod h1:P3F1hku7qzC81txjwXnwOM6Ex6ezkU6+/557Teyb64E= github.com/aws/aws-sdk-go-v2/credentials v1.1.5 h1:R9v/eN5cXv5yMLC619xRYl5PgCSuy5SarizmM7+qqSA= github.com/aws/aws-sdk-go-v2/credentials v1.1.5/go.mod h1:Ir1R6tPiR1/2y1hes8yOijFMz54hzSmgcmCDo6F45Qc= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.6 h1:zoOz5V56jO/rGixsCDnrQtAzYRYM2hGA/43U6jVMFbo= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.6/go.mod h1:0+fWMitrmIpENiY8/1DyhdYPUCAPvd9UNz9mtCsEoLQ= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.1.2 h1:Doa5wabOIDA0XZzBX5yCTAPGwDCVZ8Ux0wh29AUDmN4= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.1.2/go.mod h1:Azf567f5wBUfUbwpyJJnLM/geFFIzEulGR30L+nQZOE= @@ -346,7 +350,9 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2 h1:aU8H58DoYxNo8R1 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.2/go.mod h1:nnutjMLuna0s3GVY/MAkpLX03thyNER06gXvnMAPj5g= github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0 h1:VbwXUI3L0hyhVmrFxbDxrs6cBX8TNFX0YxCpooMNjvY= github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0/go.mod h1:uwA7gs93Qcss43astPUb1eq4RyceNmYWAQjZFDOAMLo= +github.com/aws/aws-sdk-go-v2/service/sso v1.1.5 h1:B7ec5wE4+3Ldkurmq0C4gfQFtElGTG+/iTpi/YPMzi4= github.com/aws/aws-sdk-go-v2/service/sso v1.1.5/go.mod h1:bpGz0tidC4y39sZkQSkpO/J0tzWCMXHbw6FZ0j1GkWM= +github.com/aws/aws-sdk-go-v2/service/sts v1.2.2 h1:fKw6QSGcFlvZCBPYx3fo4sL0HfTmaT06ZtMHJfQQNQQ= github.com/aws/aws-sdk-go-v2/service/sts v1.2.2/go.mod h1:ssRzzJ2RZOVuKj2Vx1YE7ypfil/BIlgmQnCSW4DistU= github.com/aws/smithy-go v1.3.1 h1:xJFO4pK0y9J8fCl34uGsSJX5KNnGbdARDlA5BPhXnwE= github.com/aws/smithy-go v1.3.1/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= @@ -681,6 +687,7 @@ github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/evanphx/json-patch v4.11.0+incompatible h1:glyUF9yIYtMHzn8xaKw5rMhdWcwsYV8dZHIq5567/xs= github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= +github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072 h1:DddqAaWDpywytcG8w/qoQ5sAN8X12d3Z3koB0C3Rxsc= github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.6.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -700,6 +707,7 @@ github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVB github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/frankban/quicktest v1.8.1/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y= github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y= +github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= @@ -949,6 +957,7 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= @@ -990,6 +999,7 @@ github.com/gonum/matrix v0.0.0-20181209220409-c518dec07be9/go.mod h1:0EXg4mc1CNP github.com/gonum/stat v0.0.0-20181125101827-41a0da705a5b/go.mod h1:Z4GIJBJO3Wa4gD4vbwQxXXZ+WHmW6E9ixmNrwvs0iZs= github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/cadvisor v0.35.0/go.mod h1:1nql6U13uTHaLYB8rLS5x9IJc2qT6Xd/Tr1sTX6NE48= github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= @@ -1035,8 +1045,10 @@ github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0/go.mod h1 github.com/google/licenseclassifier v0.0.0-20200708223521-3d09a0ea2f39/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M= github.com/google/mako v0.0.0-20190821191249-122f8dcef9e3/go.mod h1:YzLcVlL+NqWnmUEPuhS1LxDDwGO9WNbVlEXaF4IH35g= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible h1:xmapqc1AyLoB+ddYT6r04bD9lIjlOqGaREovi0SzFaE= github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.1.0 h1:wCKgOCHuUEVfsaQLpPSJb7VdYCdTVZQAuOdYm1yc/60= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -1260,6 +1272,7 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8= @@ -1288,6 +1301,7 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34= github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= @@ -1331,6 +1345,7 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.0.0/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -1649,6 +1664,7 @@ github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41/go.mod h1:3/3N9NVKO0je github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.2.6+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI= github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 h1:49lOXmGaUpV9Fz3gd7TFZY106KVlPVa5jcYD1gaQf98= github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= @@ -2019,6 +2035,7 @@ github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCO github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M= github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= +github.com/yudai/pp v2.0.1+incompatible h1:Q4//iY4pNF6yPLZIigmvcl7k/bPgrcTPIFIcmawg5bI= github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -2596,6 +2613,7 @@ gonum.org/v1/gonum v0.8.2 h1:CCXrcPKiGGotvnN6jfUsKk4rRqm7q09/YbKb5xCEvtM= gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= +gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e h1:jRyg0XfpwWlhEV8mDfdNGBeSJM2fuyh9Yjrnd8kF2Ts= gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= @@ -2960,6 +2978,7 @@ pack.ag/amqp v0.8.0/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4= pack.ag/amqp v0.11.0/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4= pack.ag/amqp v0.11.2/go.mod h1:4/cbmt4EJXSKlG6LCfWHoqmN0uFdy5i/+YFz+fTfhV4= pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= +rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/letsencrypt v0.0.3/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= -- 2.34.1 From 4447fd10115d54fcdcd6809bff09fa05f14d9288 Mon Sep 17 00:00:00 2001 From: denglei <2522636547@qq.com> Date: Tue, 6 Sep 2022 17:41:55 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E7=94=B5=E8=AF=9D=E9=80=89=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-portal/src/api/userManager.js | 2 +- admin-portal/src/styles/index.scss | 1 + .../components/ResourceSpec.vue | 4 +- .../traningManager/components/taskProfile.vue | 2 +- .../userManager/components/addDialog.vue | 35 ++++++++++++---- .../userManager/components/operateDialog.vue | 40 +++++++++++++++---- admin-portal/src/views/userManager/user.vue | 23 ++++++++--- admin-portal/vue.config.js | 6 +-- 8 files changed, 84 insertions(+), 29 deletions(-) diff --git a/admin-portal/src/api/userManager.js b/admin-portal/src/api/userManager.js index e95074bc..b963914f 100644 --- a/admin-portal/src/api/userManager.js +++ b/admin-portal/src/api/userManager.js @@ -28,7 +28,7 @@ export function editUser(data) { return request({ url: `/v1/usermanage/user/${data.id}`, method: 'put', - data: { fullname: data.fullname, password: data.password, resourcePools: data.resourcePools } + data }) } // 冻结账号 diff --git a/admin-portal/src/styles/index.scss b/admin-portal/src/styles/index.scss index e855d921..9ceeea18 100644 --- a/admin-portal/src/styles/index.scss +++ b/admin-portal/src/styles/index.scss @@ -18,6 +18,7 @@ label { } html { + min-width: 1200px; height: 100%; box-sizing: border-box; } diff --git a/admin-portal/src/views/resourceManager/components/ResourceSpec.vue b/admin-portal/src/views/resourceManager/components/ResourceSpec.vue index ce046c67..6dfdea14 100644 --- a/admin-portal/src/views/resourceManager/components/ResourceSpec.vue +++ b/admin-portal/src/views/resourceManager/components/ResourceSpec.vue @@ -38,8 +38,8 @@ - - 价格1~10,仅支持正整数 + + 仅支持正整数
diff --git a/admin-portal/src/views/traningManager/components/taskProfile.vue b/admin-portal/src/views/traningManager/components/taskProfile.vue index 07758eec..788cddae 100644 --- a/admin-portal/src/views/traningManager/components/taskProfile.vue +++ b/admin-portal/src/views/traningManager/components/taskProfile.vue @@ -19,7 +19,7 @@ -
选用数据集:{{ data.dataSetName + ":" + data.dataSetVersion }}
+
选用数据集:{{ (data.dataSetName&&data.dataSetVersion)?data.dataSetName + ":" + data.dataSetVersion:'' }}
是否分布式:{{ data.isDistributed?'是':'否' }}
diff --git a/admin-portal/src/views/userManager/components/addDialog.vue b/admin-portal/src/views/userManager/components/addDialog.vue index fb8d4a8c..c13dffe8 100644 --- a/admin-portal/src/views/userManager/components/addDialog.vue +++ b/admin-portal/src/views/userManager/components/addDialog.vue @@ -12,10 +12,9 @@ - + + + @@ -33,6 +32,9 @@ + + +
取 消 @@ -75,18 +77,31 @@ } callback(new Error("请输入合法的邮箱地址")); } - + var checkPhone = (rule, value, callback) => { + if (value === '') { + callback(); + } else { + let reg = /^(13|14|15|17|18|19)[0-9]{9}$/ + if (reg.test(value)) { + callback(); + } + else { + callback("请输入正确手机号码"); + } + } + }; return { fileList: [], ruleForm: { fullname: '', password: '', confirm: '', - + phone: '', resourcePoolId: '', name: '', userIds: [], - email: undefined + email: undefined, + desc: '' }, CreateFormVisible: true, user: false, @@ -106,6 +121,10 @@ { min: 8, message: '密码长度不得少于8位', trigger: 'blur' } ], + phone: [ + { required: false, message: '请输入电话' }, + { validator: checkPhone, trigger: "blur" } + ], confirm: [ { required: true, message: '请再次输入密码', trigger: 'blur' } @@ -216,7 +235,7 @@ if (valid) { if (this.ruleForm.confirm === this.ruleForm.password) { if (this.user) { - const data = { fullname: this.ruleForm.fullname, password: this.ruleForm.password, email: this.ruleForm.email, gender: 1 } + const data = { fullname: this.ruleForm.fullname, password: this.ruleForm.password, email: this.ruleForm.email, gender: 1, phone: this.ruleForm.phone.toString(),desc:this.ruleForm.desc } createUser(data).then(response => { if (response.success === true) { this.$message({ diff --git a/admin-portal/src/views/userManager/components/operateDialog.vue b/admin-portal/src/views/userManager/components/operateDialog.vue index 1942ac74..4c44cbe7 100644 --- a/admin-portal/src/views/userManager/components/operateDialog.vue +++ b/admin-portal/src/views/userManager/components/operateDialog.vue @@ -1,6 +1,6 @@ + + + + + + - + @@ -73,7 +83,8 @@ @confirm="confirm" @close="close"> - + Date: Wed, 7 Sep 2022 10:12:00 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-portal/src/views/userManager/user.vue | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/admin-portal/src/views/userManager/user.vue b/admin-portal/src/views/userManager/user.vue index 49acf14a..2798c183 100644 --- a/admin-portal/src/views/userManager/user.vue +++ b/admin-portal/src/views/userManager/user.vue @@ -152,7 +152,8 @@ pageSize: 10 }, conKey: [], - conValue: {} + conValue: {}, + time: null } }, created() { @@ -175,12 +176,12 @@ this.searchForm = [] } this.getList(this.searchData) - // this.timer = setInterval(this.getList, 1000); + + }, + beforeDestroy() { + clearTimeout(this.timer); + this.timer = null; }, - // beforeDestroy() { - // clearInterval(this.timer); - // this.timer = null; - // }, methods: { handleUserEdit(row) { this.row = row @@ -309,7 +310,8 @@ this.operateVisible = val this.userConfigVisible = val this.userEdit = val - this.getList(this.searchData) + this.timer = setTimeout(this.getList, 500) + }, close(val) { this.CreateVisible = val @@ -322,6 +324,9 @@ this.CreateVisible = true }, getList(data) { + if (!data) { + data = this.searchData + } if (this.userTabType === 1) { getUserList(data).then(response => { if (response.success) { -- 2.34.1 From 1f6f61558e1a6356bef898d524fa9dcc9564cf6a Mon Sep 17 00:00:00 2001 From: denglei <2522636547@qq.com> Date: Wed, 7 Sep 2022 14:21:07 +0800 Subject: [PATCH 05/12] 9-7 --- server/base-server/internal/data/dao/user.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/base-server/internal/data/dao/user.go b/server/base-server/internal/data/dao/user.go index 2b4babd9..d078e49c 100644 --- a/server/base-server/internal/data/dao/user.go +++ b/server/base-server/internal/data/dao/user.go @@ -68,7 +68,10 @@ func (d *userDao) Find(ctx context.Context, condition *model.UserQuery) (*model. var result *gorm.DB if condition.Bind == nil { result = db.Where(&model.User{ + Id: condition.Id, Email: condition.Email, + Phone: condition.Phone, + FtpUserName: condition.FtpUserName, }).First(&user) } else { querySql := "1 = 1" -- 2.34.1 From 95ec49743e2ea26a077824607ec8761fbe22d9a8 Mon Sep 17 00:00:00 2001 From: denglei <2522636547@qq.com> Date: Wed, 7 Sep 2022 17:24:56 +0800 Subject: [PATCH 06/12] =?UTF-8?q?release4.2.3bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ResourceSpec.vue | 5 +- .../userManager/components/addDialog.vue | 101 ++++++++++-------- .../userManager/components/operateDialog.vue | 69 +++++++----- admin-portal/vue.config.js | 8 +- 4 files changed, 106 insertions(+), 77 deletions(-) diff --git a/admin-portal/src/views/resourceManager/components/ResourceSpec.vue b/admin-portal/src/views/resourceManager/components/ResourceSpec.vue index 6dfdea14..42296d61 100644 --- a/admin-portal/src/views/resourceManager/components/ResourceSpec.vue +++ b/admin-portal/src/views/resourceManager/components/ResourceSpec.vue @@ -38,8 +38,8 @@ - - 仅支持正整数 + + 仅支持正整数
@@ -257,4 +257,5 @@ .line { text-align: center; } + .red{color:#409EFF;margin-left: 10px;font-weight: 800;} \ No newline at end of file diff --git a/admin-portal/src/views/userManager/components/addDialog.vue b/admin-portal/src/views/userManager/components/addDialog.vue index c13dffe8..f028b878 100644 --- a/admin-portal/src/views/userManager/components/addDialog.vue +++ b/admin-portal/src/views/userManager/components/addDialog.vue @@ -90,6 +90,25 @@ } } }; + var validatePass = (rule, value, callback) => { + if (value === '') { + callback(new Error('请输入密码')); + } else { + if (this.ruleForm.confirm !== '') { + this.$refs.ruleForm.validateField('confirm'); + } + callback(); + } + }; + var validatePass2 = (rule, value, callback) => { + if (value === '') { + callback(new Error('请再次输入密码')); + } else if (value !== this.ruleForm.password) { + callback(new Error('两次输入密码不一致!')); + } else { + callback(); + } + }; return { fileList: [], ruleForm: { @@ -118,17 +137,17 @@ ], password: [ { required: true, message: '请输入密码', trigger: 'blur' }, - { min: 8, message: '密码长度不得少于8位', trigger: 'blur' } + { min: 8, message: '密码长度不得少于8位', trigger: 'blur' }, + { validator: validatePass, trigger: 'blur' } ], + confirm: [ + { validator: validatePass2, trigger: 'blur' } + ], phone: [ { required: false, message: '请输入电话' }, { validator: checkPhone, trigger: "blur" } ], - confirm: [ - { required: true, message: '请再次输入密码', trigger: 'blur' } - - ], name: [ { required: true, message: '请输入群组名', trigger: 'blur' } @@ -233,46 +252,40 @@ confirm() { this.$refs['ruleForm'].validate((valid) => { if (valid) { - if (this.ruleForm.confirm === this.ruleForm.password) { - if (this.user) { - const data = { fullname: this.ruleForm.fullname, password: this.ruleForm.password, email: this.ruleForm.email, gender: 1, phone: this.ruleForm.phone.toString(),desc:this.ruleForm.desc } - createUser(data).then(response => { - if (response.success === true) { - this.$message({ - message: '新增用户成功', - type: 'success' - }); - this.$emit('confirm', false) - } else { - this.$message({ - message: this.getErrorMsg(response.error.subcode), - type: 'warning' - }); - } - }) - } else if (this.group) { - const data = { name: this.ruleForm.name, resourcePoolId: this.ruleForm.resourcePoolId, userIds: this.ruleForm.userIds } - createGroup(data).then(response => { - if (response.success === true) { - this.$message({ - message: '新增群组成功', - type: 'success' - }); - this.$emit('confirm', false) - } else { - this.$message({ - message: this.getErrorMsg(response.error.subcode), - type: 'warning' - }); - } - }) - } - } else { - this.$message({ - message: '输入密码不一致!', - type: 'warning' - }); + if (this.user) { + const data = { fullname: this.ruleForm.fullname, password: this.ruleForm.password, email: this.ruleForm.email, gender: 1, phone: this.ruleForm.phone.toString(), desc: this.ruleForm.desc } + createUser(data).then(response => { + if (response.success === true) { + this.$message({ + message: '新增用户成功', + type: 'success' + }); + this.$emit('confirm', false) + } else { + this.$message({ + message: this.getErrorMsg(response.error.subcode), + type: 'warning' + }); + } + }) + } else if (this.group) { + const data = { name: this.ruleForm.name, resourcePoolId: this.ruleForm.resourcePoolId, userIds: this.ruleForm.userIds } + createGroup(data).then(response => { + if (response.success === true) { + this.$message({ + message: '新增群组成功', + type: 'success' + }); + this.$emit('confirm', false) + } else { + this.$message({ + message: this.getErrorMsg(response.error.subcode), + type: 'warning' + }); + } + }) } + } else { console.log('error submit!!'); return false; diff --git a/admin-portal/src/views/userManager/components/operateDialog.vue b/admin-portal/src/views/userManager/components/operateDialog.vue index 4c44cbe7..4a096080 100644 --- a/admin-portal/src/views/userManager/components/operateDialog.vue +++ b/admin-portal/src/views/userManager/components/operateDialog.vue @@ -7,10 +7,10 @@ - + - + @@ -74,6 +74,25 @@ } } }; + var validatePass = (rule, value, callback) => { + if (value === '') { + callback(new Error('请输入密码')); + } else { + if (this.ruleForm.confirm !== '') { + this.$refs.ruleForm.validateField('confirm'); + } + callback(); + } + }; + var validatePass2 = (rule, value, callback) => { + if (value === '') { + callback(new Error('请再次输入密码')); + } else if (value !== this.ruleForm.password) { + callback(new Error('两次输入密码不一致!')); + } else { + callback(); + } + }; return { fileList: [], ruleForm: { @@ -95,12 +114,13 @@ userOptions: [], rules: { password: [ - { required: true, message: '请输入密码', trigger: 'blur' } + { required: true, message: '请输入密码', trigger: 'blur' }, + { min: 8, message: '密码长度不得少于8位', trigger: 'blur' }, + { validator: validatePass, trigger: 'blur' } ], confirm: [ - { required: true, message: '请再次输入密码', trigger: 'blur' } - + { validator: validatePass2, trigger: 'blur' } ], name: [ { required: true, message: '请输入用户名', trigger: 'blur' } @@ -221,27 +241,21 @@ this.$refs['ruleForm'].validate((valid) => { if (valid) { if (this.userType === 'user') { - if (this.ruleForm.confirm === this.ruleForm.password) { - const data = { fullname: this.ruleForm.fullname, password: this.ruleForm.password, id: this.id, phone: this.ruleForm.phone.toString(),desc:this.ruleForm.desc } - editUser(data).then(response => { - if (response.success) { - this.$message({ - message: '修改成功', - type: 'success' - }); - } else { - this.$message({ - message: response.error.message, - type: 'error' - }); - } - }) - } else { - this.$message({ - message: '输入密码不一致!', - type: 'warning' - }); - } + const data = { fullname: this.ruleForm.fullname, password: this.ruleForm.password, id: this.id, phone: this.ruleForm.phone.toString(), desc: this.ruleForm.desc } + editUser(data).then(response => { + if (response.success) { + this.$message({ + message: '修改成功', + type: 'success' + }); + this.$emit('confirm', false) + } else { + this.$message({ + message: response.error.message, + type: 'error' + }); + } + }) } else { const data = { name: this.ruleForm.name, resourcePoolId: this.ruleForm.resourcePoolId, id: this.id, userIds: this.ruleForm.userIds } editGroup(data).then(response => { @@ -250,6 +264,7 @@ message: '修改成功', type: 'success' }); + this.$emit('confirm', false) } else { this.$message({ message: this.getErrorMsg(response.error.subcode), @@ -258,7 +273,7 @@ } }) } - this.$emit('confirm', false) + } else { console.log('error submit!!'); return false; diff --git a/admin-portal/vue.config.js b/admin-portal/vue.config.js index 15deded4..c592c5d6 100644 --- a/admin-portal/vue.config.js +++ b/admin-portal/vue.config.js @@ -38,17 +38,17 @@ module.exports = { }, proxy: { [process.env.VUE_APP_BASE_API]: { - target: 'http://127.0.0.1:8002', + target: 'http://192.168.202.71', changeOrigin: true, pathRewrite: { - ['^' + process.env.VUE_APP_BASE_API]: '/' + ['^' + process.env.VUE_APP_BASE_API]: '/adminserver' } }, [process.env.VUE_APP_BASE_API2]: { - target: 'http://127.0.0.1:8002', + target: 'http://192.168.202.71', changeOrigin: true, pathRewrite: { - ['^' + process.env.VUE_APP_BASE_API]: '' + ['^' + process.env.VUE_APP_BASE_API]: '/adminserver' } } } -- 2.34.1 From b7b7f02b57ab3edf54fb0a0e20b07d29dfeba0b5 Mon Sep 17 00:00:00 2001 From: linfengjun Date: Thu, 8 Sep 2022 10:58:14 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AE=AD=E7=BB=83?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=97=E6=B3=95=E3=80=81=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E4=B8=BA=E7=A9=BA=E6=97=B6=E4=B8=8D=E6=8C=82=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../internal/service/trainjob/train_job.go | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/server/base-server/internal/service/trainjob/train_job.go b/server/base-server/internal/service/trainjob/train_job.go index ff12774d..abe466e4 100644 --- a/server/base-server/internal/service/trainjob/train_job.go +++ b/server/base-server/internal/service/trainjob/train_job.go @@ -515,18 +515,6 @@ func (s *trainJobService) submitJob(ctx context.Context, job *model.TrainJob, st minAvailable += i.TaskNumber //挂载卷 volumeMounts := []v1.VolumeMount{ - { - Name: "data", - MountPath: readonlyCodeDir, - SubPath: startJobInfo.algorithmPath, - ReadOnly: true, - }, - { - Name: "data", - MountPath: s.conf.Service.DockerDatasetPath, - SubPath: startJobInfo.datasetPath, - ReadOnly: true, - }, { Name: "data", MountPath: s.conf.Service.DockerModelPath, @@ -543,11 +531,32 @@ func (s *trainJobService) submitJob(ctx context.Context, job *model.TrainJob, st Name: "localtime", MountPath: "/etc/localtime", }, - { - Name: "code", - MountPath: s.conf.Service.DockerCodePath, - ReadOnly: false, - }, + } + + if startJobInfo.algorithmPath != "" { + volumeMounts = append(volumeMounts, + v1.VolumeMount{ + Name: "data", + MountPath: readonlyCodeDir, + SubPath: startJobInfo.algorithmPath, + ReadOnly: true, + }, + v1.VolumeMount{ + Name: "code", + MountPath: s.conf.Service.DockerCodePath, + ReadOnly: false, + }) + + } + + if startJobInfo.datasetPath != "" { + volumeMounts = append(volumeMounts, + v1.VolumeMount{ + Name: "data", + MountPath: s.conf.Service.DockerDatasetPath, + SubPath: startJobInfo.datasetPath, + ReadOnly: true, + }) } volumes := []v1.Volume{ -- 2.34.1 From dda4fc5126d7972bbfff8cda3243e7a7f5cda082 Mon Sep 17 00:00:00 2001 From: denglei <2522636547@qq.com> Date: Thu, 8 Sep 2022 14:33:53 +0800 Subject: [PATCH 08/12] =?UTF-8?q?4.2.3bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../userManager/components/operateDialog.vue | 29 +++++++++++--- admin-portal/src/views/userManager/user.vue | 13 ++++--- openai-portal/src/styles/index.scss | 1 + openai-portal/src/views/Home/register.vue | 38 ++++++++++++++++--- .../components/detailDialog/taskProfile.vue | 23 +++++------ 5 files changed, 75 insertions(+), 29 deletions(-) diff --git a/admin-portal/src/views/userManager/components/operateDialog.vue b/admin-portal/src/views/userManager/components/operateDialog.vue index 4a096080..63b8a5ce 100644 --- a/admin-portal/src/views/userManager/components/operateDialog.vue +++ b/admin-portal/src/views/userManager/components/operateDialog.vue @@ -6,16 +6,16 @@ - + - + - + - + @@ -58,6 +58,10 @@ flag: { type: String, default: "" + }, + type: { + type: String, + default: 'edite' } }, data() { @@ -139,7 +143,9 @@ }, formLabelWidth: '120px', pageSize: 100, - userCount: 1 + userCount: 1, + edite: false, + password: false } }, @@ -151,6 +157,13 @@ this.ruleForm.phone = this.row.phone this.ruleForm.desc = this.row.desc this.id = this.row.id + if (this.type == 'password') { + this.password = true + this.edite = false + } else { + this.password = false + this.edite = true + } } else { this.group = true this.user = false @@ -241,7 +254,11 @@ this.$refs['ruleForm'].validate((valid) => { if (valid) { if (this.userType === 'user') { - const data = { fullname: this.ruleForm.fullname, password: this.ruleForm.password, id: this.id, phone: this.ruleForm.phone.toString(), desc: this.ruleForm.desc } + let data = {} + if (this.password) { data = { fullname: this.ruleForm.fullname, password: this.ruleForm.password, id: this.id } } + else { + data = { id: this.id, phone: this.ruleForm.phone.toString(), desc: this.ruleForm.desc } + } editUser(data).then(response => { if (response.success) { this.$message({ diff --git a/admin-portal/src/views/userManager/user.vue b/admin-portal/src/views/userManager/user.vue index 2798c183..ab97eb74 100644 --- a/admin-portal/src/views/userManager/user.vue +++ b/admin-portal/src/views/userManager/user.vue @@ -60,11 +60,12 @@ 激活 - 编辑 + 修改密码 + 编辑 编辑 {{ user?'所属群组':'用户列表' }} - 用户配置 + @@ -77,7 +78,7 @@ + @close="close" :type='type'/> @@ -153,7 +154,8 @@ }, conKey: [], conValue: {}, - time: null + time: null, + type:'' } }, created() { @@ -253,9 +255,10 @@ } }) }, - handleReset(row) { + handleReset(row,type) { this.row = row this.operateVisible = true + this.type=type }, handleUserConfig(row) { this.row = row diff --git a/openai-portal/src/styles/index.scss b/openai-portal/src/styles/index.scss index e855d921..f0273a74 100644 --- a/openai-portal/src/styles/index.scss +++ b/openai-portal/src/styles/index.scss @@ -20,6 +20,7 @@ label { html { height: 100%; box-sizing: border-box; + min-width: 1200px; } #app { diff --git a/openai-portal/src/views/Home/register.vue b/openai-portal/src/views/Home/register.vue index e8d2186c..54e3a7e1 100644 --- a/openai-portal/src/views/Home/register.vue +++ b/openai-portal/src/views/Home/register.vue @@ -24,9 +24,11 @@ - - + + + + + @@ -72,6 +74,25 @@ } callback(new Error("请输入合法的邮箱")); }; + var validatePass = (rule, value, callback) => { + if (value === '') { + callback(new Error('请输入密码')); + } else { + if (this.loginForm.checkPass !== '') { + this.$refs.loginForm.validateField('checkPass'); + } + callback(); + } + }; + var validatePass2 = (rule, value, callback) => { + if (value === '') { + callback(new Error('请再次输入密码')); + } else if (value !== this.loginForm.password) { + callback(new Error('两次输入密码不一致!')); + } else { + callback(); + } + }; return { show: false, hidden: true, @@ -86,8 +107,15 @@ username: [{ required: true, message: "请输入邮箱号", trigger: "blur" }, { validator: checkEmail, trigger: "blur" } ], - password: [{ required: true, message: '请输入用户密码', trigger: 'blur' }, - { min: 8, message: '密码长度不能小于8位', trigger: 'blur' }], + password: [ + { validator: validatePass, trigger: 'blur' }, + { required: true, message: '请输入用户密码', trigger: 'blur' }, + + { min: 8, message: '密码长度不能小于8位', trigger: 'blur' } + ], + checkPass: [ + { validator: validatePass2, trigger: 'blur' } + ], fullName: [{ required: true, message: '请输入姓名', trigger: 'blur' }], gender: [ { required: true, message: '请选择性别', trigger: 'change' } diff --git a/openai-portal/src/views/trainingManager/components/detailDialog/taskProfile.vue b/openai-portal/src/views/trainingManager/components/detailDialog/taskProfile.vue index 4e2de2f0..d3c90ec0 100644 --- a/openai-portal/src/views/trainingManager/components/detailDialog/taskProfile.vue +++ b/openai-portal/src/views/trainingManager/components/detailDialog/taskProfile.vue @@ -19,7 +19,8 @@ -
选用数据集:{{ data.dataSetName + ":" + data.dataSetVersion }}
+
选用数据集:{{ (data.dataSetName&&data.dataSetVersion)?data.dataSetName + ":" + + data.dataSetVersion:'' }}
是否分布式:{{ data.isDistributed?'是':'否' }}
@@ -27,7 +28,8 @@ -
资源规格:{{ data.config[0].resourceSpecName + '' + data.config[0].resourceSpecPrice + '机时/h' }} +
资源规格:{{ data.config[0].resourceSpecName + '' + data.config[0].resourceSpecPrice + '机时/h' + }}
@@ -47,14 +49,9 @@
分布式任务列表
- + @@ -74,12 +92,13 @@ } callback(new Error("请输入合法的邮箱")); }; - var validatePass = (rule, value, callback) => { - if (value === '') { + var validatePass = (rule, value, callback) => { + if (value === '') { + console.log('value='+value) callback(new Error('请输入密码')); } else { - if (this.loginForm.checkPass !== '') { - this.$refs.loginForm.validateField('checkPass'); + if (this.loginForm2.checkPass !== '') { + this.$refs.loginForm2.validateField('checkPass'); } callback(); } @@ -87,7 +106,7 @@ var validatePass2 = (rule, value, callback) => { if (value === '') { callback(new Error('请再次输入密码')); - } else if (value !== this.loginForm.password) { + } else if (value !== this.loginForm2.password) { callback(new Error('两次输入密码不一致!')); } else { callback(); @@ -96,21 +115,34 @@ return { show: false, hidden: true, - loginForm: { + loginForm1: { + username: '', + password: '', + bind: { platform: '', userId: '', userName: '' } + }, + loginForm2: { fullName: '', - username: undefined, - password: undefined, - gender: undefined, + username: '', + password: '', + gender: '', + checkPass: '', bind: { platform: '', userId: '', userName: '' } }, - rules: { + rules1: { + username: [{ required: true, message: "请输入邮箱号", trigger: "blur" }, + { validator: checkEmail, trigger: "blur" } + ], + password: [ + { validator: validatePass, trigger: 'blur' }, + { min: 8, message: '密码长度不能小于8位', trigger: 'blur' } + ], + }, + rules2: { username: [{ required: true, message: "请输入邮箱号", trigger: "blur" }, { validator: checkEmail, trigger: "blur" } ], password: [ { validator: validatePass, trigger: 'blur' }, - { required: true, message: '请输入用户密码', trigger: 'blur' }, - { min: 8, message: '密码长度不能小于8位', trigger: 'blur' } ], checkPass: [ @@ -125,9 +157,12 @@ }, created() { this.getThirdInfo() - this.loginForm.bind.platform = sessionStorage.getItem("platform") - this.loginForm.bind.userName = sessionStorage.getItem("thirdUserName") - this.loginForm.bind.userId = sessionStorage.getItem("thirdUserId") + this.loginForm1.bind.platform = sessionStorage.getItem("platform") + this.loginForm1.bind.userName = sessionStorage.getItem("thirdUserName") + this.loginForm1.bind.userId = sessionStorage.getItem("thirdUserId") + this.loginForm2.bind.platform = sessionStorage.getItem("platform") + this.loginForm2.bind.userName = sessionStorage.getItem("thirdUserName") + this.loginForm2.bind.userId = sessionStorage.getItem("thirdUserId") }, computed: { }, @@ -151,11 +186,41 @@ this.show = false this.hidden = true }, + // 登录并绑定 + login() { + // 在点击提交之前校验表单 + let loginForm = JSON.parse(JSON.stringify(this.loginForm1)); + delete loginForm.fullName + delete loginForm.gender + this.$refs['loginForm1'].validate((valid) => { + if (valid) { + login(loginForm).then((res) => { + if (res.success) { + this.$message({ + message: '登录成功', + type: 'success' + }); + setToken(res.data.token) + this.$router.push({ path: '/index' }) + } else { + this.$message({ + message: this.getErrorMsg(res.error.subcode), + type: 'warning' + }); + } + }).catch(() => { + }) + } else { + return false; + } + }); + + }, // 注册并绑定 register() { - this.$refs['loginForm'].validate((valid) => { + this.$refs['loginForm2'].validate((valid) => { if (valid) { - register(this.loginForm).then( + register(this.loginForm2).then( response => { if (response.success) { this.$message({ @@ -187,35 +252,7 @@ } }); }, - // 登录并绑定 - login() { - let loginForm = JSON.parse(JSON.stringify(this.loginForm)); - delete loginForm.fullName - delete loginForm.gender - this.$refs['loginForm'].validate((valid) => { - if (valid) { - login(loginForm).then((res) => { - if (res.success) { - this.$message({ - message: '登录成功', - type: 'success' - }); - setToken(res.data.token) - this.$router.push({ path: '/index' }) - } else { - this.$message({ - message: this.getErrorMsg(res.error.subcode), - type: 'warning' - }); - } - }).catch(() => { - }) - } else { - return false; - } - }); - }, } } -- 2.34.1 From 406e661fc635ac3149594e2877f50e8b841954ad Mon Sep 17 00:00:00 2001 From: denglei <2522636547@qq.com> Date: Fri, 9 Sep 2022 10:22:35 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E5=A4=87=E6=B3=A8=E9=99=90=E5=88=B6?= =?UTF-8?q?=E5=AD=97=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-portal/src/views/userManager/components/addDialog.vue | 2 +- admin-portal/src/views/userManager/components/operateDialog.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin-portal/src/views/userManager/components/addDialog.vue b/admin-portal/src/views/userManager/components/addDialog.vue index f028b878..06f0bcd8 100644 --- a/admin-portal/src/views/userManager/components/addDialog.vue +++ b/admin-portal/src/views/userManager/components/addDialog.vue @@ -33,7 +33,7 @@ - +
diff --git a/admin-portal/src/views/userManager/components/operateDialog.vue b/admin-portal/src/views/userManager/components/operateDialog.vue index 3ca820ae..72ff8a9e 100644 --- a/admin-portal/src/views/userManager/components/operateDialog.vue +++ b/admin-portal/src/views/userManager/components/operateDialog.vue @@ -16,7 +16,7 @@ - + -- 2.34.1 From 1bf0ccc646e7caa4488e6897a70e990f42e24cbc Mon Sep 17 00:00:00 2001 From: linfengjun Date: Fri, 16 Sep 2022 16:15:58 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../internal/service/trainjob/train_job.go | 53 +++++++++++++------ 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/server/base-server/internal/service/trainjob/train_job.go b/server/base-server/internal/service/trainjob/train_job.go index ac8695a5..65b1e5a9 100644 --- a/server/base-server/internal/service/trainjob/train_job.go +++ b/server/base-server/internal/service/trainjob/train_job.go @@ -37,6 +37,7 @@ const ( k8sTaskNamePrefix = "task" NoDistributedJobNum = 1 shmResource = "shm" + readonlyCodeDir = "/readonlycode" ) type trainJobService struct { @@ -137,8 +138,11 @@ func (s *trainJobService) TrainJob(ctx context.Context, req *api.TrainJobRequest return &api.TrainJobReply{JobId: trainJobId}, nil } -func (s *trainJobService) buildCmd(config *model.Config) []string { - cmd := fmt.Sprintf("cd %s;%s ", s.conf.Service.DockerCodePath, config.Command) +func (s *trainJobService) buildCmd(job *model.TrainJob, config *model.Config) []string { + cmd := config.Command + if job.AlgorithmId != "" { + cmd = fmt.Sprintf("cp -r %s/* %s;cd %s;%s ", readonlyCodeDir, s.conf.Service.DockerCodePath, s.conf.Service.DockerCodePath, config.Command) + } if len(config.Parameters) == 0 { return []string{"sh", "-c", cmd} } else { @@ -474,18 +478,6 @@ func (s *trainJobService) submitJob(ctx context.Context, job *model.TrainJob, st minAvailable += i.TaskNumber //挂载卷 volumeMounts := []v1.VolumeMount{ - { - Name: "data", - MountPath: s.conf.Service.DockerCodePath, - SubPath: startJobInfo.algorithmPath, - ReadOnly: true, - }, - { - Name: "data", - MountPath: s.conf.Service.DockerDatasetPath, - SubPath: startJobInfo.datasetPath, - ReadOnly: true, - }, { Name: "data", MountPath: s.conf.Service.DockerModelPath, @@ -504,6 +496,32 @@ func (s *trainJobService) submitJob(ctx context.Context, job *model.TrainJob, st }, } + if startJobInfo.algorithmPath != "" { + volumeMounts = append(volumeMounts, + v1.VolumeMount{ + Name: "data", + MountPath: readonlyCodeDir, + SubPath: startJobInfo.algorithmPath, + ReadOnly: true, + }, + v1.VolumeMount{ + Name: "code", + MountPath: s.conf.Service.DockerCodePath, + ReadOnly: false, + }) + + } + + if startJobInfo.datasetPath != "" { + volumeMounts = append(volumeMounts, + v1.VolumeMount{ + Name: "data", + MountPath: s.conf.Service.DockerDatasetPath, + SubPath: startJobInfo.datasetPath, + ReadOnly: true, + }) + } + volumes := []v1.Volume{ { Name: "data", @@ -520,6 +538,11 @@ func (s *trainJobService) submitJob(ctx context.Context, job *model.TrainJob, st Path: "/etc/localtime", }}, }, + { + Name: "code", + VolumeSource: v1.VolumeSource{ + EmptyDir: &v1.EmptyDirVolumeSource{}}, + }, } //add shareMemory for each subTask @@ -562,7 +585,7 @@ func (s *trainJobService) submitJob(ctx context.Context, job *model.TrainJob, st Limits: startJobInfo.specs[i.ResourceSpecId].resources, }, VolumeMounts: volumeMounts, - Command: s.buildCmd(i), + Command: s.buildCmd(job, i), }, }, NodeSelector: startJobInfo.specs[i.ResourceSpecId].nodeSelectors, -- 2.34.1 From 34203df1f4e6c1927af0f715c97933ce8d7eefac Mon Sep 17 00:00:00 2001 From: denglei <2522636547@qq.com> Date: Fri, 16 Sep 2022 16:30:26 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E5=99=A8=E6=BB=9A=E5=8A=A8=E6=9D=A1=E5=85=BC=E5=AE=B9=E6=80=A7?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openai-portal/src/directives.js | 3 --- openai-portal/vue.config.js | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/openai-portal/src/directives.js b/openai-portal/src/directives.js index bdde9811..d89b41df 100644 --- a/openai-portal/src/directives.js +++ b/openai-portal/src/directives.js @@ -5,10 +5,7 @@ export default MyDirective.install = function(vue, options) { bind(el, binding) { const selectDom = el.querySelector('.el-select-dropdown .el-select-dropdown__wrap') selectDom.addEventListener('scroll', function() { - const isEnd = this.scrollHeight - this.scrollTop <= this.clientHeight - if (isEnd) { binding.value() - } }) } }) diff --git a/openai-portal/vue.config.js b/openai-portal/vue.config.js index 3bbc2332..444bc2a4 100644 --- a/openai-portal/vue.config.js +++ b/openai-portal/vue.config.js @@ -42,14 +42,14 @@ module.exports = { }, proxy: { [process.env.VUE_APP_BASE_API]: { - target: 'http://192.168.204.155/', + target: 'http://192.168.202.71/', changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: '/openaiserver' } }, [process.env.VUE_APP_BASE_API2]: { - target: 'http://192.168.204.155/', + target: 'http://192.168.202.71/', changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: '' -- 2.34.1