From 2caeb77e6e65f3506cfec914976651257a2760d1 Mon Sep 17 00:00:00 2001
From: shaoqian <764213885@qq.com>
Date: Tue, 9 Aug 2022 15:19:07 +0800
Subject: [PATCH] fix: fix use ssl route

---
 packages/gateway-controller/src/index.ts      | 10 +++++-----
 .../src/support/apisix-gateway-init.ts        | 20 ++++++++++---------
 packages/system-server/src/init.ts            |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/packages/gateway-controller/src/index.ts b/packages/gateway-controller/src/index.ts
index 0702f99955..287124d595 100644
--- a/packages/gateway-controller/src/index.ts
+++ b/packages/gateway-controller/src/index.ts
@@ -1,9 +1,9 @@
 import * as express from 'express'
 import Config from './config'
-import {logger} from './support/logger'
-import {DatabaseAgent} from './support/db'
-import {start_scheduler} from './scheduler'
-import {initBaseRoute, initBaseSSL} from "./support/apisix-gateway-init";
+import { logger } from './support/logger'
+import { DatabaseAgent } from './support/db'
+import { start_scheduler } from './scheduler'
+import { initBaseRoute, initBaseSSL } from "./support/apisix-gateway-init"
 
 DatabaseAgent.init(Config.SYS_DB_URI)
 
@@ -19,7 +19,7 @@ app.get('/healthz', (_req, res) => {
 initBaseRoute()
 
 // init base ssl
-if (Config.APP_SERVICE_DEPLOY_URL_SCHEMA) {
+if (Config.APP_SERVICE_DEPLOY_URL_SCHEMA === 'https') {
     initBaseSSL()
 }
 
diff --git a/packages/gateway-controller/src/support/apisix-gateway-init.ts b/packages/gateway-controller/src/support/apisix-gateway-init.ts
index 21cbce54e7..d2bbbfa4bb 100644
--- a/packages/gateway-controller/src/support/apisix-gateway-init.ts
+++ b/packages/gateway-controller/src/support/apisix-gateway-init.ts
@@ -1,11 +1,11 @@
 /**
  * init base route
  */
-import Config from "../config";
-import {ApiSixHttpUtils} from "./apisix-gateway-utils";
-import {logger} from "./logger";
+import Config from "../config"
+import { ApiSixHttpUtils } from "./apisix-gateway-utils"
+import { logger } from "./logger"
 
-const fs = require('fs');
+const fs = require('fs')
 
 const baseUrl = 'http://gateway:9080'
 
@@ -28,10 +28,12 @@ export async function initBaseSSL() {
         let ssl = await getGlobalSSL()
         if (ssl == null || ssl.validity_end < new Date().getTime() / 1000) {
             initGlobalSSL()
+            initGlobalOssSSL()
         }
         ssl = await getGlobalOssSSL()
         if (ssl == null || ssl.validity_end < new Date().getTime() / 1000) {
             initGlobalSSL()
+            initGlobalOssSSL()
         }
     }, 1000 * 60 * 60 * 24)
 
@@ -45,7 +47,7 @@ function initSystemClientRoute() {
         hosts: [Config.SYS_CLIENT_HOST],
         upstream: {
             type: 'roundrobin',
-            nodes: {'system-client:8080': 1}
+            nodes: { 'system-client:8080': 1 }
         },
         priority: 0,
         timeout: {
@@ -64,7 +66,7 @@ function initAppConsoleRoute() {
         hosts: [Config.SYS_CLIENT_HOST],
         upstream: {
             type: 'roundrobin',
-            nodes: {'app-console:8080': 1}
+            nodes: { 'app-console:8080': 1 }
         },
         timeout: {
             connect: 600,
@@ -88,7 +90,7 @@ function initSysApiRoute() {
         hosts: [Config.SYS_CLIENT_HOST],
         upstream: {
             type: 'roundrobin',
-            nodes: {'system-server:9000': 1}
+            nodes: { 'system-server:9000': 1 }
         },
         priority: 9,
         timeout: {
@@ -113,7 +115,7 @@ function initOssRoute() {
         hosts: [Config.DEPLOY_OSS_DOMAIN],
         upstream: {
             type: 'roundrobin',
-            nodes: {'oss:9000': 1}
+            nodes: { 'oss:9000': 1 }
         },
         timeout: {
             connect: 600,
@@ -132,7 +134,7 @@ function initOssSubDomainRoute() {
         hosts: ['*.' + Config.DEPLOY_OSS_DOMAIN],
         upstream: {
             type: 'roundrobin',
-            nodes: {'oss:9000': 1}
+            nodes: { 'oss:9000': 1 }
         },
         priority: 0,
         timeout: {
diff --git a/packages/system-server/src/init.ts b/packages/system-server/src/init.ts
index 375d05972a..4a4242ae7a 100644
--- a/packages/system-server/src/init.ts
+++ b/packages/system-server/src/init.ts
@@ -4,7 +4,7 @@ import { getApplicationByAppid } from "./support/application"
 import { Initializer } from "./support/initializer"
 import Config from "./config"
 import { logger } from "./support/logger"
-import {createApplicationRoute} from "./support/route";
+import { createApplicationRoute } from "./support/route"
 
 
 /**