From 967b6edcfac59ceb6cad369fe0263aec20026178 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E5=88=98=E6=B4=AA=E9=9D=92?= <hongqing.liu@supwisdom.com>
Date: Tue, 19 Jan 2021 23:50:23 +0800
Subject: [PATCH] =?utf8?q?chore:=20user-data-service=20=E7=94=A8=E6=88=B7?=
 =?utf8?q?=E6=9C=8D=E5=8A=A1=EF=BC=8C=E6=9B=B4=E6=96=B0=E9=95=9C=E5=83=8F?=
 =?utf8?q?=E7=89=88=E6=9C=AC=201.2.0-SNAPSHOT?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../4.0.user-data-service-installer.yaml            |  2 +-
 .../4.1.user-data-service-poa.yaml                  |  2 +-
 .../4.2.user-data-service-goa.yaml                  | 13 ++++++++-----
 .../4.3.user-data-service-biz.yaml                  |  2 +-
 .../5.user-data-service-datax-job.yaml              |  2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml
index 0fdb18e..265b15e 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml
@@ -28,7 +28,7 @@ spec:
       containers:
       - name: user-data-service-installer
         # 若使用了学校搭设的私有仓库，请修改
-        image: harbor.supwisdom.com/goa/installer:1.1.11-RELEASE
+        image: harbor.supwisdom.com/goa/installer:1.2.0-SNAPSHOT
         imagePullPolicy: Always
         envFrom:
         - configMapRef:
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.1.user-data-service-poa.yaml b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.1.user-data-service-poa.yaml
index 5b2e1e5..280d520 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.1.user-data-service-poa.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.1.user-data-service-poa.yaml
@@ -89,7 +89,7 @@ spec:
       containers:
       - name: user-data-service-poa
         # 若使用了学校搭设的私有仓库，请修改
-        image: harbor.supwisdom.com/goa/poa-api:1.1.11-RELEASE
+        image: harbor.supwisdom.com/goa/poa-api:1.2.0-SNAPSHOT
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml
index 9518025..974686e 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml
@@ -50,17 +50,20 @@ data:
   # 是否同步帐号到 openldap（已弃用）
   # JOBS_RABBITMQ_ACCOUNTUSERSVC2OPENLDAPRABBITSENDER_ENABLED: "false"
 
-  # 是否同步帐号数据至 jobs 的 MQ，由 jobs 再进行分发（如分发到 openldap）
+  # 是否同步 帐号 数据至 jobs 的 MQ，由 jobs 再进行分发（如分发到 openldap）
   JOBS_RABBITMQ_ACCOUNTUSERSVC2JOBSRABBITSENDER_ENABLED: "false"
-  # 是否同步密码（明文密码）到 jobs 的 MQ，由 jobs 再进行分发（如分发到 城市热点）
+  # 是否同步 密码（明文密码）到 jobs 的 MQ，由 jobs 再进行分发（如分发到 城市热点）
   JOBS_RABBITMQ_ACCOUNTUSERSVC2JOBSSYNCPASSWORDRABBITSENDER_ENABLED: "false"
 
-  # 是否同步组织机构数据至 jobs 的 MQ，由 jobs 再进行分发（如分发到 openldap）
+  # 是否同步 组织机构 数据至 jobs 的 MQ，由 jobs 再进行分发（如分发到 openldap）
   JOBS_RABBITMQ_ORGANIZATIONUSERSVC2JOBSRABBITSENDER_ENABLED: "false"
 
-  # 是否同步用户组数据至 jobs 的 MQ，由 jobs 再进行分发（如分发到 openldap）
+  # 是否同步 用户组 数据至 jobs 的 MQ，由 jobs 再进行分发（如分发到 openldap）
   JOBS_RABBITMQ_GROUPUSERSVC2JOBSRABBITSENDER_ENABLED: "false"
 
+  # 是否同步 帐号用户组 数据至 jobs 的 MQ，由 jobs 再进行分发（如分发到 openldap）
+  JOBS_RABBITMQ_ACCOUNTGROUPUSERSVC2JOBSRABBITSENDER_ENABLED: "false"
+
 
 ---
 apiVersion: v1
@@ -103,7 +106,7 @@ spec:
       containers:
       - name: user-data-service-goa
         # 若使用了学校搭设的私有仓库，请修改
-        image: harbor.supwisdom.com/goa/goa-api:1.1.11-RELEASE
+        image: harbor.supwisdom.com/goa/goa-api:1.2.0-SNAPSHOT
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.3.user-data-service-biz.yaml b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.3.user-data-service-biz.yaml
index 8b8b699..5281772 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.3.user-data-service-biz.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.3.user-data-service-biz.yaml
@@ -85,7 +85,7 @@ spec:
       containers:
       - name: user-data-service-biz
         # 若使用了学校搭设的私有仓库，请修改
-        image: harbor.supwisdom.com/goa/biz-api:1.1.11-RELEASE
+        image: harbor.supwisdom.com/goa/biz-api:1.2.0-SNAPSHOT
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/5.user-data-service-datax-job.yaml b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/5.user-data-service-datax-job.yaml
index 564b5af..3a749a4 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/5.user-data-service-datax-job.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/5.user-data-service-datax-job.yaml
@@ -41,7 +41,7 @@ spec:
           containers:
           - name: user-data-service-datax-job
             # 若使用了学校搭设的私有仓库，请修改
-            image: harbor.supwisdom.com/goa/datax-job:1.1.11-RELEASE
+            image: harbor.supwisdom.com/goa/datax-job:1.2.0-SNAPSHOT
             imagePullPolicy: Always
             envFrom:
             - configMapRef:
-- 
2.17.1