Changed to localhost:3001

calvinlang · calvinlang · commit eebb43be401a · 2023-08-25T21:55:57.000+08:00
diff --git a/client/README.md b/client/README.md
@@ -9,7 +9,7 @@
 Simply run below command to start a backend server.
 
 ```bash
-docker run -d --name lowcoder -p 3000:3000 -v "$PWD/stacks:/lowcoder-stacks" lowcoderorg/lowcoder-ce
+docker run -d --name lowcoder -p 3001:3001 -v "$PWD/stacks:/lowcoder-stacks" lowcoderorg/lowcoder-ce
 ```
 
 For more information, view our [docs](../docs/self-hosting)
@@ -26,15 +26,15 @@ docker build -f ./deploy/docker/Dockerfile -t lowcoder-dev .
 3. Start
 
 ```bash
-docker run -d --name lowcoder-dev -p 3000:3000 -v "$PWD/stacks:/lowcoder-stacks" lowcoder-dev
+docker run -d --name lowcoder-dev -p 3001:3001 -v "$PWD/stacks:/lowcoder-stacks" lowcoder-dev
 ```
 
 ### Start develop
 
 1. Check out source code.
 2. Change to client dir in the repository root via cd client.
 3. Run yarn to install dependencies: .
-4. Start dev server: `LOWCODER_API_SERVICE_URL=http://localhost:3000 yarn start`.
+4. Start dev server: `LOWCODER_API_SERVICE_URL=http://localhost:3001 yarn start`.
 5. After dev server starts successfully, it will be automatically opened in the default browser.
 
 ### Before submitting a pull request
diff --git a/client/packages/lowcoder-sdk/vite.config.mts b/client/packages/lowcoder-sdk/vite.config.mts
@@ -54,7 +54,7 @@ export const viteConfig: UserConfig = {
   server: {
     proxy: {
       "/api": {
-        target: "http://localhost:3000",
+        target: "http://localhost:3001",
         changeOrigin: false,
       },
     },
diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile
@@ -3,10 +3,10 @@
 ##
 FROM eclipse-temurin:17-jdk-jammy AS jre-build
 RUN jlink --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.management.rmi,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.se,java.security.jgss,java.security.sasl,java.smartcardio,java.sql,java.sql.rowset,java.transaction.xa,java.xml,java.xml.crypto,jdk.accessibility,jdk.charsets,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.dynalink,jdk.httpserver,jdk.incubator.foreign,jdk.incubator.vector,jdk.internal.vm.ci,jdk.jdwp.agent,jdk.jfr,jdk.jsobject,jdk.localedata,jdk.management,jdk.management.agent,jdk.management.jfr,jdk.naming.dns,jdk.naming.rmi,jdk.net,jdk.nio.mapmode,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,jdk.xml.dom,jdk.zipfs,jdk.attach \
-          --output /build/jre \
-          --no-man-pages \
-          --no-header-files \
-          --compress=2
+  --output /build/jre \
+  --no-man-pages \
+  --no-header-files \
+  --compress=2
 
 ##
 ## Build Lowcoder api-service application
@@ -70,8 +70,8 @@ RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-re
 
 # Download nodejs and install yarn
 RUN curl -sL https://deb.nodesource.com/setup_19.x | bash - \
-&& apt-get install --no-install-recommends -y nodejs \
-&& npm install -g yarn
+  && apt-get install --no-install-recommends -y nodejs \
+  && npm install -g yarn
 
 # Copy and build the node-service app
 COPY server/node-service/ /lowcoder/node-service/app/
@@ -148,15 +148,15 @@ COPY deploy/docker/frontend/00-change-nginx-user.sh /docker-entrypoint.d/00-chan
 COPY deploy/docker/frontend/01-update-nginx-conf.sh /docker-entrypoint.d/01-update-nginx-conf.sh
 
 RUN chmod +x /docker-entrypoint.d/00-change-nginx-user.sh && \
-    chmod +x /docker-entrypoint.d/01-update-nginx-conf.sh
+  chmod +x /docker-entrypoint.d/01-update-nginx-conf.sh
 
 COPY deploy/docker/frontend/nginx-http.conf /etc/nginx/nginx-http.conf
 COPY deploy/docker/frontend/nginx-https.conf /etc/nginx/nginx-https.conf
 COPY deploy/docker/frontend/ssl-certificate.conf /etc/nginx/ssl-certificate.conf
 COPY deploy/docker/frontend/ssl-params.conf /etc/nginx/ssl-params.conf
 
 
-EXPOSE 3000
+EXPOSE 3001
 EXPOSE 3443
 
 #############################################################################
@@ -175,17 +175,17 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal
   && echo "deb [signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg arch=amd64,arm64] http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list \
   && curl -sL https://deb.nodesource.com/setup_19.x | bash - \
   && if [ "$(dpkg --print-architecture)" = "amd64" ] || [ "$(dpkg --print-architecture)" = "i386" ]; then \
-    curl -sL http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb --output libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb; \
+  curl -sL http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb --output libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb; \
   else \
-    curl -sL http://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb --output libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb; \
+  curl -sL http://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb --output libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb; \
   fi \
   && dpkg -i libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb \
   && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends -y \
-      mongodb-org \
-      redis \
-      supervisor \
-      gosu \
-      nodejs \
+  mongodb-org \
+  redis \
+  supervisor \
+  gosu \
+  nodejs \
   && npm install -g yarn \
   && rm -rf /var/cache/apt/lists
 
@@ -201,7 +201,7 @@ COPY --chown=lowcoder:lowcoder deploy/docker/all-in-one/etc /lowcoder/etc
 # Add startup script
 COPY --chown=lowcoder:lowcoder deploy/docker/all-in-one/entrypoint.sh /lowcoder/entrypoint.sh
 
-EXPOSE 3000
+EXPOSE 3001
 EXPOSE 3443
 
 ENTRYPOINT [ "/bin/sh" , "/lowcoder/entrypoint.sh" ]
diff --git a/deploy/docker/docker-compose-multi.yaml b/deploy/docker/docker-compose-multi.yaml
@@ -72,7 +72,7 @@ services:
     image: lowcoderorg/lowcoder-ce-frontend:latest
     container_name: lowcoder-frontend
     ports:
-      - "3001:3000"
+      - "3001:3001"
     environment:
       PUID: "9001"
       PGID: "9001"
diff --git a/deploy/docker/docker-compose.yaml b/deploy/docker/docker-compose.yaml
@@ -8,7 +8,7 @@ services:
     image: lowcoderorg/lowcoder-ce:latest
     container_name: lowcoder
     ports:
-      - "3000:3000"
+      - "3001:3001"
       - "3443:3443"
     environment:
       # enable services
diff --git a/deploy/docker/frontend/nginx-http.conf b/deploy/docker/frontend/nginx-http.conf
@@ -32,7 +32,7 @@ http {
     #tcp_nopush     on;
 
     server {
-        listen 3000 default_server;
+        listen 3001 default_server;
         root /lowcoder/client;
 
 	proxy_connect_timeout __LOWCODER_MAX_QUERY_TIMEOUT__;
diff --git a/docs/self-hosting/README.md b/docs/self-hosting/README.md
@@ -10,8 +10,8 @@ Also, for developers in need of stateless containers in cluster environment, we
 
 ### Prerequisites
 
-* [Docker](https://docs.docker.com/get-docker/) (version 20.10.7 or above)
-* [Docker-Compose](https://docs.docker.com/compose/install/) (version 1.29.2 or above)
+- [Docker](https://docs.docker.com/get-docker/) (version 20.10.7 or above)
+- [Docker-Compose](https://docs.docker.com/compose/install/) (version 1.29.2 or above)
 
 {% hint style="info" %}
 Recommended system spec: 1-core CPU and 2 GB RAM.
@@ -35,10 +35,13 @@ Follow the steps below:
 1.  Download the configuration file by clicking [docker-compose.yml](https://raw.githubusercontent.com/lowcoder-org/lowcoder/main/deploy/docker/docker-compose.yaml) or running the curl command:&#x20;
 
     {% code overflow="wrap" %}
+
     ```bash
     curl https://raw.githubusercontent.com/lowcoder-org/lowcoder/main/deploy/docker/docker-compose.yaml -o $PWD/docker-compose.yml
     ```
+
     {% endcode %}
+
 2.  Start the Docker container by running this command:
 
     ```bash
@@ -48,7 +51,6 @@ Follow the steps below:
     \
     The docker image, about 400 MB, is downloaded during the initial start-up.\
 
-
     <figure><img src="../.gitbook/assets/download-ce.png" alt=""><figcaption></figcaption></figure>
 
     After downloading, it usually takes less than 30 seconds to start the service.\
@@ -59,23 +61,25 @@ Follow the steps below:
     docker logs -f openblocks
     ```
 
-
-
     When you see `frontend`, `backend`, `redis`, and `mongo` `entered the RUNNING state`, the Lowcoder service has officially started:&#x20;
 
     <figure><img src="../.gitbook/assets/check-logs-ce.png" alt=""><figcaption></figcaption></figure>
+
 4.  Visit [**http://localhost:3000**](http://localhost:3000) and click **Sign up**. Lowcoder will automatically create a workspace for you, then you can start building your apps and invite members to your workspace.
 
-    <figure><img src="../.gitbook/assets/after-deployment.png" alt=""><figcaption></figcaption></figure>
-{% endtab %}
+        <figure><img src="../.gitbook/assets/after-deployment.png" alt=""><figcaption></figcaption></figure>
+
+    {% endtab %}
 
 {% tab title="Docker" %}
 Run the command below:
 
 {% code overflow="wrap" %}
+
 ```bash
-docker run -d --name openblocks -p 3000:3000 -v "$PWD/stacks:/openblocks-stacks" lowcoderorg/lowcoder-ce
+docker run -d --name openblocks -p 3001:3001 -v "$PWD/stacks:/openblocks-stacks" lowcoderorg/lowcoder-ce
 ```
+
 {% endcode %}
 {% endtab %}
 {% endtabs %}
@@ -91,17 +95,20 @@ docker-compose pull
 docker-compose rm -fsv openblocks
 docker-compose up -d
 ```
+
 {% endtab %}
 
 {% tab title="Docker" %}
 Run the following commands to update to the latest Lowcoder image:
 
 {% code overflow="wrap" %}
+
 ```bash
 docker pull lowcoderorg/lowcoder-ce
 docker rm -fv openblocks
-docker run -d --name openblocks -p 3000:3000 -v "$PWD/stacks:/openblocks-stacks" lowcoderorg/lowcoder-ce
+docker run -d --name openblocks -p 3001:3001 -v "$PWD/stacks:/openblocks-stacks" lowcoderorg/lowcoder-ce
 ```
+
 {% endcode %}
 {% endtab %}
 {% endtabs %}
@@ -110,15 +117,15 @@ docker run -d --name openblocks -p 3000:3000 -v "$PWD/stacks:/openblocks-stacks"
 
 For developers who require stateless containers in a cluster environment, we offer separate images of backend and frontend service with a customizable Dockerfile. A well-functioning Lowcoder deployment consists of below services:
 
-* **api-service**: Backend service.
-* **node-service**: Backend service.
-* **frontend**: Frontend service.
-* **MongoDB**: Used for persisting data of users, apps, data sources, etc.
-* **Redis**: Used for maintaining user sessions, rate limiter, etc.
+- **api-service**: Backend service.
+- **node-service**: Backend service.
+- **frontend**: Frontend service.
+- **MongoDB**: Used for persisting data of users, apps, data sources, etc.
+- **Redis**: Used for maintaining user sessions, rate limiter, etc.
 
 ### Prerequisites
 
-* [Docker-Compose](https://docs.docker.com/compose/install/) (version 1.29.2 or above)
+- [Docker-Compose](https://docs.docker.com/compose/install/) (version 1.29.2 or above)
 
 ### Deploy
 
@@ -128,24 +135,28 @@ For developers who require stateless containers in a cluster environment, we off
     mkdir openblocks
     cd openblocks
     ```
+
 2.  Download the configuration file by clicking [docker-compose-multi.yml](https://raw.githubusercontent.com/lowcoder-org/lowcoder/main/deploy/docker/docker-compose-multi.yaml) or running the curl command:
 
     <pre class="language-bash" data-overflow="wrap"><code class="lang-bash"><strong>curl https://raw.githubusercontent.com/lowcoder-org/lowcoder/main/deploy/docker/docker-compose-multi.yaml -o $PWD/docker-compose-multi.yml
     </strong></code></pre>
+
 3.  Modify service configurations in the downloaded Dockerfile according to your needs:
 
     <figure><img src="../.gitbook/assets/docker-compose-multi.jpeg" alt=""><figcaption></figcaption></figure>
 
-    * **mongodb**: Start a new MongoDB instance on your host. You can delete this part  and modify the environment variable `MONGODB_URL` of **openblocks-api-service** to use your own MongoDB.
-    * **redis**: Start a new Redis instance on your host. You can delete this part and modify the environment variable `REDIS_URL` of **openblocks-api-service** to use your own Redis.
-    * **openblocks-api-service**: Required.&#x20;
-    * **openblocks-node-service**: Required.
-    * **openblocks-frontend**: Required. Can be optional if you deploy frontend on CDN.
+    - **mongodb**: Start a new MongoDB instance on your host. You can delete this part and modify the environment variable `MONGODB_URL` of **openblocks-api-service** to use your own MongoDB.
+    - **redis**: Start a new Redis instance on your host. You can delete this part and modify the environment variable `REDIS_URL` of **openblocks-api-service** to use your own Redis.
+    - **openblocks-api-service**: Required.&#x20;
+    - **openblocks-node-service**: Required.
+    - **openblocks-frontend**: Required. Can be optional if you deploy frontend on CDN.
+
 4.  Start Docker containers by running this command:
 
     ```bash
     docker-compose -f docker-compose-multi.yml up -d
     ```
+
 5.  Visit [**http://localhost:3000**](http://localhost:3000) and click **Sign up**. Lowcoder will automatically create a workspace for you, then you can start building your apps and invite members to your workspace.
 
     <figure><img src="../.gitbook/assets/after-deployment.png" alt=""><figcaption></figcaption></figure>
@@ -184,6 +195,7 @@ docker stop openblocks
 docker rm openblocks
 # run your new docker run command
 ```
+
 {% endtab %}
 {% endtabs %}
 
@@ -207,9 +219,11 @@ Add environment variables `MONGODB_URL` and `REDIS_URL` in `docker-compose.yml`
 Add environment variables `MONGODB_URL` and `REDIS_URL` to the deployment command, as shown below:
 
 {% code overflow="wrap" %}
+
 ```bash
-docker run -d --name openblocks -e MONGODB_URL=YOUR_MONGODB_URL REDIS_URL=YOUR_REDIS_URL -p 3000:3000 -v "$PWD/stacks:/openblocks-stacks lowcoderorg/lowcoder-ce
+docker run -d --name openblocks -e MONGODB_URL=YOUR_MONGODB_URL REDIS_URL=YOUR_REDIS_URL -p 3001:3001 -v "$PWD/stacks:/openblocks-stacks lowcoderorg/lowcoder-ce
 ```
+
 {% endcode %}
 {% endtab %}
 {% endtabs %}
@@ -228,9 +242,11 @@ Add an environment variable `LOCAL_USER_ID` in `docker-compose.yml` downloaded i
 Add an environment variable `LOCAL_USER_ID` to the deployment command, as shown below:
 
 {% code overflow="wrap" %}
+
 ```bash
-docker run -d --name openblocks -e LOCAL_USER_ID=10010 -p 3000:3000 -v "$PWD/stacks:/openblocks-stacks" lowcoderorg/lowcoder-ce
+docker run -d --name openblocks -e LOCAL_USER_ID=10010 -p 3001:3001 -v "$PWD/stacks:/openblocks-stacks" lowcoderorg/lowcoder-ce
 ```
+
 {% endcode %}
 {% endtab %}
 {% endtabs %}
@@ -241,19 +257,23 @@ With an SSL certificate, you can securely visit self-hosted Lowcoder with HTTPS
 
 {% tabs %}
 {% tab title="Docker-Compose" %}
+
 1. Copy `fullchain.pem` and `privkey.pem` to the `$PWD/stacks/ssl` directory.
 2. In `$PWD/docker-compose.yml`, change the value of `ports` to `"3443:3443"`.\
-   ![](../.gitbook/assets/ssl-certificates.png)
-{% endtab %}
+    ![](../.gitbook/assets/ssl-certificates.png)
+   {% endtab %}
 
 {% tab title="Docker" %}
+
 1. Copy `fullchain.pem` and `privkey.pem` to the `$PWD/stacks/ssl` directory.
 2. Change the `ports` in the deployment command to `3443:3443`, as shown below:
 
 {% code overflow="wrap" %}
+
 ```bash
 docker run -d --name openblocks -p 3443:3443 -v "$PWD/stacks:/openblocks-stacks" lowcoderorg/lowcoder-ce
 ```
+
 {% endcode %}
 {% endtab %}
 {% endtabs %}
diff --git a/server/node-service/src/plugins/notion/notion.spec.yaml b/server/node-service/src/plugins/notion/notion.spec.yaml
