Merge branch 'dev_epmet_mix'

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:

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:

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:

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