From: 刘洪青 <loie.engine@gmail.com>
Date: Sat, 12 Sep 2020 15:24:30 +0000 (+0800)
Subject: chore: 整理个人中心部署脚本，升级个人中心部署镜像 1.0.3-SNAPSHOT
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=5f8aff1b88007006515c463a20cc3ea4ab5cffa8;p=institute%2Fdeploy-authx-service.git

chore: 整理个人中心部署脚本，升级个人中心部署镜像 1.0.3-SNAPSHOT
---

diff --git a/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.4.personal-security-center-bff.yaml b/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.4.personal-security-center-bff.yaml
index dc93b54..c60604d 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.4.personal-security-center-bff.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.4.personal-security-center-bff.yaml
@@ -126,7 +126,7 @@ data:
   #PERSONAL_SECURITY_CENTER_SA_API_CLIENT_AUTH_TRUSTSTORE_PASSWORD: ""
 
 
-  TPAS_FILE_API_URL: http://agent-service-svc.thirdparty-agent-service.svc.cluster.local:8080/api/v1/tpas/file/db
+  TPAS_FILE_API_URL: http://agent-service-svc.thirdparty-agent-service.svc.cluster.local:8080/api/v1/tpas/file/minio
   TPAS_MAIL_API_URL: http://agent-service-svc.thirdparty-agent-service.svc.cluster.local:8080/api/v1/tpas/mail/smtp
   TPAS_SMS_API_URL: http://agent-service-svc.thirdparty-agent-service.svc.cluster.local:8080/api/v1/tpas/sms/console
   TPAS_CLIENT_AUTH_ENABLED: "false"
@@ -197,7 +197,7 @@ spec:
       containers:
       - name: personal-security-center-bff
         # 若使用了学校搭设的私有仓库，请修改
-        image: harbor.supwisdom.com/personal-security-center/personal-security-bff:1.0.2-SNAPSHOT
+        image: harbor.supwisdom.com/personal-security-center/personal-security-bff:1.0.3-SNAPSHOT
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
@@ -217,9 +217,9 @@ spec:
             name: personal-security-center-bff-template-env
         resources:
           requests:
-            memory: "400Mi"
+            memory: "512Mi"
           limits:
-            memory: "400Mi"
+            memory: "512Mi"
         readinessProbe:
           httpGet:
             path: /actuator/health
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.5.personal-security-center-zuul.yaml b/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.5.personal-security-center-zuul.yaml
index edd1b43..2dca8d6 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.5.personal-security-center-zuul.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.5.personal-security-center-zuul.yaml
@@ -24,6 +24,11 @@ data:
   LOGGING_LEVEL_COM_SUPWISDOM_INSTITUTE_PERSONAL_SECURITY_CENTER: INFO
 
 
+  SPRING_REDIS_JEDIS_POOL_MAXACTIVE: "800"
+  SPRING_REDIS_JEDIS_POOL_MAXIDLE: "100"
+  SPRING_REDIS_JEDIS_POOL_MINIDLE: "100"
+
+
   ZUUL_HOST_MAX_PER_ROUTE_CONNECTIONS: "1000"
   ZUUL_HOST_MAX_TOTAL_CONNECTIONS: "1000"
 
@@ -48,7 +53,7 @@ data:
   #INFRAS_SECURITY_JWT_KEY_STORE_PASSWORD: "changeit"
 
   INFRAS_SECURITY_JWT_TOKEN_GENERATE_TYPE: cas
-  INFRAS_SECURITY_JWT_TOKEN_DECRYPT_KEY_PRIVATE_KEY_PEM_PKCS8: ""
+  #INFRAS_SECURITY_JWT_TOKEN_DECRYPT_KEY_PRIVATE_KEY_PEM_PKCS8: ""
   INFRAS_SECURITY_JWT_TOKEN_SIGNING_KEY_URL: "http://cas-server-site-webapp-svc.cas-server.svc.cluster.local:8080/cas/jwt/publicKey"
 
 
@@ -137,7 +142,7 @@ spec:
       containers:
       - name: personal-security-center-zuul
         # 若使用了学校搭设的私有仓库，请修改
-        image: harbor.supwisdom.com/personal-security-center/personal-security-zuul:1.0.2-SNAPSHOT
+        image: harbor.supwisdom.com/personal-security-center/personal-security-zuul:1.0.3-SNAPSHOT
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
@@ -147,15 +152,17 @@ spec:
         envFrom:
         - configMapRef:
             name: jvm-env
+        - secretRef:
+            name: redis-env-secret
         - secretRef:
             name: personal-security-center-zuul-env-secret
         - configMapRef:
             name: personal-security-center-zuul-env
         resources:
           requests:
-            memory: "400Mi"
+            memory: "512Mi"
           limits:
-            memory: "400Mi"
+            memory: "512Mi"
         readinessProbe:
           httpGet:
             path: /actuator/health