chore: nwpu 升级1.2
diff --git a/project/nwpu/k8s-rancher/6.admin-platform/6.admin-center/9.api-docs-installer.yaml b/project/nwpu/k8s-rancher/6.admin-platform/6.admin-center/9.api-docs-installer.yaml
index 10f1593..3fb62ea 100644
--- a/project/nwpu/k8s-rancher/6.admin-platform/6.admin-center/9.api-docs-installer.yaml
+++ b/project/nwpu/k8s-rancher/6.admin-platform/6.admin-center/9.api-docs-installer.yaml
@@ -12,10 +12,10 @@
##
# 平台OpenAPI的外网访问地址，
# **修改** 学校的根域名
- POA_SERVER_URL: http://poa.paas.nwpu.edu.cn
+ POA_SERVER_URL: https://poa.nwpu.edu.cn
# **修改** poa-sa 服务的k8s内部地址
- POA_SA_SERVER_URL: http://platform-openapi-sa.poa.svc.cluster.local:8443
+ 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
diff --git a/project/nwpu/k8s-rancher/6.admin-platform/7.admin-platform/4.2.admin-platform.yaml b/project/nwpu/k8s-rancher/6.admin-platform/7.admin-platform/4.2.admin-platform.yaml
index 5221dba..3ec6a49 100644
--- a/project/nwpu/k8s-rancher/6.admin-platform/7.admin-platform/4.2.admin-platform.yaml
+++ b/project/nwpu/k8s-rancher/6.admin-platform/7.admin-platform/4.2.admin-platform.yaml
@@ -8,18 +8,18 @@
name: admin-platform-env
data:
SCHOOL_NAME: nwpu
- MAIN_SERVER: http://admin-platform.paas.nwpu.edu.cn
+ MAIN_SERVER: https://admin-platform.nwpu.edu.cn
- RESOURCE_PREFIX: "http://admin-platform.paas.nwpu.edu.cn"
+ # RESOURCE_PREFIX: "http://admin-platform.paas.nwpu.edu.cn"
# RESOURCE_PREFIX: http://authx-minio.paas.nwpu.edu.cn/admin-platform
# SERVER_CONFIG, none 本地 serverConfig.json ， remote 使用远程服务 jsonp ， JSON对象 如 {}
- SERVER_CONFIG: none
- # SERVER_CONFIG: remote
+ # SERVER_CONFIG: none
+ SERVER_CONFIG: remote
# SERVER_CONFIG: {"ROOT": "https://admin-platform.dev.supwisdom.com/","AUTH": "https://admin-center-dev.supwisdom.com/jwt/cas","BASE_BACK_API": "https://admin-center-dev.supwisdom.com/","AUTH_PERSONAL": "https://personal-security-center-dev.supwisdom.com/jwt/cas","PERSONAL_CENTER_API": "https://personal-security-center-dev.supwisdom.com/","PERSONAL_CENTER": "https://admin-platform.dev.supwisdom.com/personal-center/","ACCOUNT_CENTER": "https://personal-center.dev.supwisdom.com/","ADMIN_CENTER": "http://101.231.81.202:9705/","USER_CENTER": "http://101.231.81.202:9704/","AUTHORISATION_CENTER": "http://localhost:9530/","AUTH_FORMFLOW": "http://formflow.supwisdom.com/release/cas/authen/redirect","FLOW_DESIGN": "http://101.231.81.202:9709","FORM_CENTER": "http://101.231.81.202:9715","FORM_CENTER_PROD": "http://101.231.81.202:9872","FORM_DESIGN": "http://formflow.supwisdom.com/form-design","FORM_DESIGN_PORTAL": "http://formflow.supwisdom.com/form-design-portal","FORM_FILE": "http://formflow.supwisdom.com/form-file","DATA_SERVER": "http://101.231.81.202:9820/","DATA_SERVER_HF": "http://192.168.0.27:5030/","DATA_SERVER_INIT": "http://192.168.0.32:5030/","PERSONAL_CENTER_API_L": "https://test-p.supwisdom.com/portal-web/","PERSONAL_CENTER_IMAGE_API": "https://dev-p.supwisdom.com/resources/",}
# SERVER_CONFIG 为 remote，以下配置有效
- CONFIG_SERVER_URL: http://admin-platform.paas.nwpu.edu.cn/config-server
+ CONFIG_SERVER_URL: https://admin-platform.nwpu.edu.cn/config-server
# SERVER_CONFIG 为 none，配置 admin-platform-server-config-env 有效
@@ -141,48 +141,59 @@
namespace: admin-platform
name: admin-platform-spa-env
data:
- LAYOUT_SPA_URL: http://admin-platform.paas.nwpu.edu.cn/layout
+ LAYOUT_SPA_URL: https://admin-platform.nwpu.edu.cn/layout-spa
# ADMIN_MGT_SPA_URL: "http://admin-management.paas.nwpu.edu.cn"
- CAS_SERVER_SPA_URL: http://admin-platform.paas.nwpu.edu.cn/cas-server-spa
- USER_SERVER_SPA_URL: http://admin-platform.paas.nwpu.edu.cn/user-server-spa
- AUTH_SERVER_SPA_URL: http://admin-platform.paas.nwpu.edu.cn/auth-server-spa
+ CAS_SERVER_SPA_URL: https://admin-platform.nwpu.edu.cn/cas-server-spa
+ USER_SERVER_SPA_URL: https://admin-platform.nwpu.edu.cn/user-server-spa
+ AUTH_SERVER_SPA_URL: https://admin-platform.nwpu.edu.cn/auth-server-spa
- ACCOUNT_CENTER_SPA_URL: http://admin-platform.paas.nwpu.edu.cn/account-center-spa
+ ACCOUNT_CENTER_SPA_URL: https://admin-platform.nwpu.edu.cn/account-center-spa
- FORM_FLOW_SPA_URL: http://admin-platform.paas.nwpu.edu.cn/form-flow-spa
+ FORM_FLOW_SPA_URL: https://admin-platform.nwpu.edu.cn/form-flow-spa
FORM_FLOW_SPA_ZZU_URL: ""
FORM_FLOW_SPA_TEST_URL: ""
- MESSAGE_BACKSTAGE_SPA_URL: http://admin-platform.paas.nwpu.edu.cn/message-backstage-spa
- ADDRESS_BOOK_SPA_URL: http://admin-platform.paas.nwpu.edu.cn/address-book-spa
+ MESSAGE_BACKSTAGE_SPA_URL: https://message-service.nwpu.edu.cn/admin
+ # ADDRESS_BOOK_SPA_URL: https://admin-platform.paas.nwpu.edu.cn/address-book-spa
- PORTAL_ADMIN_SPA_URL: http://portal-admin-test.paas.nwpu.edu.cn
+ PORTAL_ADMIN_SPA_URL: https://portal-admin.nwpu.edu.cn
- DEVELOPER_CENTER_SPA_URL: http://open.paas.nwpu.edu.cn/dev-admin
+ DEVELOPER_CENTER_SPA_URL: https://dev-portal.nwpu.edu.cn/dev-admin
# INFO_STANDARD_SPA_URL: https://admin-platform.paas.xxx.edu.cn/info_standard
- # BOOK_CATALOG_MANAGEMENT_SPA_URL: ""
+ BOOK_CATALOG_MANAGEMENT_SPA_URL: https://book-search.nwpu.edu.cn/book-catalog-management
# MEETING_RESERVATION_SPA_URL: ""
# 数据资产
- DATAASSETS_SPA_URL: ""
+ # DATAASSETS_SPA_URL: ""
# 数据填报
- DATA_FILLING_SPA_URL: ""
+ # DATA_FILLING_SPA_URL: ""
- FORM_FLOW_PROD_SPA_URL: http://admin-platform.paas.nwpu.edu.cn/form-flow-prod-spa
+ # FORM_FLOW_PROD_SPA_URL: https://admin-platform.paas.nwpu.edu.cn/form-flow-prod-spa
- MEETING_RESERVATION_BACKEND_GZ_SPA_URL: http://admin-platform.paas.nwpu.edu.cn/user-server-spa
+ # MESSAGE_PROD_SPA_URL: https://admin-platform.paas.nwpu.edu.cn/message-prod-spa
- MESSAGE_PROD_SPA_URL: http://admin-platform.paas.nwpu.edu.cn/message-prod-spa
+ PORTAL_ADMIN1_SPA_URL: https://portal-admin.nwpu.edu.cn
- NEW_MEETING_RESERVATION_BACKEND_SPA_URL: https://second-meeting.paas.nwpu.edu.cn/new-meeting-reservation
- PORTAL_ADMIN1_SPA_URL: http://portal-admin-pro.paas.nwpu.edu.cn
+ HOTEL_RESERVATION_MANAGE_SPA_URL: https://flat-reservation.nwpu.edu.cn/hotel-reservation-manage
+
+ MEETING_RESERVATION_BACKEND_GZ_SPA_URL: https://meeting-reservation-gz1.nwpu.edu.cn/meeting-gz
+
+ MEETING_RESERVATION_BACKEND_SPA_URL: https://art-reservation1.nwpu.edu.cn/meeting-reservation
+
+ NEW_MEETING_RESERVATION_BACKEND_SPA_URL: https://art-reservation.nwpu.edu.cn/new-meeting-reservation
+
+ STUDY_CENTER_MANAGEMENT_SPA_URL: https://study-center.nwpu.edu.cn/study-center-management
+
+ USER_QUERY_SPA_URL: https://user-query.nwpu.edu.cn/
+
+
---
apiVersion: v1
@@ -220,7 +231,7 @@
containers:
- name: admin-platform
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/admin-platform/admin-platform:1.2.3-RELEASE
+ image: paas.harbor.nwpu.edu.cn/admin-platform/admin-platform:1.2.3-RELEASE
imagePullPolicy: Always
ports:
- containerPort: 80