this is 4.2 update
This commit is contained in:
parent
1b3ca354db
commit
34cefe5442
|
@ -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();
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
spring:
|
||||
profiles:
|
||||
active: dev
|
||||
active: prod
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user