From ccd2f3957ac49907e263d30774b81f31765cc3cc Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 30 Sep 2021 11:17:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tduck/cloud/api/web/controller/UserProjectController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java index e640ed5..f34b409 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java @@ -170,7 +170,7 @@ public class UserProjectController { .like(StrUtil.isNotBlank(request.getName()), UserProjectEntity::getName, request.getName()) .le(ObjectUtil.isNotNull(request.getEndDateTime()), UserProjectEntity::getUpdatedTime, request.getEndDateTime()) .ge(ObjectUtil.isNotNull(request.getBeginDateTime()), UserProjectEntity::getUpdatedTime, request.getBeginDateTime()) - .orderByDesc(BaseEntity::getCreatedTime))); + .orderByDesc(BaseEntity::getUpdatedTime))); } From a51ed8ccd8f66268128c4e93dc4946dde07f3641 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 30 Sep 2021 12:46:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E5=86=85?= =?UTF-8?q?=E5=AD=98=E9=99=90=E5=88=B6=E4=B8=BA256-512M?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose-dev.yml | 2 +- docker-compose-prod.yml | 2 +- docker-compose-test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index a21430d..b3b8580 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -34,7 +34,7 @@ services: image: 192.168.1.140:5000/epmet-cloud-dev/tduck-platform:version_placeholder #image: 192.168.1.140:5000/epmet-cloud-dev/tduck-platform:2.0.6 environment: - RUN_INSTRUCT: "java -Djava.security.egd=file:/dev/./urandom -Dspring.profiles.active=dev -jar tduck-api.jar" + RUN_INSTRUCT: "java -Djava.security.egd=file:/dev/./urandom -Dspring.profiles.active=dev -Xms256m -Xmx512m -jar tduck-api.jar" ports: - 8116:8116 volumes: diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index a4bcf66..62ea5cc 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -8,7 +8,7 @@ services: container_name: tduck-platform-prod image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/tduck-platform:version_placeholder environment: - RUN_INSTRUCT: "java -Djava.security.egd=file:/dev/./urandom -Dspring.profiles.active=prod -jar tduck-api.jar" + RUN_INSTRUCT: "java -Djava.security.egd=file:/dev/./urandom -Dspring.profiles.active=prod -Xms256m -Xmx512m -jar tduck-api.jar" ports: - 8116:8116 volumes: diff --git a/docker-compose-test.yml b/docker-compose-test.yml index dca7a60..86be129 100644 --- a/docker-compose-test.yml +++ b/docker-compose-test.yml @@ -8,7 +8,7 @@ services: container_name: tduck-platform-test image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/tduck-platform:version_placeholder environment: - RUN_INSTRUCT: "java -Djava.security.egd=file:/dev/./urandom -Dspring.profiles.active=test -jar tduck-api.jar" + RUN_INSTRUCT: "java -Djava.security.egd=file:/dev/./urandom -Dspring.profiles.active=test -Xms256m -Xmx512m -jar tduck-api.jar" ports: - 8116:8116 volumes: