Merge branch '1.3.x' into 1.4.x
diff --git a/project/nwpu/k8s-rancher/1.authx-service/0.authx-service/1.authx-service-mysql.yaml b/project/nwpu/k8s-rancher/1.authx-service/0.authx-service/1.authx-service-mysql.yaml
index 4b8e83f..1c799d0 100644
--- a/project/nwpu/k8s-rancher/1.authx-service/0.authx-service/1.authx-service-mysql.yaml
+++ b/project/nwpu/k8s-rancher/1.authx-service/0.authx-service/1.authx-service-mysql.yaml
@@ -25,7 +25,7 @@
subsets:
- addresses:
# 修改实际MySQL服务器的IP地址
- - ip: 172.30.104.82
+ - ip: 10.40.10.52
ports:
- name: tcp-mysql
port: 3306
diff --git a/project/nwpu/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml b/project/nwpu/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml
index 4718907..0b20099 100644
--- a/project/nwpu/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml
+++ b/project/nwpu/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml
@@ -34,11 +34,11 @@
- name: DB_TYPE
value: mysql8
- name: JDBC_URL
- value: jdbc:mysql://mysql-server:3306/user_test?serverTimezone=Asia/Shanghai
+ value: jdbc:mysql://mysql-server:3306/user?serverTimezone=Asia/Shanghai
- name: JDBC_USERNAME
- value: user_test
+ value: user
- name: JDBC_PASSWORD
- value: Supwisdom!Nwpu123
+ value: Nwpu@Supwisdom123
envFrom:
- configMapRef:
name: jvm-env
diff --git a/project/nwpu/k8s-rancher/1.authx-service/3.user-authorization-service/4.0.user-authorization-installer.yaml b/project/nwpu/k8s-rancher/1.authx-service/3.user-authorization-service/4.0.user-authorization-installer.yaml
index 6018932..f402cfd 100644
--- a/project/nwpu/k8s-rancher/1.authx-service/3.user-authorization-service/4.0.user-authorization-installer.yaml
+++ b/project/nwpu/k8s-rancher/1.authx-service/3.user-authorization-service/4.0.user-authorization-installer.yaml
@@ -34,11 +34,11 @@
- name: DB_TYPE
value: mysql8
- name: JDBC_URL
- value: jdbc:mysql://mysql-server:3306/user_authz_test?serverTimezone=Asia/Shanghai
+ value: jdbc:mysql://mysql-server:3306/user_authz?serverTimezone=Asia/Shanghai
- name: JDBC_USERNAME
- value: user_authz_test
+ value: user_authz
- name: JDBC_PASSWORD
- value: Supwisdom!Nwpu123
+ value: Nwpu@Supwisdom123
envFrom:
- configMapRef:
name: jvm-env
diff --git a/project/nwpu/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml b/project/nwpu/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml
index fb706e3..debd6ef 100644
--- a/project/nwpu/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml
+++ b/project/nwpu/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml
@@ -34,11 +34,11 @@
- name: DB_TYPE
value: mysql8
- name: JDBC_URL
- value: jdbc:mysql://mysql-server:3306/cas_server_test?serverTimezone=Asia/Shanghai
+ value: jdbc:mysql://mysql-server:3306/cas_server?serverTimezone=Asia/Shanghai
- name: JDBC_USERNAME
- value: cas_server_test
+ value: cas_server
- name: JDBC_PASSWORD
- value: Supwisdom!Nwpu123
+ value: Nwpu@Supwisdom123
envFrom:
- configMapRef:
name: jvm-env
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 3063d89..1772ef5 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,12 +8,11 @@
name: security-center-ui-env
data:
# **修改** 学校的根域名
- # RESOURCE_PREFIX: http://authx-minio.paas.nwpu.edu.cn/security-center-ui
- RESOURCE_PREFIX: ""
+ RESOURCE_PREFIX: "" # http://authx-minio.paas.xxx.edu.cn/security-center-ui
SCHOOL_NAME: "nwpu"
- MAIN_SERVER: http://security-center.paas.nwpu.edu.cn
+ MAIN_SERVER: https://uis.nwpu.edu.cn
- PERSONAL_CENTER_API: http://personal-security-center.paas.nwpu.edu.cn
+ PERSONAL_CENTER_API: https://personal-security-center.nwpu.edu.cn
# 可选 cas，uniauth
AUTH_TYPE: cas
@@ -24,8 +23,8 @@
# UNIAUTH_CLIENT_ID: "22"
# AUTH_TYPE 为 cas 时，配置 AUTH_CAS、JWT_ISS、JWT_SECRET
- AUTH_CAS: http://uis.paas.nwpu.edu.cn/cas
- JWT_ISS: http://uis.paas.nwpu.edu.cn/cas
+ AUTH_CAS: https://uis.nwpu.edu.cn/cas
+ JWT_ISS: https://uis.nwpu.edu.cn/cas
JWT_SECRET: (@<rhnPaUYKC_k770*DuWwYQ_#Zc#8c(2rB?kae)rN)>K7qy)awCjxp$L653Mf$2