diff --git a/deploy_k8s/admin_cms/deployment.yaml b/deploy_k8s/admin_cms/deployment.yaml index 88e260740..518655965 100644 --- a/deploy_k8s/admin_cms/deployment.yaml +++ b/deploy_k8s/admin_cms/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: admin-cms image: openim/admin_cms:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10200 volumeMounts: diff --git a/deploy_k8s/api/deployment.yaml b/deploy_k8s/api/deployment.yaml index a699d3a10..5c5bfb72f 100644 --- a/deploy_k8s/api/deployment.yaml +++ b/deploy_k8s/api/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: api image: openim/api:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10002 volumeMounts: diff --git a/deploy_k8s/auth/deployment.yaml b/deploy_k8s/auth/deployment.yaml index 4367f6d1f..ef1aef5ab 100644 --- a/deploy_k8s/auth/deployment.yaml +++ b/deploy_k8s/auth/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: auth image: openim/auth:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10160 volumeMounts: diff --git a/deploy_k8s/cache/deployment.yaml b/deploy_k8s/cache/deployment.yaml index f92ceece0..fd29244f0 100644 --- a/deploy_k8s/cache/deployment.yaml +++ b/deploy_k8s/cache/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: cache image: openim/cache:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10240 volumeMounts: diff --git a/deploy_k8s/cms_api/deployment.yaml b/deploy_k8s/cms_api/deployment.yaml index d584cfb5f..1218316e9 100644 --- a/deploy_k8s/cms_api/deployment.yaml +++ b/deploy_k8s/cms_api/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: cms-api image: openim/cms_api:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10006 volumeMounts: diff --git a/deploy_k8s/conversation/deployment.yaml b/deploy_k8s/conversation/deployment.yaml index fa897e104..b982faf98 100644 --- a/deploy_k8s/conversation/deployment.yaml +++ b/deploy_k8s/conversation/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: conversation image: openim/conversation:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10230 volumeMounts: diff --git a/deploy_k8s/demo/deployment.yaml b/deploy_k8s/demo/deployment.yaml index 6eab5fa7b..d12f902b9 100644 --- a/deploy_k8s/demo/deployment.yaml +++ b/deploy_k8s/demo/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: demo image: openim/demo:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10004 volumeMounts: diff --git a/deploy_k8s/friend/deployment.yaml b/deploy_k8s/friend/deployment.yaml index ee3a025ac..171849e7e 100644 --- a/deploy_k8s/friend/deployment.yaml +++ b/deploy_k8s/friend/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: friend image: openim/friend:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10120 volumeMounts: diff --git a/deploy_k8s/group/deployment.yaml b/deploy_k8s/group/deployment.yaml index 9f9e75ee7..3938cec84 100644 --- a/deploy_k8s/group/deployment.yaml +++ b/deploy_k8s/group/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: group image: openim/group:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10150 volumeMounts: diff --git a/deploy_k8s/message_cms/deployment.yaml b/deploy_k8s/message_cms/deployment.yaml index 0e3a33894..c321ac382 100644 --- a/deploy_k8s/message_cms/deployment.yaml +++ b/deploy_k8s/message_cms/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: message-cms image: openim/message_cms:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10190 volumeMounts: diff --git a/deploy_k8s/msg/deployment.yaml b/deploy_k8s/msg/deployment.yaml index a4959004d..25912cc60 100644 --- a/deploy_k8s/msg/deployment.yaml +++ b/deploy_k8s/msg/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: msg image: openim/msg:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10130 volumeMounts: diff --git a/deploy_k8s/msg_gateway/deployment.yaml b/deploy_k8s/msg_gateway/deployment.yaml index ff3b3c1b1..06570d76e 100644 --- a/deploy_k8s/msg_gateway/deployment.yaml +++ b/deploy_k8s/msg_gateway/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: msg-gateway image: openim/msg_gateway:v2.0.10k + imagePullPolicy: Always ports: - name: rpc-port containerPort: 10140 diff --git a/deploy_k8s/msg_transfer/deployment.yaml b/deploy_k8s/msg_transfer/deployment.yaml index fc2537ef2..98410331e 100644 --- a/deploy_k8s/msg_transfer/deployment.yaml +++ b/deploy_k8s/msg_transfer/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: msg-transfer image: openim/msg_transfer:v2.0.10k + imagePullPolicy: Always volumeMounts: - name: config mountPath: /Open-IM-Server/config diff --git a/deploy_k8s/office/deployment.yaml b/deploy_k8s/office/deployment.yaml index b9e20fa84..4a035db57 100644 --- a/deploy_k8s/office/deployment.yaml +++ b/deploy_k8s/office/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: office image: openim/office:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10210 volumeMounts: diff --git a/deploy_k8s/organization/deployment.yaml b/deploy_k8s/organization/deployment.yaml index 29da1b05f..ec727ff53 100644 --- a/deploy_k8s/organization/deployment.yaml +++ b/deploy_k8s/organization/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: organization image: openim/organization:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10220 volumeMounts: diff --git a/deploy_k8s/push/deployment.yaml b/deploy_k8s/push/deployment.yaml index 8cb712598..2b463f838 100644 --- a/deploy_k8s/push/deployment.yaml +++ b/deploy_k8s/push/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: push image: openim/push:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10170 volumeMounts: diff --git a/deploy_k8s/sdk_server/deployment.yaml b/deploy_k8s/sdk_server/deployment.yaml index 73a28ad2b..50127015d 100644 --- a/deploy_k8s/sdk_server/deployment.yaml +++ b/deploy_k8s/sdk_server/deployment.yaml @@ -16,6 +16,7 @@ spec: containers: - name: sdk-server image: openim/sdk_server:v2.0.10k + imagePullPolicy: Always ports: - containerPort: 10003 volumeMounts: diff --git a/internal/demo/register/onboarding_process.go b/internal/demo/register/onboarding_process.go index 28d4d9140..8c43bc221 100644 --- a/internal/demo/register/onboarding_process.go +++ b/internal/demo/register/onboarding_process.go @@ -161,6 +161,7 @@ func onboardingProcessNotification(operationID, userID, groupID string) { }() var tips commonPb.TipsComm tips.DefaultTips = config.Config.Notification.JoinDepartmentNotification.DefaultTips.Tips + tips.JsonDetail = "" content, err := proto.Marshal(&tips) if err != nil { log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), "proto marshal failed") diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index e952c6894..02523c35e 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -154,7 +154,6 @@ func (s *organizationServer) UpdateDepartment(ctx context.Context, req *rpc.Upda department := db.Department{} utils.CopyStructFields(&department, req.DepartmentInfo) - log.Debug(req.OperationID, "dst ", department, "src ", req.DepartmentInfo) if err := imdb.UpdateDepartment(&department, nil); err != nil { errMsg := req.OperationID + " " + "UpdateDepartment failed " + err.Error() @@ -343,6 +342,7 @@ func (s *organizationServer) GetDepartmentParentIDList(_ context.Context, req *r resp = &rpc.GetDepartmentParentIDListResp{} resp.ParentIDList, err = imdb.GetDepartmentParentIDList(req.DepartmentID) if err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetDepartmentParentIDList failed", err.Error()) resp.ErrMsg = constant.ErrDB.ErrMsg + ": " + err.Error() resp.ErrCode = constant.ErrDB.ErrCode return resp, nil diff --git a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go index 525ebf59d..17a6c938f 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go @@ -249,10 +249,11 @@ func GetDepartmentRelatedGroupIDList(departmentIDList []string) ([]string, error func getDepartmentParent(departmentID string, dbConn *gorm.DB) (*db.Department, error) { var department db.Department - var parentID string + //var parentID string dbConn.LogMode(true) // select * from departments where department_id = (select parent_id from departments where department_id= zx234fd); - err := dbConn.Table("departments").Where("department_id=?", dbConn.Table("departments").Where("department_id=?", departmentID).Pluck("parent_id", parentID)).Find(&department).Error + //dbConn.Table("departments").Where("department_id=?", departmentID).Pluck("parent_id", parentID).Error + err := dbConn.Table("departments").Where("department_id=?").Find(&department).Error return &department, err }