From b4e59df4998119c0d5c01e7b66cf2f748e213d37 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E5=88=98=E6=B4=AA=E9=9D=92?= <hongqing.liu@supwisdom.com>
Date: Wed, 21 Jul 2021 13:09:45 +0800
Subject: [PATCH] =?utf8?q?fix:=20=E8=B0=83=E6=95=B4authx-management=20?=
 =?utf8?q?=E7=9B=B8=E5=85=B3=E5=9F=9F=E5=90=8D=E7=9A=84=E9=83=A8=E7=BD=B2y?=
 =?utf8?q?aml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 ...6\241\243\357\274\210V1.2-V1.3\357\274\211.md" | 10 ++++++----
 .../2.authx-service-ingresses.yaml                | 15 +++++----------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git "a/deploy-manifests/k8s-rancher/0.1.3.\350\256\244\350\257\201\346\216\210\346\235\203\346\234\215\345\212\241\345\215\207\347\272\247\346\226\207\346\241\243\357\274\210V1.2-V1.3\357\274\211.md" "b/deploy-manifests/k8s-rancher/0.1.3.\350\256\244\350\257\201\346\216\210\346\235\203\346\234\215\345\212\241\345\215\207\347\272\247\346\226\207\346\241\243\357\274\210V1.2-V1.3\357\274\211.md"
index 5f02067..6304ddf 100644
--- "a/deploy-manifests/k8s-rancher/0.1.3.\350\256\244\350\257\201\346\216\210\346\235\203\346\234\215\345\212\241\345\215\207\347\272\247\346\226\207\346\241\243\357\274\210V1.2-V1.3\357\274\211.md"
+++ "b/deploy-manifests/k8s-rancher/0.1.3.\350\256\244\350\257\201\346\216\210\346\235\203\346\234\215\345\212\241\345\215\207\347\272\247\346\226\207\346\241\243\357\274\210V1.2-V1.3\357\274\211.md"
@@ -8,9 +8,7 @@
 
 1. 新增 authx-service/authx-management ，用户认证授权管理前端
 
-2. 新增 authx-service/authx-ingress ，提供 authx-management 的外网域名访问
-
-3. 新增域名要求 authx-management.paas.xxx.edu.cn ，若无发提供新域名的，可以使用  admin-platform.paas.xxx.edu.cn
+2. 新增 authx-service/authx-ingress ，提供 authx-management 的外网域名访问，暂用 `admin-platform.paas.xxx.edu.cn`
 
 
 
@@ -32,4 +30,8 @@
 
   修改 ConfigMap admin-platform/admin-platform-spa-env 下的配置项 `CAS_SERVER_SPA_URL`, `USER_SERVER_SPA_URL`, `AUTH_SERVER_SPA_URL`
 
-  将 配置中的 域名地址 修改为 步骤3 中配置的域名
+  ```
+  CAS_SERVER_SPA_URL: http://admin-platform.paas.xxx.edu.cn/authx-management/cas-server
+  USER_SERVER_SPA_URL: http://admin-platform.paas.xxx.edu.cn/authx-management/user-server
+  AUTH_SERVER_SPA_URL: http://admin-platform.paas.xxx.edu.cn/authx-management/auth-server
+  ```
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/2.authx-service-ingresses.yaml b/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/2.authx-service-ingresses.yaml
index 5c80294..abf1755 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/2.authx-service-ingresses.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/2.authx-service-ingresses.yaml
@@ -7,21 +7,16 @@ kind: Ingress
 metadata:
   namespace: authx-service
   name: authx-management-ingress
+  annotations:
+    nginx.ingress.kubernetes.io/use-regex: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /$1
 spec:
   rules:
   # 修改为学校的根域名
-  - host: authx-management.paas.xxx.edu.cn
+  - host: admin-platform.paas.xxx.edu.cn
     http:
       paths:
-      - path: /cas-server
-        backend:
-          serviceName: authx-management-svc
-          servicePort: http
-      - path: /user-server
-        backend:
-          serviceName: authx-management-svc
-          servicePort: http
-      - path: /auth-server
+      - path: /authx-management/(.*)
         backend:
           serviceName: authx-management-svc
           servicePort: http
-- 
2.17.1