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: 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))); }