diff --git a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java index a7beb67..c5f4a63 100644 --- a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java @@ -131,11 +131,9 @@ public class GeneralServiceImpl implements GeneralService { List list = Arrays.asList(market.split(",")); //判断是否是总部 if (list != null && list.contains("总部")) { - - - List allMarkets = getMarket(); // 获取所有地区 - allMarkets.add(0, "总部"); // 将“总部”添加到列表第一位 + allMarkets.remove("总部"); // 先移除可能存在的总部 + allMarkets.add(0, "总部"); // 将总部添加到列表第一位 list = allMarkets; // 更新list } return list; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 33590e4..25718af 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -35,9 +35,9 @@ spring: data: redis: database: 0 - host: localhost - port: 6379 - password: 123456 + host: 18.143.76.3 + port: 10703 + password: Ngc0FYUTA6h3wC5J lettuce: pool: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index cf3440a..024f557 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: prod + active: dev jackson: deserialization: fail-on-unknown-properties: false