diff --git a/deploy-scripts/.env b/deploy-scripts/.env index 66ca310f78..2c181062d4 100644 --- a/deploy-scripts/.env +++ b/deploy-scripts/.env @@ -10,8 +10,9 @@ SYS_DB_PASSWORD=password123 SYS_SERVER_SECRET_SALT=system-server-abcdefg1234567 # exposed port of laf services -PUBLISH_PORT=8080 +PUBLISH_PORT=80 # `*.local-dev.host` always resolved to 127.0.0.1, just for local development # Replace it with your own domain which should be resolved(*.domain.com) to your server ip -DEPLOY_DOMAIN=local-dev.host \ No newline at end of file +DEPLOY_DOMAIN=*.local-dev.host +SYS_CLIENT_HOST=console.local-dev.host \ No newline at end of file diff --git a/deploy-scripts/docker-compose.yml b/deploy-scripts/docker-compose.yml index 47a454e447..8bc0024bbc 100644 --- a/deploy-scripts/docker-compose.yml +++ b/deploy-scripts/docker-compose.yml @@ -54,7 +54,7 @@ services: - mongo environment: DEPLOY_DOMAIN: ${DEPLOY_DOMAIN:?err} - SYS_CLIENT_HOST: console.${DEPLOY_DOMAIN:?err} + SYS_CLIENT_HOST: ${SYS_CLIENT_HOST:?err} ports: - ${PUBLISH_PORT:-8080}:80 networks: diff --git a/docker-compose.yml b/docker-compose.yml index 1451b58889..c2d3ba051f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -58,7 +58,7 @@ services: - mongo - system_server environment: - DEPLOY_DOMAIN: local-dev.host # `*.local-dev.host` always resolved to 127.0.0.1, used to local development + DEPLOY_DOMAIN: "*.local-dev.host" # `*.local-dev.host` always resolved to 127.0.0.1, used to local development SYS_CLIENT_HOST: console.local-dev.host volumes: - ./packages/system-client/dist:/app diff --git a/lerna.json b/lerna.json index e649f8a6dc..946d5f275b 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.5.4-alpha.0", + "version": "0.5.4", "command": { "publish": { "ignoreChanges": [ diff --git a/packages/app-service/package-lock.json b/packages/app-service/package-lock.json index f32a763af2..2a258d2962 100644 --- a/packages/app-service/package-lock.json +++ b/packages/app-service/package-lock.json @@ -5,12 +5,12 @@ "requires": true, "packages": { "": { - "version": "0.5.3", + "version": "0.5.4-alpha.0", "dependencies": { "ali-oss": "^6.16.0", "axios": "^0.21.1", "body-parser": "^1.19.0", - "cloud-function-engine": "^0.4.3", + "cloud-function-engine": "^0.5.4-alpha.0", "dayjs": "^1.10.6", "dotenv": "^8.2.0", "ejs": "^3.1.6", @@ -554,9 +554,9 @@ } }, "node_modules/cloud-function-engine": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/cloud-function-engine/-/cloud-function-engine-0.4.3.tgz", - "integrity": "sha512-wvby1FmnDzxcbXt4hTs1YJ4qWubDsIq/maXE3rsUnPVxtnhW0+E/pLDsHrdgJ1/NciAmPyVRko/4JmXy/PaaUg==", + "version": "0.5.4-alpha.0", + "resolved": "https://registry.npmjs.org/cloud-function-engine/-/cloud-function-engine-0.5.4-alpha.0.tgz", + "integrity": "sha512-OPufnnfbwFyOTibW4LEFXaXm9Cn6AC9TlcIcyBJQnOxRFjRXW6MOeQ7PGR+ZGgM+I+6OdFph5OK8NVfYaAntVw==", "dependencies": { "moment": "^2.29.1", "typescript": "^4.2.3" @@ -3278,9 +3278,9 @@ } }, "cloud-function-engine": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/cloud-function-engine/-/cloud-function-engine-0.4.3.tgz", - "integrity": "sha512-wvby1FmnDzxcbXt4hTs1YJ4qWubDsIq/maXE3rsUnPVxtnhW0+E/pLDsHrdgJ1/NciAmPyVRko/4JmXy/PaaUg==", + "version": "0.5.4-alpha.0", + "resolved": "https://registry.npmjs.org/cloud-function-engine/-/cloud-function-engine-0.5.4-alpha.0.tgz", + "integrity": "sha512-OPufnnfbwFyOTibW4LEFXaXm9Cn6AC9TlcIcyBJQnOxRFjRXW6MOeQ7PGR+ZGgM+I+6OdFph5OK8NVfYaAntVw==", "requires": { "moment": "^2.29.1", "typescript": "^4.2.3" diff --git a/packages/cloud-function-engine/package-lock.json b/packages/cloud-function-engine/package-lock.json index 3a0746b18a..ee746a7e39 100644 --- a/packages/cloud-function-engine/package-lock.json +++ b/packages/cloud-function-engine/package-lock.json @@ -5,7 +5,7 @@ "requires": true, "packages": { "": { - "version": "0.4.3", + "version": "0.5.4-alpha.0", "license": "ISC", "dependencies": { "moment": "^2.29.1", diff --git a/packages/system-client/nginx.conf b/packages/system-client/nginx.conf index 189d28f86f..00776a81d7 100644 --- a/packages/system-client/nginx.conf +++ b/packages/system-client/nginx.conf @@ -32,8 +32,7 @@ server { # for app service server { listen 80; - # server_name ~^ "(\w{8}(-\w{4}){3}-\w{12})\.(.+)$"; - server_name *.${DEPLOY_DOMAIN}; + server_name ${DEPLOY_DOMAIN}; client_max_body_size 0; location / { diff --git a/packages/system-client/package-lock.json b/packages/system-client/package-lock.json index fe87db0c5a..58c78c675b 100644 --- a/packages/system-client/package-lock.json +++ b/packages/system-client/package-lock.json @@ -1,11 +1,11 @@ { "name": "system-client", - "version": "0.5.4-alpha.0", + "version": "0.5.4", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "0.5.3", + "version": "0.5.4-alpha.0", "license": "MIT", "dependencies": { "axios": "^0.21.1", diff --git a/packages/system-client/package.json b/packages/system-client/package.json index 61bd6eed12..bd47165cb2 100644 --- a/packages/system-client/package.json +++ b/packages/system-client/package.json @@ -1,6 +1,6 @@ { "name": "system-client", - "version": "0.5.4-alpha.0", + "version": "0.5.4", "description": "system-client of laf", "author": "Maslow ", "private": true, diff --git a/packages/system-client/src/views/cloudfunction/debug.vue b/packages/system-client/src/views/cloudfunction/debug.vue index a7839346c5..4e974d5086 100644 --- a/packages/system-client/src/views/cloudfunction/debug.vue +++ b/packages/system-client/src/views/cloudfunction/debug.vue @@ -230,7 +230,7 @@ export default { const res = await launchFunction(this.func.name, param, debug_token) .finally(() => { this.loading = false }) - this.invokeRequestId = res.headers['requestId'] + this.invokeRequestId = res.headers['requestid'] await this.getLogByRequestId(this.invokeRequestId) .finally(() => { this.loading = false }) @@ -245,7 +245,7 @@ export default { if (res.data?.length) { this.invokeLogs = res.data[0]?.logs - this.invokeTimeUsage = this.invokeLogs?.time_usage + this.invokeTimeUsage = res.data[0]?.time_usage } }, /** diff --git a/packages/system-server/package-lock.json b/packages/system-server/package-lock.json index 5cec0b8729..cdf2c6bef2 100644 --- a/packages/system-server/package-lock.json +++ b/packages/system-server/package-lock.json @@ -5,10 +5,10 @@ "requires": true, "packages": { "": { - "version": "0.5.2", + "version": "0.5.4-alpha.0", "dependencies": { "body-parser": "^1.19.0", - "cloud-function-engine": "^0.4.3", + "cloud-function-engine": "^0.5.4-alpha.0", "dayjs": "^1.10.6", "dockerode": "^3.3.0", "dotenv": "^8.2.0", @@ -639,9 +639,9 @@ } }, "node_modules/cloud-function-engine": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/cloud-function-engine/-/cloud-function-engine-0.4.3.tgz", - "integrity": "sha512-wvby1FmnDzxcbXt4hTs1YJ4qWubDsIq/maXE3rsUnPVxtnhW0+E/pLDsHrdgJ1/NciAmPyVRko/4JmXy/PaaUg==", + "version": "0.5.4-alpha.0", + "resolved": "https://registry.npmjs.org/cloud-function-engine/-/cloud-function-engine-0.5.4-alpha.0.tgz", + "integrity": "sha512-OPufnnfbwFyOTibW4LEFXaXm9Cn6AC9TlcIcyBJQnOxRFjRXW6MOeQ7PGR+ZGgM+I+6OdFph5OK8NVfYaAntVw==", "dependencies": { "moment": "^2.29.1", "typescript": "^4.2.3" @@ -3185,9 +3185,9 @@ } }, "cloud-function-engine": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/cloud-function-engine/-/cloud-function-engine-0.4.3.tgz", - "integrity": "sha512-wvby1FmnDzxcbXt4hTs1YJ4qWubDsIq/maXE3rsUnPVxtnhW0+E/pLDsHrdgJ1/NciAmPyVRko/4JmXy/PaaUg==", + "version": "0.5.4-alpha.0", + "resolved": "https://registry.npmjs.org/cloud-function-engine/-/cloud-function-engine-0.5.4-alpha.0.tgz", + "integrity": "sha512-OPufnnfbwFyOTibW4LEFXaXm9Cn6AC9TlcIcyBJQnOxRFjRXW6MOeQ7PGR+ZGgM+I+6OdFph5OK8NVfYaAntVw==", "requires": { "moment": "^2.29.1", "typescript": "^4.2.3"