From 8cbef0e258aa0a72a9a80c14976f55aed3d05e0e Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=88=98=E6=B4=AA=E9=9D=92?= Date: Tue, 19 Apr 2022 17:04:49 +0800 Subject: [PATCH] =?utf8?q?chore:=20nwpu=20=E5=8D=87=E7=BA=A71.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../4.0.cas-server-installer.yaml | 2 +- .../4.0.token-server-installer.yaml | 2 +- .../5.token-server/9.api-docs-installer.yaml | 2 +- .../7.attest-server/4.1.attest-server.yaml | 19 ++++++++++--------- .../8.authx-log/1.authx-log-env.yaml | 12 ++++++------ .../8.authx-log/4.0.authx-log-installer.yaml | 8 ++++---- .../8.authx-log/4.2.authx-log-sa.yaml | 3 +++ 7 files changed, 26 insertions(+), 22 deletions(-) diff --git a/project/nwpu/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml b/project/nwpu/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml index debd6ef..f3ec61a 100644 --- a/project/nwpu/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml +++ b/project/nwpu/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml @@ -28,7 +28,7 @@ spec: containers: - name: cas-server-installer # 若使用了学校搭设的私有仓库，请修改 - image: paas.harbor.nwpu.edu.cn/cas-server/cas-server-installer:1.4.3-RELEASE + image: paas.harbor.nwpu.edu.cn/cas-server/cas-server-installer:1.4.4-RELEASE imagePullPolicy: Always env: - name: DB_TYPE diff --git a/project/nwpu/k8s-rancher/1.authx-service/5.token-server/4.0.token-server-installer.yaml b/project/nwpu/k8s-rancher/1.authx-service/5.token-server/4.0.token-server-installer.yaml index 34e1339..32d907d 100644 --- a/project/nwpu/k8s-rancher/1.authx-service/5.token-server/4.0.token-server-installer.yaml +++ b/project/nwpu/k8s-rancher/1.authx-service/5.token-server/4.0.token-server-installer.yaml @@ -28,7 +28,7 @@ spec: containers: - name: token-server-installer # 若使用了学校搭设的私有仓库，请修改 - image: paas.harbor.nwpu.edu.cn/token-server/token-server-installer:1.4.3-RELEASE + image: paas.harbor.nwpu.edu.cn/token-server/token-server-installer:1.4.4-RELEASE imagePullPolicy: Always envFrom: - configMapRef: diff --git a/project/nwpu/k8s-rancher/1.authx-service/5.token-server/9.api-docs-installer.yaml b/project/nwpu/k8s-rancher/1.authx-service/5.token-server/9.api-docs-installer.yaml index 603786b..acf45a8 100644 --- a/project/nwpu/k8s-rancher/1.authx-service/5.token-server/9.api-docs-installer.yaml +++ b/project/nwpu/k8s-rancher/1.authx-service/5.token-server/9.api-docs-installer.yaml @@ -38,7 +38,7 @@ spec: containers: - name: api-docs-installer # 若使用了学校搭设的私有仓库，请修改 - image: paas.harbor.nwpu.edu.cn/token-server/api-docs-installer:1.4.3-RELEASE + image: paas.harbor.nwpu.edu.cn/token-server/api-docs-installer:1.4.4-RELEASE imagePullPolicy: Always envFrom: - configMapRef: diff --git a/project/nwpu/k8s-rancher/1.authx-service/7.attest-server/4.1.attest-server.yaml b/project/nwpu/k8s-rancher/1.authx-service/7.attest-server/4.1.attest-server.yaml index 9088b39..6da9590 100644 --- a/project/nwpu/k8s-rancher/1.authx-service/7.attest-server/4.1.attest-server.yaml +++ b/project/nwpu/k8s-rancher/1.authx-service/7.attest-server/4.1.attest-server.yaml @@ -24,22 +24,23 @@ data: # **修改** 从POA申请 - POA_SERVER_URL: http://poa.paas.nwpu.edu.cn + POA_SERVER_URL: https://poa.nwpu.edu.cn POA_CLIENT_ID: "" POA_CLIENT_SECRET: "" POA_SCOPES: appPush:v1:apppushByMessageType # 修改为学校的根域名 - ATTEST_SERVER_PREFIX: http://uis.paas.nwpu.edu.cn/attest + ATTEST_SERVER_PREFIX: https://uis.nwpu.edu.cn/attest # guard - ATTEST_SERVER_SECUREPHONE_SMS_TEXT_TEMPLATE: 【认证服务】{name}：您正在进行验证身份，验证码为{code}，有效期5分钟，请尽快完成验证。 + # **修改** 根据实际情况，修改短信模板 + ATTEST_SERVER_SECUREPHONE_SMS_TEXT_TEMPLATE: "【认证服务】{name}：您正在进行验证身份，验证码为{code}，有效期5分钟，请尽快完成验证。" ATTEST_SERVER_SECUREPHONE_SMS_FROM: 认证服务 - # **修改** 根据实际情况，修改短信模板 - ATTEST_SERVER_SECUREEMAIL_MAIL_TEXT_TEMPLATE: 【认证服务】{name}：您正在进行验证身份，验证码为{code}，有效期5分钟，请尽快完成验证。 + # **修改** 根据实际情况，修改邮件模板 + ATTEST_SERVER_SECUREEMAIL_MAIL_TEXT_TEMPLATE: "【认证服务】{name}：您正在进行验证身份，验证码为{code}，有效期5分钟，请尽快完成验证。" ATTEST_SERVER_SECUREEMAIL_MAIL_FROM: 认证服务 # 在超级APP 中唤起人脸识别的 URL Scheme @@ -47,7 +48,7 @@ data: # 超级APP Token 的验签公钥 - TOKEN_SERVER_TOKEN_SIGNING_KEY_URL: http://token-server-svc.token-server.svc.cluster.local:8080/token/jwt/publicKey + TOKEN_SERVER_TOKEN_SIGNING_KEY_URL: http://token-server-svc.token-server.svc.cluster.local:8080/jwt/publicKey USER_DATA_SERVICE_SA_API_SERVER_URL: http://user-data-service-goa-svc.user-data-service.svc.cluster.local:8080 @@ -69,7 +70,7 @@ data: # **修改** # 若须对接sms 接口，须进行二开定制 - TPAS_AGENT_SERVICE_SMS_SENDER_PATH: /api/v1/tpas/sms/console/send + TPAS_AGENT_SERVICE_SMS_SENDER_PATH: /api/v1/tpas/sms/nwpu/send TPAS_AGENT_SERVICE_MAIL_SENDER_PATH: /api/v1/tpas/mail/smtp/send TPAS_AGENT_SERVICE_FACE_FACEVERIFY_PATH: /api/v1/tpas/face/aiface/faceverify @@ -77,7 +78,7 @@ data: ## # token-server # - TOKEN_SERVER_SERVER_URL: http://token-server-svc.token-server.svc.cluster.local:8080/token + TOKEN_SERVER_SERVER_URL: http://token-server-svc.token-server.svc.cluster.local:8080 ## @@ -142,7 +143,7 @@ spec: spec: containers: - name: attest-server - image: paas.harbor.nwpu.edu.cn/attest-server/attest-server:1.4.3-RELEASE + image: paas.harbor.nwpu.edu.cn/attest-server/attest-server:1.4.4-RELEASE imagePullPolicy: Always ports: - containerPort: 8080 diff --git a/project/nwpu/k8s-rancher/1.authx-service/8.authx-log/1.authx-log-env.yaml b/project/nwpu/k8s-rancher/1.authx-service/8.authx-log/1.authx-log-env.yaml index 15c2e89..5be4d22 100644 --- a/project/nwpu/k8s-rancher/1.authx-service/8.authx-log/1.authx-log-env.yaml +++ b/project/nwpu/k8s-rancher/1.authx-service/8.authx-log/1.authx-log-env.yaml @@ -18,12 +18,12 @@ metadata: type: Opaque data: # jdbc:mysql://mysql-server.authx-service.svc.cluster.local:3306/authx_log?serverTimezone=Asia/Shanghai - # JDBC_URL: amRiYzpteXNxbDovL215c3FsLXNlcnZlci5hdXRoeC1zZXJ2aWNlLnN2Yy5jbHVzdGVyLmxvY2FsOjMzMDYvYXV0aHhfbG9nP3NlcnZlclRpbWV6b25lPUFzaWEvU2hhbmdoYWk= - JDBC_URL: amRiYzpteXNxbDovL215c3FsLXNlcnZlci5hdXRoeC1zZXJ2aWNlLnN2Yy5jbHVzdGVyLmxvY2FsOjMzMDYvYXV0aHhfbG9nX3Rlc3Q/c2VydmVyVGltZXpvbmU9QXNpYS9TaGFuZ2hhaQ== + JDBC_URL: amRiYzpteXNxbDovL215c3FsLXNlcnZlci5hdXRoeC1zZXJ2aWNlLnN2Yy5jbHVzdGVyLmxvY2FsOjMzMDYvYXV0aHhfbG9nP3NlcnZlclRpbWV6b25lPUFzaWEvU2hhbmdoYWk= + # JDBC_URL: amRiYzpteXNxbDovL215c3FsLXNlcnZlci5hdXRoeC1zZXJ2aWNlLnN2Yy5jbHVzdGVyLmxvY2FsOjMzMDYvYXV0aHhfbG9nX3Rlc3Q/c2VydmVyVGltZXpvbmU9QXNpYS9TaGFuZ2hhaQ== # authx_log - # JDBC_USERNAME: YXV0aHhfbG9n - JDBC_USERNAME: YXV0aHhfbG9nX3Rlc3Q= + JDBC_USERNAME: YXV0aHhfbG9n + # JDBC_USERNAME: YXV0aHhfbG9nX3Rlc3Q= # 修改为实际的数据库密码，并使用 base64 工具进行编码 # kingstar - # JDBC_PASSWORD: a2luZ3N0YXI= - JDBC_PASSWORD: U3Vwd2lzZG9tIU53cHUxMjM= + JDBC_PASSWORD: a2luZ3N0YXI= + # JDBC_PASSWORD: U3Vwd2lzZG9tIU53cHUxMjM= diff --git a/project/nwpu/k8s-rancher/1.authx-service/8.authx-log/4.0.authx-log-installer.yaml b/project/nwpu/k8s-rancher/1.authx-service/8.authx-log/4.0.authx-log-installer.yaml index 88abd06..b71ac1c 100644 --- a/project/nwpu/k8s-rancher/1.authx-service/8.authx-log/4.0.authx-log-installer.yaml +++ b/project/nwpu/k8s-rancher/1.authx-service/8.authx-log/4.0.authx-log-installer.yaml @@ -27,17 +27,17 @@ spec: restartPolicy: Never containers: - name: authx-log-installer - image: harbor.supwisdom.com/authx-log/authx-log-installer:1.4.4-RELEASE + image: paas.harbor.nwpu.edu.cn/authx-log/authx-log-installer:1.4.4-RELEASE imagePullPolicy: Always env: - name: DB_TYPE value: mysql8 - name: JDBC_URL - value: jdbc:mysql://mysql-server.authx-service.svc.cluster.local:3306/authx_log_test?serverTimezone=Asia/Shanghai + value: jdbc:mysql://mysql-server.authx-service.svc.cluster.local:3306/authx_log?serverTimezone=Asia/Shanghai - name: JDBC_USERNAME - value: authx_log_test + value: authx_log - name: JDBC_PASSWORD - value: Supwisdom!Nwpu123 + value: Nwpu@Supwisdom123 envFrom: - configMapRef: name: jvm-env diff --git a/project/nwpu/k8s-rancher/1.authx-service/8.authx-log/4.2.authx-log-sa.yaml b/project/nwpu/k8s-rancher/1.authx-service/8.authx-log/4.2.authx-log-sa.yaml index e71f30c..0e8fdbf 100644 --- a/project/nwpu/k8s-rancher/1.authx-service/8.authx-log/4.2.authx-log-sa.yaml +++ b/project/nwpu/k8s-rancher/1.authx-service/8.authx-log/4.2.authx-log-sa.yaml @@ -25,7 +25,10 @@ data: # USER_DATA_SERVICE_CLIENT_AUTH_TRUSTSTORE_FILE: file:/certs/common/common.truststore # USER_DATA_SERVICE_CLIENT_AUTH_TRUSTSTORE_PASSWORD: "" + #ipaddr + IPADDR_API_URL: http://ipaddr.ipaddr.svc.cluster.local:9090/v1/find + IPADDR_SERVER_URL: http://ipaddr.ipaddr.svc.cluster.local:9090 IPADDR_CLIENT_AUTH_ENABLED: "false" #IPADDR_CLIENT_AUTH_KEY_PASSWORD: "" -- 2.17.1