From 34cefe544289f8ea4b96b308b5f9278188f3f2b8 Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Wed, 2 Apr 2025 13:45:07 +0800
Subject: [PATCH] this is 4.2 update
---
.../controller/global/GlobalController.java | 1 +
src/main/resources/application-dev.yml | 20 +++++++++----------
src/main/resources/application.yml | 2 +-
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/cultural/heritage/controller/global/GlobalController.java b/src/main/java/com/cultural/heritage/controller/global/GlobalController.java
index 6138ee3..4c94f5d 100644
--- a/src/main/java/com/cultural/heritage/controller/global/GlobalController.java
+++ b/src/main/java/com/cultural/heritage/controller/global/GlobalController.java
@@ -212,6 +212,7 @@ public class GlobalController {
Map<String, List<PhotoProductsLabelVO>> photoProductsMap = new HashMap<>();
List<PhotoProducts> photoProductsList = commonService.findByFieldEqTargetField("isShelves", 1, photoProductsService);
List<PhotoProductsLabelVO> photoProductsLabelVOS = commonService.convertList(photoProductsList, PhotoProductsLabelVO.class);
+ Collections.reverse(photoProductsLabelVOS);
for (PhotoProductsLabelVO photoProductsLabelVO : photoProductsLabelVOS) {
String categoryName = photoProductsLabelVO.getCategoryName();
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 147af34..fc62e9b 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,21 +1,21 @@
spring:
datasource:
-# driver-class-name: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://154.8.193.216:3306/feiyi?serverTimezone=Asia/Shanghai
-# username: feiyi
-# password: 123456asd
-# hikari:
-# maximum-pool-size: 20
-# max-lifetime: 120000
-
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://123.249.108.160:3306/feiyi-sc?serverTimezone=Asia/Shanghai
- username: feiyi-sc
+ url: jdbc:mysql://154.8.193.216:3306/feiyi?serverTimezone=Asia/Shanghai
+ username: feiyi
password: 123456asd
hikari:
maximum-pool-size: 20
max-lifetime: 120000
+# driver-class-name: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://123.249.108.160:3306/feiyi-sc?serverTimezone=Asia/Shanghai
+# username: feiyi-sc
+# password: 123456asd
+# hikari:
+# maximum-pool-size: 20
+# max-lifetime: 120000
+
rabbitmq:
host: 123.249.108.160
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1ab53e5..18684a4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: prod