docs: 云平台产品 V1.2，部署文档整理
diff --git "a/deploy-manifests/k8s-rancher/0.1.1.\344\272\221\345\271\263\345\217\260\345\256\211\350\243\205\351\203\250\347\275\262\346\211\213\345\206\214.md" "b/deploy-manifests/k8s-rancher/0.1.1.\344\272\221\345\271\263\345\217\260\345\256\211\350\243\205\351\203\250\347\275\262\346\211\213\345\206\214.md"
index 8c16a4d..33d1357 100644
--- "a/deploy-manifests/k8s-rancher/0.1.1.\344\272\221\345\271\263\345\217\260\345\256\211\350\243\205\351\203\250\347\275\262\346\211\213\345\206\214.md"
+++ "b/deploy-manifests/k8s-rancher/0.1.1.\344\272\221\345\271\263\345\217\260\345\256\211\350\243\205\351\203\250\347\275\262\346\211\213\345\206\214.md"
@@ -258,8 +258,10 @@
key | 说明 | 配置示例
- | - | -
- RESOURCE_PREFIX | LOGO、FAVICON 等资源地址 | http://authx-minio.paas.xxx.edu.cn/admin-platform
MAIN_SERVER | 云平台访问地址（外部访问地址） | https://admin-platform.paas.xxx.edu.cn
+ RESOURCE_PREFIX | LOGO、FAVICON 等资源地址 | http://authx-minio.paas.xxx.edu.cn/admin-platform
+ - | - | -
+ AUTH_TYPE | 认证方式 | idToken-cas
- | - | -
AUTH_CAS | CAS认证地址（外部访问地址） | http://cas.paas.xxx.edu.cn/cas
JWT_ISS | JWT Token 签名方标识 | http://cas.paas.xxx.edu.cn/cas
diff --git "a/deploy-manifests/k8s-rancher/0.1.2.\344\272\221\345\271\263\345\217\260\345\215\207\347\272\247\346\226\207\346\241\243\357\274\210V1.0-V1.2\357\274\211.md" "b/deploy-manifests/k8s-rancher/0.1.2.\344\272\221\345\271\263\345\217\260\345\215\207\347\272\247\346\226\207\346\241\243\357\274\210V1.0-V1.2\357\274\211.md"
new file mode 100644
index 0000000..a30fc01
--- /dev/null
+++ "b/deploy-manifests/k8s-rancher/0.1.2.\344\272\221\345\271\263\345\217\260\345\215\207\347\272\247\346\226\207\346\241\243\357\274\210V1.0-V1.2\357\274\211.md"
@@ -0,0 +1,121 @@
+
+# 云平台升级文档（V1.0 ~ V1.2）
+
+
+## 部署变更说明
+
+1. admin-center/admin-center-bff 的 用户授权认证相关的管理接口，迁移至 authx-service/authx-service-bff 中，并使用了 /api/v2/** 的接口路径
+
+2. admin-center/admin-center-management 变更为 admin-platform/admin-management
+
+3. admin-center/poa-api-docs-installer 变更为 admin-center/api-docs-installer
+
+4. 删除 Ingress admin-center/admin-center-management-ingress
+5. 新增 Ingerss admin-platform/admin-management-ingress
+
+
+## 升级说明
+
+1. 将 工作负载 下的服务 升级到 1.2.x 版本
+
+2. 重新执行 admin-center/admin-center-sa-installer ， 对数据库进行升级
+
+3. admin-center/admin-center-management， 可以删除
+
+4. admin-platform/admin-management， 根据 yaml 新增
+
+5. admin-center/poa-api-docs-installer， 可以删除
+
+6. admin-center/api-docs-installer， 根据 yaml 重新执行
+
+7. 新增 Ingerss ， admin-platform/admin-management-ingress ， 执行 yaml 。 原来的 ingress 删除
+
+ 即，将原来的 域名 `admin-management.paas.xxx.edu.cn` 指向到新的前端服务 `admin-platform/admin-management`
+
+ ```
+ # 基础管理
+ ---
+ apiVersion: extensions/v1beta1
+ kind: Ingress
+ metadata:
+ namespace: admin-platform
+ name: admin-management-ingress
+ spec:
+ rules:
+ # 修改为学校的根域名
+ - host: admin-management.paas.xxx.edu.cn
+ http:
+ paths:
+ - path: /
+ backend:
+ serviceName: admin-management-svc
+ servicePort: http
+ ```
+
+8. 新增 认证对接配置
+
+ 注：如果已经存在，请忽略
+
+ ```sql
+ use cas_server;
+
+ -- admin-management 的认证对接信息
+
+ INSERT INTO `TB_SERVICE` (`ID`, `COMPANY_ID`, `DELETED`, `ADD_ACCOUNT`, `ADD_TIME`,
+ `NAME`, `DESCRIPTION`, `INFORMATION_URL`, `LOGOUT_URL`,
+ `RESPONSE_TYPE`, `LOGOUT_TYPE`,
+ `EVALUATION_ORDER`, `FRIENDLY_NAME`, `REGISTERED_SERVICE_ID`, `SERVICE_ID`,
+ `ENABLED`, `SSO_ENABLED`, `REQUIRE_ALL_ATTRIBUTES`,
+ `APPLICATION_ID`, `EXTERNAL_ID`)
+ VALUES ('20', '1', 0, 'admin', '2020-07-01 00:00:00',
+ '基础管理', '基础管理', 'https://admin-management.paas.example.com', 'https://admin-management.paas.example.com/?clearToken=clearToken',
+ 'REDIRECT', 'FRONT_CHANNEL',
+ 20, '基础管理', 20, 'https://admin-management.paas.example.com/(.*)',
+ 1, 1, 1,
+ '20', '20');
+
+ commit;
+
+ -- 修改根域名
+ update TB_SERVICE
+ set
+ INFORMATION_URL='http://admin-management.paas.example.com',
+ LOGOUT_URL='http://admin-management.paas.example.com/?clearToken=clearToken',
+ SERVICE_ID='http://admin-management.paas.example.com/(.*)',
+ ID_TOKEN_ENABLED=1,
+ JWT_AS_SERVICE_TICKET=1,
+ APPLICATION_DOMAIN='admin-management.paas.example.com'
+ where ID='20'; -- todo, modify
+
+ commit;
+
+ -- admin-platform 的认证对接信息
+
+ INSERT INTO `TB_SERVICE` (`ID`, `COMPANY_ID`, `DELETED`, `ADD_ACCOUNT`, `ADD_TIME`,
+ `NAME`, `DESCRIPTION`, `INFORMATION_URL`, `LOGOUT_URL`,
+ `RESPONSE_TYPE`, `LOGOUT_TYPE`,
+ `EVALUATION_ORDER`, `FRIENDLY_NAME`, `REGISTERED_SERVICE_ID`, `SERVICE_ID`,
+ `ENABLED`, `SSO_ENABLED`, `REQUIRE_ALL_ATTRIBUTES`,
+ `APPLICATION_ID`, `EXTERNAL_ID`)
+ VALUES ('21', '1', 0, 'admin', '2020-07-01 00:00:00',
+ '云平台', '云平台', 'https://admin-platform.paas.example.com', 'https://admin-platform.paas.example.com/?clearCertification=clearCertification',
+ 'REDIRECT', 'FRONT_CHANNEL',
+ 21, '云平台', 21, 'https://admin-platform.paas.example.com/(.*)',
+ 1, 1, 1,
+ '21', '21');
+
+ commit;
+
+ -- 修改根域名
+ update TB_SERVICE
+ set
+ INFORMATION_URL='http://admin-platform.paas.example.com',
+ LOGOUT_URL='http://admin-platform.paas.example.com/?clearCertification=clearCertification',
+ SERVICE_ID='http://admin-platform.paas.example.com/(.*)',
+ ID_TOKEN_ENABLED=1,
+ JWT_AS_SERVICE_TICKET=1,
+ APPLICATION_DOMAIN='admin-platform.paas.example.com'
+ where ID='21'; -- todo, modify
+
+ commit;
+ ```
diff --git a/deploy-manifests/k8s-rancher/6.admin-platform/10.0.init.sql b/deploy-manifests/k8s-rancher/6.admin-platform/10.0.init.sql
index 9115958..b2f3450 100644
--- a/deploy-manifests/k8s-rancher/6.admin-platform/10.0.init.sql
+++ b/deploy-manifests/k8s-rancher/6.admin-platform/10.0.init.sql
@@ -7,17 +7,6 @@
use admin_center;
-
-insert into TB_MGT_ROUTE (ID, DELETED, CODE, NAME, STATUS, PATH_PREFIX, URL, STRIP_PREFIX)
-values ('9', 0, 'management-api', '管理门户 - 管理接口', '1', '/api/v1/mgt', 'http://admin-center-sa-svc.admin-center.svc.cluster.local:8080/v1/admin', 1);
-
-commit;
-
-update TB_MGT_ROUTE set URL='http://admin-center-sa-svc.admin-center.svc.cluster.local:8080/v1/admin' where ID='9';
-
-commit;
-
-
-- 更新 admin-management 下菜单的访问域
update TB_MGT_PERMISSION
@@ -116,7 +105,6 @@
commit;
-
use user_authz;
-- 更新 admin-center 下的角色同步地址
diff --git a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/2.admin-center-ingresses.yaml b/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/2.admin-center-ingresses.yaml
index af2e005..b701016 100644
--- a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/2.admin-center-ingresses.yaml
+++ b/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/2.admin-center-ingresses.yaml
@@ -21,43 +21,15 @@
backend:
serviceName: admin-center-zuul-svc
servicePort: http
-
-
-# 云平台菜单开放接口
-# 暂时不使用，直接使用内部地址
-# ---
-# apiVersion: extensions/v1beta1
-# kind: Ingress
-# metadata:
-# namespace: admin-center
-# name: admin-center-api-ingress
-# spec:
-# rules:
-# # 修改为学校的根域名
-# - host: admin-center-api.paas.xxx.edu.cn
-# http:
-# paths:
-# - path: /
-# backend:
-# serviceName: admin-center-poa-svc
-# servicePort: http
-
-
-# 云平台管理前端（废弃）
-# ---
-# apiVersion: extensions/v1beta1
-# kind: Ingress
-# metadata:
-# namespace: admin-center
-# name: admin-center-management-ingress
-# spec:
-# rules:
-# # 修改为学校的根域名
-# - host: admin-management.paas.xxx.edu.cn
-# http:
-# paths:
-# - path: /
-# backend:
-# serviceName: admin-center-management-svc
-# servicePort: http
-
+ # - path: /jwt
+ # backend:
+ # serviceName: admin-center-zuul-svc
+ # servicePort: http
+ # - path: /cas
+ # backend:
+ # serviceName: admin-center-zuul-svc
+ # servicePort: http
+ # - path: /api
+ # backend:
+ # serviceName: admin-center-zuul-svc
+ # servicePort: http
diff --git a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.0.admin-center-sa-installer.yaml b/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.0.admin-center-sa-installer.yaml
index e95684b..fb56ef2 100644
--- a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.0.admin-center-sa-installer.yaml
+++ b/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.0.admin-center-sa-installer.yaml
@@ -28,7 +28,7 @@
containers:
- name: admin-center-sa-installer
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/admin-center/admin-center-sa-installer:1.1.6-RELEASE
+ image: harbor.supwisdom.com/admin-center/admin-center-sa-installer:1.2.0-SNAPSHOT
imagePullPolicy: Always
envFrom:
- configMapRef:
diff --git a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.1.admin-center-poa.yaml b/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.1.admin-center-poa.yaml
index 37380ba..03b9448 100644
--- a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.1.admin-center-poa.yaml
+++ b/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.1.admin-center-poa.yaml
@@ -90,7 +90,7 @@
containers:
- name: admin-center-poa
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/admin-center/admin-center-poa:1.1.6-RELEASE
+ image: harbor.supwisdom.com/admin-center/admin-center-poa:1.2.0-SNAPSHOT
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.2.admin-center-sa.yaml b/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.2.admin-center-sa.yaml
index d3c230c..9c0bc03 100644
--- a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.2.admin-center-sa.yaml
+++ b/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.2.admin-center-sa.yaml
@@ -71,7 +71,7 @@
containers:
- name: admin-center-sa
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/admin-center/admin-center-sa:1.1.6-RELEASE
+ image: harbor.supwisdom.com/admin-center/admin-center-sa:1.2.0-SNAPSHOT
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.4.admin-center-bff.yaml b/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.4.admin-center-bff.yaml
index 0e69361..a9c62cd 100644
--- a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.4.admin-center-bff.yaml
+++ b/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.4.admin-center-bff.yaml
@@ -120,7 +120,7 @@
containers:
- name: admin-center-bff
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/admin-center/admin-center-bff:1.1.6-RELEASE
+ image: harbor.supwisdom.com/admin-center/admin-center-bff:1.2.0-SNAPSHOT
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.5.admin-center-zuul.yaml b/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.5.admin-center-zuul.yaml
index 74cec6e..1de50c9 100644
--- a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.5.admin-center-zuul.yaml
+++ b/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.5.admin-center-zuul.yaml
@@ -148,7 +148,7 @@
containers:
- name: admin-center-zuul
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/admin-center/admin-center-zuul:1.1.6-RELEASE
+ image: harbor.supwisdom.com/admin-center/admin-center-zuul:1.2.0-SNAPSHOT
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.9.admin-center-management.yaml b/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.9.admin-center-management.yaml
deleted file mode 100644
index cb60444..0000000
--- a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/4.9.admin-center-management.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-# 4.9.admin-center-management.yaml
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- namespace: admin-center
- name: admin-center-management-env
-data:
- SCHOOL_NAME: "none"
- # 修改为学校的 admin-center 的访问域名
- AUTH_URL: http://admin-center.paas.xxx.edu.cn/jwt/cas
- # 修改为学校的 admin-center 的访问域名
- BACKEND_URL: http://admin-center.paas.xxx.edu.cn
- # 修改为学校的 admin-management 的访问域名
- SERVER_URL: http://admin-management.paas.xxx.edu.cn
-
-
----
-apiVersion: v1
-kind: Service
-metadata:
- namespace: admin-center
- name: admin-center-management-svc
- labels:
- app: admin-center-management-svc
-spec:
- ports:
- - port: 80
- targetPort: http
- protocol: TCP
- name: http
- selector:
- app: admin-center-management
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- namespace: admin-center
- name: admin-center-management
-spec:
- selector:
- matchLabels:
- app: admin-center-management
- replicas: 1
- template:
- metadata:
- labels:
- app: admin-center-management
- spec:
- containers:
- - name: admin-center-management
- # 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/admin-center/admin-center-management:1.1.6-RELEASE
- imagePullPolicy: Always
- ports:
- - containerPort: 80
- name: http
- envFrom:
- - configMapRef:
- name: admin-center-management-env
- resources:
- requests:
- memory: "128Mi"
- limits:
- memory: "256Mi"
- imagePullSecrets:
- - name: harbor-registry
diff --git a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/9.poa-api-docs-installer.yaml b/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/9.api-docs-installer.yaml
similarity index 71%
rename from deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/9.poa-api-docs-installer.yaml
rename to deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/9.api-docs-installer.yaml
index 2f75e68..675466e 100644
--- a/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/9.poa-api-docs-installer.yaml
+++ b/deploy-manifests/k8s-rancher/6.admin-platform/6.admin-center/9.api-docs-installer.yaml
@@ -1,16 +1,20 @@
-# 9.poa-api-docs-installer.yaml
+# 9.api-docs-installer.yaml
+
+# 依赖平台OpenAPI的部署
---
apiVersion: v1
kind: ConfigMap
metadata:
namespace: admin-center
- name: poa-api-docs-installer-env
+ name: api-docs-installer-env
data:
##
# 平台OpenAPI的外网访问地址，
# **修改** 学校的根域名
POA_SERVER_URL: http://poa.paas.xxx.edu.cn
+
+ # **修改** poa-sa 服务的k8s内部地址
POA_SA_SERVER_URL: http://poa-sa-svc.poa.svc.cluster.local:8443
ADMIN_CENTER_SERVER_URL: http://admin-center-poa-svc.admin-center.svc.cluster.local:8080
@@ -21,24 +25,24 @@
kind: Job
metadata:
namespace: admin-center
- name: poa-api-docs-installer
+ name: api-docs-installer
spec:
completions: 1
parallelism: 1
template:
metadata:
labels:
- app: poa-api-docs-installer
+ app: api-docs-installer
spec:
restartPolicy: Never
containers:
- - name: poa-api-docs-installer
+ - name: api-docs-installer
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/admin-center/poa-api-docs-installer:1.1.1-SNAPSHOT
+ image: harbor.supwisdom.com/admin-center/api-docs-installer:1.2.0-SNAPSHOT
imagePullPolicy: Always
envFrom:
- configMapRef:
- name: poa-api-docs-installer-env
+ name: api-docs-installer-env
# resources:
# requests:
# memory: "256Mi"
diff --git a/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/2.admin-platform-ingresses.yaml b/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/2.admin-platform-ingresses.yaml
index 5b699cc..fce10fb 100644
--- a/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/2.admin-platform-ingresses.yaml
+++ b/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/2.admin-platform-ingresses.yaml
@@ -35,21 +35,3 @@
backend:
serviceName: admin-platform-svc
servicePort: http
-
-
-# ---
-# apiVersion: extensions/v1beta1
-# kind: Ingress
-# metadata:
-# name: personal-center-ingress
-# namespace: admin-platform
-# spec:
-# rules:
-# # 修改为学校的根域名
-# - host: personal-center.paas.supwisdom.com
-# http:
-# paths:
-# - path: /
-# backend:
-# serviceName: personal-center-svc
-# servicePort: http
diff --git a/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/4.1.admin-management.yaml b/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/4.1.admin-management.yaml
index e46165b..a5d76f1 100644
--- a/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/4.1.admin-management.yaml
+++ b/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/4.1.admin-management.yaml
@@ -12,21 +12,21 @@
BACKEND_URL: http://admin-center.paas.xxx.edu.cn
# 可选 jwt-cas，idToken-cas，uniauth
- AUTH_TYPE: uniauth
+ AUTH_TYPE: idToken-cas
- # AUTH_TYPE 为 jwt-cas 时，配置 AUTH_URL
- AUTH_URL: http://admin-center.paas.xxx.edu.cn/jwt/cas
-
- # AUTH_TYPE 为 uniauth 时，配置
- UNIAUTH_IDTOKEN: http://uniauth.paas.xxx.edu.cn/idtoken
- UNIAUTH_IDTOKEN_ISS: "uniauth"
- UNIAUTH_CLIENT_ID: "20"
+ # # AUTH_TYPE 为 jwt-cas 时，配置 AUTH_URL
+ # AUTH_URL: http://admin-center.paas.xxx.edu.cn/jwt/cas
# AUTH_TYPE 为 idToken-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
JWT_SECRET: (@<rhnPaUYKC_k770*DuWwYQ_#Zc#8c(2rB?kae)rN)>K7qy)awCjxp$L653Mf$2
+ # # AUTH_TYPE 为 uniauth 时，配置
+ # UNIAUTH_IDTOKEN: http://uniauth.paas.xxx.edu.cn/idtoken
+ # UNIAUTH_IDTOKEN_ISS: "uniauth"
+ # UNIAUTH_CLIENT_ID: "20"
+
---
apiVersion: v1
diff --git a/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/4.2.admin-platform.yaml b/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/4.2.admin-platform.yaml
index a48c208..9470986 100644
--- a/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/4.2.admin-platform.yaml
+++ b/deploy-manifests/k8s-rancher/6.admin-platform/7.admin-platform/4.2.admin-platform.yaml
@@ -12,15 +12,22 @@
RESOURCE_PREFIX: http://authx-minio.paas.xxx.edu.cn/admin-platform
- # jwt-cas, idToken-cas, uniauth，默认 jwt-cas
- AUTH_TYPE: "idToken-cas"
+ # 可选 jwt-cas，idToken-cas，uniauth
+ AUTH_TYPE: idToken-cas
- # AUTH_TYPE 为 idToken-cas 有效
+ # # AUTH_TYPE 为 jwt-cas 时，配置 ADMIN_CENTER_AUTH_URL
+ # ADMIN_CENTER_AUTH_URL: http://admin-center.paas.xxx.edu.cn/jwt/cas
+
+ # AUTH_TYPE 为 idToken-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
-
JWT_SECRET: (@<rhnPaUYKC_k770*DuWwYQ_#Zc#8c(2rB?kae)rN)>K7qy)awCjxp$L653Mf$2
+ # # AUTH_TYPE 为 uniauth 时，配置
+ # UNIAUTH_IDTOKEN: http://uniauth.paas.xxx.edu.cn/idtoken
+ # UNIAUTH_IDTOKEN_ISS: "uniauth"
+ # UNIAUTH_CLIENT_ID: "21"
+
---
apiVersion: v1
kind: ConfigMap
@@ -29,7 +36,8 @@
name: admin-platform-server-config-env
data:
ADMIN_PLATFORM_SERVER_URL: https://admin-platform.paas.xxx.edu.cn/
- ADMIN_CENTER_AUTH_URL: https://admin-center.paas.xxx.edu.cn/jwt/cas
+
+ ADMIN_CENTER_AUTH_URL: http://admin-center.paas.xxx.edu.cn/jwt/cas
ADMIN_CENTER_BACK_API_PREFIX: https://admin-center.paas.xxx.edu.cn/
PERSONAL_CENTER_SERVER_URL: https://admin-platform.paas.xxx.edu.cn/personal-center/
@@ -72,11 +80,11 @@
# DEVELOPER_CENTER_JWT_SECRET: (@<rhnPaUYKC_k770*DuWwYQ_#Zc#8c(2rB?kae)rN)>K7qy)awCjxp$L653Mf$2
- DS_VUE_APP_AUTH_TYPE: jwt-cas
- DS_VUE_APP_AUTH_TYPE_LOGIN_URL: http://ds.paas.xxx.edu.cn/gateway/jwt/token/login
- DS_VUE_APP_AUTH_TYPE_CAS_URL: http://ds.paas.xxx.edu.cn/gateway/jwt/cas
- DS_VUE_APP_DOCUMENT_API: http://ds.paas.xxx.edu.cn/gateway/api/agent/document
- DS_VUE_APP_SYSTEM_API: http://ds.paas.xxx.edu.cn/gateway/api/agent/system
+ # VUE_APP_AUTH_TYPE: jwt-cas
+ # VUE_APP_AUTH_TYPE_LOGIN_URL: http://ds.paas.xxx.edu.cn/gateway/jwt/token/login
+ # VUE_APP_AUTH_TYPE_CAS_URL: http://ds.paas.xxx.edu.cn/gateway/jwt/cas
+ # VUE_APP_DOCUMENT_API: http://ds.paas.xxx.edu.cn/gateway/api/agent/document
+ # VUE_APP_SYSTEM_API: http://ds.paas.xxx.edu.cn/gateway/api/agent/system
# {
@@ -121,6 +129,8 @@
data:
LAYOUT_SPA_URL: https://admin-platform.paas.xxx.edu.cn/layout
+ ADMIN_MGT_SPA_URL: ""
+
CAS_SERVER_SPA_URL: https://admin-platform.paas.xxx.edu.cn/cas-server
USER_SERVER_SPA_URL: https://admin-platform.paas.xxx.edu.cn/user-server
AUTH_SERVER_SPA_URL: https://admin-platform.paas.xxx.edu.cn/auth-server
@@ -132,6 +142,7 @@
FORM_FLOW_SPA_TEST_URL: ""
MESSAGE_BACKSTAGE_SPA_URL: https://admin-platform.paas.xxx.edu.cn/message-backstage
+ ADDRESS_BOOK_SPA_URL: ""
PORTAL_ADMIN_SPA_URL: https://portal-admin.paas.xxx.edu.cn
@@ -143,6 +154,12 @@
MEETING_RESERVATION_SPA_URL: ""
+ # 数据资产
+ DATAASSETS_SPA_URL: ""
+
+ # 数据填报
+ DATA_FILLING_SPA_URL: ""
+
---
apiVersion: v1
@@ -180,7 +197,7 @@
containers:
- name: admin-platform
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/admin-platform/admin-platform:1.0.6-SNAPSHOT
+ image: harbor.supwisdom.com/admin-platform/admin-platform:1.2.0-SNAPSHOT
imagePullPolicy: Always
ports:
- containerPort: 80
@@ -189,9 +206,9 @@
- configMapRef:
name: admin-platform-env
- configMapRef:
- name: admin-platform-server-config-env
- - configMapRef:
name: admin-platform-spa-env
+ - configMapRef:
+ name: admin-platform-server-config-env
resources:
requests:
memory: "128Mi"