admin1/jiangchengfeiyi-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

this is 4.2 update

Browse Source
This commit is contained in:
chen-xin-zhi 2025-04-02 13:45:07 +08:00
parent 1b3ca354db
commit 34cefe5442
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/cultural/heritage/controller/global/GlobalController.java
View File

@ -212,6 +212,7 @@ public class GlobalController {
Map<String, List<PhotoProductsLabelVO>> photoProductsMap = new HashMap<>(); Map<String, List<PhotoProductsLabelVO>> photoProductsMap = new HashMap<>();
List<PhotoProducts> photoProductsList = commonService.findByFieldEqTargetField("isShelves", 1, photoProductsService); List<PhotoProducts> photoProductsList = commonService.findByFieldEqTargetField("isShelves", 1, photoProductsService);
List<PhotoProductsLabelVO> photoProductsLabelVOS = commonService.convertList(photoProductsList, PhotoProductsLabelVO.class); List<PhotoProductsLabelVO> photoProductsLabelVOS = commonService.convertList(photoProductsList, PhotoProductsLabelVO.class);
Collections.reverse(photoProductsLabelVOS);
for (PhotoProductsLabelVO photoProductsLabelVO : photoProductsLabelVOS) { for (PhotoProductsLabelVO photoProductsLabelVO : photoProductsLabelVOS) {
String categoryName = photoProductsLabelVO.getCategoryName(); String categoryName = photoProductsLabelVO.getCategoryName();

20
src/main/resources/application-dev.yml
View File

@ -1,21 +1,21 @@
spring: spring:
datasource: 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 driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://123.249.108.160:3306/feiyi-sc?serverTimezone=Asia/Shanghai url: jdbc:mysql://154.8.193.216:3306/feiyi?serverTimezone=Asia/Shanghai
username: feiyi-sc username: feiyi
password: 123456asd password: 123456asd
hikari: hikari:
maximum-pool-size: 20 maximum-pool-size: 20
max-lifetime: 120000 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: rabbitmq:
host: 123.249.108.160 host: 123.249.108.160

2
src/main/resources/application.yml
View File

@ -1,6 +1,6 @@
spring: spring:
profiles: profiles:
active: dev active: prod