feat: opt website domain

packages/gateway-controller/src/support/apisix-gateway-init.ts

@@ -111,15 +111,11 @@ function initOssSubDomainRoute() {
             type: 'roundrobin',
             nodes: {'oss:9000': 1}
         },
+        priority: 0,
         timeout: {
             connect: 600,
             send: 600,
             read: 600,
-        },
-        plugins: {
-            'proxy-rewrite': {
-                regex_uri: ["/$", "/index.html"]
-            }
         }
     }
     ApiSixHttpUtils.put(baseUrl, 'base_oss_sub_domain', data)

packages/gateway-controller/src/support/apisix-gateway.ts

@@ -2,6 +2,7 @@ import {GatewayInterface} from "./gateway-operator";
 import {IRouteData, RouteType} from "./route";
 import Config from "../config";
 import {ApiSixHttpUtils} from "./apisix-gateway-utils";
+import {logger} from "./logger";
 
 export class ApiSixGateway implements GatewayInterface {
 
@@ -17,16 +18,16 @@ export class ApiSixGateway implements GatewayInterface {
     public async create(route: IRouteData) {
         if (route.type === RouteType.APP) {
             return await createAppRoute(this.baseUrl, route)
-        } else if (route.type === RouteType.WEBSITE_CUSTOM) {
-            return await createWebsiteCustomRoute(this.baseUrl, route)
+        } else if (route.type === RouteType.WEBSITE) {
+            return await createWebsiteRoute(this.baseUrl, route)
         }
     }
 
     public async delete(route: IRouteData) {
         if (route.type === RouteType.APP) {
             return await deleteAppRoute(this.baseUrl, route)
-        } else if (route.type === RouteType.WEBSITE_CUSTOM) {
-            return await deleteWebsiteCustomRoute(this.baseUrl, route)
+        } else if (route.type === RouteType.WEBSITE) {
+            return await deleteWebsiteRoute(this.baseUrl, route)
         }
     }
 
@@ -69,24 +70,33 @@ async function deleteAppRoute(url: string, route: IRouteData) {
 }
 
 
-async function createWebsiteCustomRoute(url: string, route: IRouteData) {
-    if (route.domain.length !== 2) {
+async function createWebsiteRoute(url: string, route: IRouteData) {
+    if (route.domain.length <= 0) {
+        logger.warn('website: {} domain list is empty')
         return false
     }
-    let hosts = null, node = null
+    let host = null, node = null
     if (Config.SERVICE_DRIVER == 'docker') {
-        hosts = route.domain[0]
+        host = route.domain[0]
         node = 'oss:9000'
     }
 
+    let upstream_host = null
+    if (route.domain.length > 1) {
+        upstream_host = route.domain[1]
+    } else {
+        upstream_host = route.domain[0]
+
+    }
+
     let data = {
         name: route.name,
         uri: '/*',
-        hosts: hosts,
+        hosts: [host],
         priority: 9, // 设置优先级较高点
         upstream: {
             pass_host: 'rewrite',
-            upstream_host: route.domain[1] + '.' + Config.DEPLOY_OSS_DOMAIN,
+            upstream_host: upstream_host,
             type: 'roundrobin',
             nodes: {
                 [node]: 1
@@ -106,6 +116,6 @@ async function createWebsiteCustomRoute(url: string, route: IRouteData) {
     return await ApiSixHttpUtils.put(url, route.website_id, data)
 }
 
-async function deleteWebsiteCustomRoute(url: string, route: IRouteData) {
+async function deleteWebsiteRoute(url: string, route: IRouteData) {
     return await ApiSixHttpUtils.delete(url, route.website_id)
 }

packages/gateway-controller/src/support/route.ts

@@ -13,7 +13,7 @@ export enum RouteStatus {
 
 export enum RouteType {
     APP = 'app',
-    WEBSITE_CUSTOM = 'website_custom'
+    WEBSITE = 'website'
 }
 
 

packages/system-server/src/handler/website/domain-bind.ts

@@ -6,7 +6,7 @@ import { checkPermission } from "../../support/permission"
 import { IApplicationData } from "../../support/application"
 import { DatabaseAgent } from "../../db"
 import { WebsiteActionDef } from "../../actions"
-import {createWebsiteCustomRoute} from "../../support/route";
+import {createWebsiteRoute} from "../../support/route";
 
 
 /**
@@ -71,8 +71,8 @@ export async function handleBindDomain(req: Request, res: Response) {
       $push: { domain: domain }
     }
   )
-  const domainList = [domain, website.appid + '-' + website.bucket_name]
-  const rt = await createWebsiteCustomRoute('website-custom', app.appid, website_id, domainList, uid)
+  const domainList = [domain, website.cname]
+  const rt = await createWebsiteRoute('website-custom', app.appid, website_id, domainList, uid)
   if (!rt) {
       return res.send({ code: 'ROUTE CREATE FAILED', error: "route create failed" })
   }

packages/system-server/src/handler/website/website-create.ts

@@ -6,6 +6,7 @@ import { checkPermission } from "../../support/permission"
 import { URL } from "node:url"
 import Config from "../../config"
 import { WebsiteActionDef } from "../../actions"
+import {createWebsiteRoute} from "../../support/route";
 
 /**
  * handle create website hosting
@@ -69,6 +70,12 @@ export async function handleCreateWebsite(req: Request, res: Response) {
     return res.status(500).send("insert failed")
   }
 
+  const domainList = [cname]
+  const rt = await createWebsiteRoute('website-custom', app.appid, result.insertedId.toString(), domainList, uid)
+  if (!rt) {
+    return res.send({ code: 'ROUTE CREATE FAILED', error: "route create failed" })
+  }
+
   // return data
   res.send({
     data: { id: result.insertedId }

packages/system-server/src/handler/website/website-delete.ts

@@ -5,6 +5,7 @@ import { IApplicationData } from "../../support/application"
 import { checkPermission } from "../../support/permission"
 import { ObjectId } from 'mongodb'
 import { WebsiteActionDef } from '../../actions'
+import {deleteWebsiteRoute} from "../../support/route";
 
 /**
  * handle delete website
@@ -42,5 +43,9 @@ export async function handleDeleteWebsite(req: Request, res: Response) {
     { _id: new ObjectId(id), appid: app.appid },
     { $set: { status: "deleted", state: "pending", updated_at: new Date() } }
   )
+  const rt = await deleteWebsiteRoute(app.appid, id)
+  if (!rt) {
+    return res.send({ code: 'ROUTE DELETE FAILED', error: "route delete failed" })
+  }
   return res.send({ data: r.modifiedCount })
 }

packages/system-server/src/support/route.ts

@@ -14,7 +14,7 @@ export enum RouteStatus {
 
 export enum RouteType {
     APP = 'app',
-    WEBSITE_CUSTOM = 'website_custom'
+    WEBSITE = 'website'
 }
 
 
@@ -70,7 +70,7 @@ export async function deleteApplicationRoute(appid: string) {
 }
 
 
-export async function createWebsiteCustomRoute(name: string, appid: string, websiteId: string, domain: string[], uid: any): Promise<Boolean> {
+export async function createWebsiteRoute(name: string, appid: string, websiteId: string, domain: string[], uid: any): Promise<Boolean> {
     const route = await DatabaseAgent.db.collection(CN_ROUTES).findOne({
         appid: appid,
         websiteId: websiteId
@@ -96,7 +96,7 @@ export async function createWebsiteCustomRoute(name: string, appid: string, webs
         let data: IRouteData = {
             name: name,
             appid: appid,
-            type: RouteType.WEBSITE_CUSTOM,
+            type: RouteType.WEBSITE,
             website_id: websiteId,
             domain: domain,
             status: RouteStatus.PREPARED_CREATE,
@@ -115,7 +115,7 @@ export async function createWebsiteCustomRoute(name: string, appid: string, webs
     return true
 }
 
-export async function deleteWebsiteCustomRoute(appid: string, websiteId: string) {
+export async function deleteWebsiteRoute(appid: string, websiteId: string) {
     const ret = await DatabaseAgent.db.collection<IRouteData>(CN_ROUTES)
         .updateOne({
             appid: appid,