From: 刘洪青 <loie.engine@gmail.com>
Date: Thu, 29 Oct 2020 08:33:41 +0000 (+0800)
Subject: chore: 调整新开普test环境，部署配置
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=ee1dd2ae02570638466f7b1b0db23e482eb25313;p=institute%2Fdeploy-authx-service.git

chore: 调整新开普test环境，部署配置
---

diff --git a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/1.user-data-service-env.yaml b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/1.user-data-service-env.yaml
index 00ccef7..cc51e5f 100644
--- a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/1.user-data-service-env.yaml
+++ b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/1.user-data-service-env.yaml
@@ -17,10 +17,10 @@ metadata:
   name: datasource-env-secret
 type: Opaque
 data:
-  # jdbc:mysql://mysql-server.authx-service-test.svc.cluster.local:3306/user?serverTimezone=Asia/Shanghai
-  JDBC_URL: amRiYzpteXNxbDovL215c3FsLXNlcnZlci5hdXRoeC1zZXJ2aWNlLXRlc3Quc3ZjLmNsdXN0ZXIubG9jYWw6MzMwNi91c2VyP3NlcnZlclRpbWV6b25lPUFzaWEvU2hhbmdoYWk=
-  # user
-  JDBC_USERNAME: dXNlcg==
+  # jdbc:mysql://mysql-server.authx-service-test.svc.cluster.local:3306/user_test?serverTimezone=Asia/Shanghai
+  JDBC_URL: amRiYzpteXNxbDovL215c3FsLXNlcnZlci5hdXRoeC1zZXJ2aWNlLXRlc3Quc3ZjLmNsdXN0ZXIubG9jYWw6MzMwNi91c2VyX3Rlc3Q/c2VydmVyVGltZXpvbmU9QXNpYS9TaGFuZ2hhaQ==
+  # user_test
+  JDBC_USERNAME: dXNlcl90ZXN0
   # 修改为实际的数据库密码，并使用 base64 工具进行编码
   # Nwpu@Supwisdom123
   JDBC_PASSWORD: TndwdUBTdXB3aXNkb20xMjM=
diff --git a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml
index 4433238..b1c035a 100644
--- a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml
+++ b/project/newcapec-test/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.0.0-SNAPSHOT
+        image: harbor.supwisdom.com/goa/installer:1.0
         imagePullPolicy: Always
         envFrom:
         - configMapRef:
diff --git a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.1.user-data-service-poa.yaml b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.1.user-data-service-poa.yaml
index bad098a..7a2ec54 100644
--- a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.1.user-data-service-poa.yaml
+++ b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.1.user-data-service-poa.yaml
@@ -85,7 +85,7 @@ spec:
       containers:
       - name: user-data-service-poa
         # 若使用了学校搭设的私有仓库，请修改
-        image: harbor.supwisdom.com/goa/poa-api:1.0.0-SNAPSHOT
+        image: harbor.supwisdom.com/goa/poa-api:1.0
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
diff --git a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml
index 121f248..b444903 100644
--- a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml
+++ b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml
@@ -101,7 +101,7 @@ spec:
       containers:
       - name: user-data-service-goa
         # 若使用了学校搭设的私有仓库，请修改
-        image: harbor.supwisdom.com/goa/goa-api:1.0.0-SNAPSHOT
+        image: harbor.supwisdom.com/goa/goa-api:1.0
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
diff --git a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.3.user-data-service-biz.yaml b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.3.user-data-service-biz.yaml
index 54e76ec..3cdbe0a 100644
--- a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.3.user-data-service-biz.yaml
+++ b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/4.3.user-data-service-biz.yaml
@@ -80,7 +80,7 @@ spec:
       containers:
       - name: user-data-service-biz
         # 若使用了学校搭设的私有仓库，请修改
-        image: harbor.supwisdom.com/goa/biz-api:1.0.0-SNAPSHOT
+        image: harbor.supwisdom.com/goa/biz-api:1.0
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
diff --git a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/5.user-data-service-datax-job.yaml b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/5.user-data-service-datax-job.yaml
index d99112b..61e2ee4 100644
--- a/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/5.user-data-service-datax-job.yaml
+++ b/project/newcapec-test/k8s-rancher/1.authx-service/2.user-data-service/5.user-data-service-datax-job.yaml
@@ -7,15 +7,15 @@ metadata:
   namespace: user-data-service-test
   name: user-data-service-datax-job-env
 data:
-  JOB_APPLICATION_AUTHZ2USER_MYSQLREADER8_USERNAME: "user_authz"
+  JOB_APPLICATION_AUTHZ2USER_MYSQLREADER8_USERNAME: "user_authz_test"
   # 修改为实际的数据库密码
   JOB_APPLICATION_AUTHZ2USER_MYSQLREADER8_PASSWORD: "Nwpu@Supwisdom123"
-  JOB_APPLICATION_AUTHZ2USER_MYSQLREADER8_JDBC_URL: "jdbc:mysql://mysql-server.authx-service-test.svc.cluster.local:3306/user_authz?serverTimezone=Asia/Shanghai"
+  JOB_APPLICATION_AUTHZ2USER_MYSQLREADER8_JDBC_URL: "jdbc:mysql://mysql-server.authx-service-test.svc.cluster.local:3306/user_authz_test?serverTimezone=Asia/Shanghai"
 
-  JOB_APPLICATION_AUTHZ2USER_MYSQLWRITER8_USERNAME: "user"
+  JOB_APPLICATION_AUTHZ2USER_MYSQLWRITER8_USERNAME: "user_test"
   # 修改为实际的数据库密码
   JOB_APPLICATION_AUTHZ2USER_MYSQLWRITER8_PASSWORD: "Nwpu@Supwisdom123"
-  JOB_APPLICATION_AUTHZ2USER_MYSQLWRITER8_JDBC_URL: "jdbc:mysql://mysql-server.authx-service-test.svc.cluster.local:3306/user?serverTimezone=Asia/Shanghai"
+  JOB_APPLICATION_AUTHZ2USER_MYSQLWRITER8_JDBC_URL: "jdbc:mysql://mysql-server.authx-service-test.svc.cluster.local:3306/user_test?serverTimezone=Asia/Shanghai"
 
 ---
 apiVersion: batch/v1beta1
@@ -41,7 +41,7 @@ spec:
           containers:
           - name: user-data-service-datax-job
             # 若使用了学校搭设的私有仓库，请修改
-            image: harbor.supwisdom.com/goa/datax-job:1.0.0-SNAPSHOT
+            image: harbor.supwisdom.com/goa/datax-job:1.0
             imagePullPolicy: Always
             envFrom:
             - configMapRef: