From: 刘洪青 <hongqing.liu@supwisdom.com>
Date: Tue, 15 Mar 2022 00:17:12 +0000 (+0800)
Subject: chore: nwpu 升级1.3
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=817b1fce3b300922fff9b4547a83752c9fcb2ac6;p=institute%2Fdeploy-authx-service.git

chore: nwpu 升级1.3
---

diff --git a/project/nwpu/k8s-rancher/1.authx-service/10.0.init.sql b/project/nwpu/k8s-rancher/1.authx-service/10.0.init.sql
index 0ab59fa..d206414 100644
--- a/project/nwpu/k8s-rancher/1.authx-service/10.0.init.sql
+++ b/project/nwpu/k8s-rancher/1.authx-service/10.0.init.sql
@@ -1,7 +1,7 @@
 -- 10.0.init.sql
 
 /*
-将 paas.example.com 替换为 paas.学校域名.edu.cn
+将 paas.nwpu.edu.cn 替换为 paas.学校域名.edu.cn
 */
 
 
@@ -10,9 +10,9 @@ use cas_server;
 -- 更新 服务 personal-security-center 的信息
 update TB_SERVICE 
 set 
-  INFORMATION_URL='http://personal-security-center.paas.example.com', 
-  LOGOUT_URL='http://personal-security-center.paas.example.com/slo?redirect_uri=http://security-center.paas.example.com/?clearCertification=clearCertification',
-  SERVICE_ID='http://personal-security-center.paas.example.com/cas/(.*)'
+  INFORMATION_URL='http://personal-security-center.paas.nwpu.edu.cn', 
+  LOGOUT_URL='http://personal-security-center.paas.nwpu.edu.cn/slo?redirect_uri=http://security-center.paas.nwpu.edu.cn/?clearCertification=clearCertification',
+  SERVICE_ID='http://personal-security-center.paas.nwpu.edu.cn/cas/(.*)'
 where ID='2';  -- todo, modify
 
 
@@ -25,9 +25,9 @@ INSERT INTO `TB_SERVICE` (`ID`, `COMPANY_ID`, `DELETED`, `ADD_ACCOUNT`, `ADD_TIM
   `ENABLED`, `SSO_ENABLED`, `REQUIRE_ALL_ATTRIBUTES`, 
   `APPLICATION_ID`, `EXTERNAL_ID`)
 VALUES ('22', '1', 0, 'admin', '2020-07-01 00:00:00',
-  '安全中心', '安全中心', 'https://security-center.paas.example.com', 'https://security-center.paas.example.com/?clearCertification=clearCertification', 
+  '安全中心', '安全中心', 'https://security-center.paas.nwpu.edu.cn', 'https://security-center.paas.nwpu.edu.cn/?clearCertification=clearCertification', 
   'REDIRECT', 'FRONT_CHANNEL', 
-  22, '安全中心', 22, 'https://security-center.paas.example.com/(.*)', 
+  22, '安全中心', 22, 'https://security-center.paas.nwpu.edu.cn/(.*)', 
   1, 1, 1, 
   '22', '22');
 
@@ -36,12 +36,12 @@ commit;
 -- 修改根域名
 update TB_SERVICE 
 set 
-  INFORMATION_URL='http://security-center.paas.example.com', 
-  LOGOUT_URL='http://security-center.paas.example.com/?clearCertification=clearCertification', 
-  SERVICE_ID='http://security-center.paas.example.com/(.*)', 
+  INFORMATION_URL='http://security-center.paas.nwpu.edu.cn', 
+  LOGOUT_URL='http://security-center.paas.nwpu.edu.cn/?clearCertification=clearCertification', 
+  SERVICE_ID='http://security-center.paas.nwpu.edu.cn/(.*)', 
   ID_TOKEN_ENABLED=1,
   JWT_AS_SERVICE_TICKET=1,
-  APPLICATION_DOMAIN='security-center.paas.example.com'
+  APPLICATION_DOMAIN='security-center.paas.nwpu.edu.cn'
 where ID='22';  -- todo, modify
 
 commit;
diff --git a/project/nwpu/k8s-rancher/1.authx-service/6.personal-security-center/2.personal-security-center-ingresses.yaml b/project/nwpu/k8s-rancher/1.authx-service/6.personal-security-center/2.personal-security-center-ingresses.yaml
index 3bdc109..2c727c9 100644
--- a/project/nwpu/k8s-rancher/1.authx-service/6.personal-security-center/2.personal-security-center-ingresses.yaml
+++ b/project/nwpu/k8s-rancher/1.authx-service/6.personal-security-center/2.personal-security-center-ingresses.yaml
@@ -13,7 +13,7 @@ metadata:
 spec:
   rules:
   # 修改为学校的根域名
-  - host: personal-security-center.paas.xxx.edu.cn
+  - host: personal-security-center.paas.nwpu.edu.cn
     http:
       paths:
       - path: /
@@ -32,7 +32,7 @@ metadata:
 spec:
   rules:
   # 修改为学校的根域名
-  - host: security-center.paas.xxx.edu.cn
+  - host: security-center.paas.nwpu.edu.cn
     http:
       paths:
       - path: /
diff --git a/project/nwpu/k8s-rancher/1.authx-service/6.personal-security-center/4.9.security-center-ui.yaml b/project/nwpu/k8s-rancher/1.authx-service/6.personal-security-center/4.9.security-center-ui.yaml
index 6a8e5be..05a453e 100644
--- a/project/nwpu/k8s-rancher/1.authx-service/6.personal-security-center/4.9.security-center-ui.yaml
+++ b/project/nwpu/k8s-rancher/1.authx-service/6.personal-security-center/4.9.security-center-ui.yaml
@@ -8,23 +8,24 @@ metadata:
   name: security-center-ui-env
 data:
   # **修改** 学校的根域名
-  RESOURCE_PREFIX: http://authx-minio.paas.xxx.edu.cn/security-center-ui
-  SCHOOL_NAME: ""
-  MAIN_SERVER: http://security-center.paas.xxx.edu.cn
+  # RESOURCE_PREFIX: http://authx-minio.paas.nwpu.edu.cn/security-center-ui
+  RESOURCE_PREFIX: ""
+  SCHOOL_NAME: "nwpu"
+  MAIN_SERVER: http://security-center.paas.nwpu.edu.cn
 
-  PERSONAL_CENTER_API: http://personal-security-center.paas.xxx.edu.cn
+  PERSONAL_CENTER_API: http://personal-security-center.paas.nwpu.edu.cn
 
   # 可选 cas，uniauth
   AUTH_TYPE: cas
   
   # AUTH_TYPE 为 uniauth 时，配置 
-  UNIAUTH_IDTOKEN: http://uniauth.paas.xxx.edu.cn/idtoken
-  UNIAUTH_IDTOKEN_ISS: "uniauth"
-  UNIAUTH_CLIENT_ID: "22"
+  # UNIAUTH_IDTOKEN: http://uniauth.paas.xxx.edu.cn/idtoken
+  # UNIAUTH_IDTOKEN_ISS: "uniauth"
+  # UNIAUTH_CLIENT_ID: "22"
   
   # AUTH_TYPE 为 cas 时，配置 AUTH_CAS、JWT_ISS、JWT_SECRET
-  AUTH_CAS: http://cas.paas.xxx.edu.cn/cas
-  JWT_ISS: http://cas.paas.xxx.edu.cn/cas
+  AUTH_CAS: http://uis.paas.nwpu.edu.cn/cas
+  JWT_ISS: http://uis.paas.nwpu.edu.cn/cas
   JWT_SECRET: (@<rhnPaUYKC_k770*DuWwYQ_#Zc#8c(2rB?kae)rN)>K7qy)awCjxp$L653Mf$2
 
 
@@ -64,7 +65,7 @@ spec:
       containers:
       - name: security-center-ui
         # 若使用了学校搭设的私有仓库，请修改
-        image: paas.harbor.nwpu.edu.cn/personal-security-center/security-center-ui:1.2.10-RELEASE
+        image: paas.harbor.nwpu.edu.cn/personal-security-center/security-center-ui:1.3.6-RELEASE
         imagePullPolicy: Always
         ports:
         - containerPort: 80