chore: 整理admin-platform 部署脚本
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 51a377f..a48c208 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,6 +12,10 @@
RESOURCE_PREFIX: http://authx-minio.paas.xxx.edu.cn/admin-platform
+ # jwt-cas, idToken-cas, uniauth，默认 jwt-cas
+ AUTH_TYPE: "idToken-cas"
+
+ # AUTH_TYPE 为 idToken-cas 有效
AUTH_CAS: http://cas.paas.xxx.edu.cn/cas
JWT_ISS: http://cas.paas.xxx.edu.cn/cas
@@ -22,37 +26,6 @@
kind: ConfigMap
metadata:
namespace: admin-platform
- name: admin-platform-spa-env
-data:
- LAYOUT_SPA_URL: https://admin-platform.paas.xxx.edu.cn/layout
-
- 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
-
- ACCOUNT_CENTER_SPA_URL: https://admin-platform.paas.xxx.edu.cn/account-center
-
- FORM_FLOW_SPA_URL: https://admin-platform.paas.xxx.edu.cn/form-flow
- FORM_FLOW_SPA_ZZU_URL: ""
- FORM_FLOW_SPA_TEST_URL: ""
-
- MESSAGE_BACKSTAGE_SPA_URL: https://admin-platform.paas.xxx.edu.cn/message-backstage
-
- PORTAL_ADMIN_SPA_URL: https://portal-admin.paas.xxx.edu.cn
-
- DEVELOPER_CENTER_SPA_URL: https://dev-admin.paas.xxx.edu.cn
-
- INFO_STANDARD_SPA_URL: https://admin-platform.paas.xxx.edu.cn/info_standard
-
- BOOK_CATALOG_MANAGEMENT_SPA_URL: ""
-
- MEETING_RESERVATION_SPA_URL: ""
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- namespace: admin-platform
name: admin-platform-server-config-env
data:
ADMIN_PLATFORM_SERVER_URL: https://admin-platform.paas.xxx.edu.cn/
@@ -63,8 +36,14 @@
PERSONAL_CENTER_AUTH_URL: https://admin-center.paas.xxx.edu.cn/jwt/cas
PERSONAL_CENTER_BACK_API_PREFIX: https://admin-center.paas.xxx.edu.cn/
+ # 个人安全中心
ACCOUNT_CENTER_SERVER_URL: https://security-center.paas.xxx.edu.cn/
+
+ # 云平台基础管理
+ ADMIN_MGT_SERVER_URL: https://admin-platform.paas.xxx.edu.cn
+ ADMIN_MGT_BACKEND_API_PREFIX: https://admin-center.paas.xxx.edu.cn
+ # 流程管理
FORMFLOW_AUTH_URL: https://formflow.paas.xxx.edu.cn/formflow/cas/authen/redirect
FORMFLOW_FORM_DESIGN_SERVER_URL: https://form-design.paas.xxx.edu.cn
FORMFLOW_FLOW_DESIGN_SERVER_URL: https://formflow.paas.xxx.edu.cn/formflow
@@ -72,18 +51,27 @@
FORMFLOW_FORM_CENTER_API_PREFIX: https://admin-center.paas.xxx.edu.cn/api/v1/flow-release
FORMFLOW_FORM_UEDITOR_URL: https://admin-platform.paas.xxx.edu.cn/form-flow/UEditor/
FORMFLOW_SIGNATURE_IMAGE_URL: "该学校的签章图片地址"
-
+
+ # 消息服务
MESSAGE_BACKSTAGE_API_PREFIX: http://message-service.paas.xxx.edu.cn/manager
-
+
+ # 通讯录
+ ADDRESS_BOOK_API_PREFIX: http://address-book.paas.newcapec.cn/manager/
+
+ # 门户
PORTAL_V5_PERSONAL_CENTER_API_L: http://portal.paas.xxx.edu.cn/portal-web/
PORTAL_V5_PERSONAL_CENTER_IMAGE_API: http://portal.paas.xxx.edu.cn/resources/
-
+
+ # 开放平台
DEVELOPER_CENTER_API_PREFIX: http://dev-center.paas.xxx.edu.cn
+ MESSAGE_SERVICE_API_PREFIX: http://message-service.paas.xxx.edu.cn/manager
+
# DEVELOPER_CENTER_AUTH_TYPE: cas
# DEVELOPER_CENTER_AUTH_CAS_SERVER_URL: http://cas.paas.xxx.edu.cn/cas
# DEVELOPER_CENTER_JWT_ISS: http://cas.paas.xxx.edu.cn/cas
# 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
@@ -124,6 +112,37 @@
# "JWT_SECRET": "(@<rhnPaUYKC_k770*DuWwYQ_#Zc#8c(2rB?kae)rN)>K7qy)awCjxp$L653Mf$2"
# }
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ namespace: admin-platform
+ name: admin-platform-spa-env
+data:
+ LAYOUT_SPA_URL: https://admin-platform.paas.xxx.edu.cn/layout
+
+ 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
+
+ ACCOUNT_CENTER_SPA_URL: https://admin-platform.paas.xxx.edu.cn/account-center
+
+ FORM_FLOW_SPA_URL: https://admin-platform.paas.xxx.edu.cn/form-flow
+ FORM_FLOW_SPA_ZZU_URL: ""
+ FORM_FLOW_SPA_TEST_URL: ""
+
+ MESSAGE_BACKSTAGE_SPA_URL: https://admin-platform.paas.xxx.edu.cn/message-backstage
+
+ PORTAL_ADMIN_SPA_URL: https://portal-admin.paas.xxx.edu.cn
+
+ DEVELOPER_CENTER_SPA_URL: https://dev-admin.paas.xxx.edu.cn
+
+ INFO_STANDARD_SPA_URL: https://admin-platform.paas.xxx.edu.cn/info_standard
+
+ BOOK_CATALOG_MANAGEMENT_SPA_URL: ""
+
+ MEETING_RESERVATION_SPA_URL: ""
+
---
apiVersion: v1
@@ -161,7 +180,7 @@
containers:
- name: admin-platform
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/admin-platform/admin-platform:1.0.3-RELEASE
+ image: harbor.supwisdom.com/admin-platform/admin-platform:1.0.6-SNAPSHOT
imagePullPolicy: Always
ports:
- containerPort: 80
@@ -170,9 +189,9 @@
- configMapRef:
name: admin-platform-env
- configMapRef:
- name: admin-platform-spa-env
- - configMapRef:
name: admin-platform-server-config-env
+ - configMapRef:
+ name: admin-platform-spa-env
resources:
requests:
memory: "128Mi"