Browse Source

站点费用完善,可以直接点击价格进行修改。

tomatozq 4 years ago
parent
commit
1843aa2b74

+ 3 - 0
web/src/main/java/com/jpsoft/bus/modules/bus/controller/PriceInfoController.java

@@ -288,6 +288,9 @@ public class PriceInfoController {
                     }
                     }
 
 
                     priceMap.put("price",priceStr);
                     priceMap.put("price",priceStr);
+                    priceMap.put("startStationId",startSi.getId());
+                    priceMap.put("endStationId",endSi.getId());
+
                     priceList.add(priceMap);
                     priceList.add(priceMap);
                     stationPriceMap.put(startSi.getId(),priceMap);
                     stationPriceMap.put(startSi.getId(),priceMap);
                 }
                 }

+ 7 - 7
web/src/main/resources/application-dev.yml

@@ -7,9 +7,9 @@ spring:
   datasource:
   datasource:
 
 
     #开发环境
     #开发环境
-    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-    username: root
-    password: jpsoft2016
+#    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#    username: root
+#    password: jpsoft2016
 
 
     #测试环境
     #测试环境
 #     url: jdbc:log4jdbc:mysql://47.92.161.104:3336/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 #     url: jdbc:log4jdbc:mysql://47.92.161.104:3336/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
@@ -17,16 +17,16 @@ spring:
 #     password: jpsoft8121234
 #     password: jpsoft8121234
 
 
     #正式环境
     #正式环境
-#     url: jdbc:log4jdbc:mysql://121.37.187.149:8100/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#     username: root
-#     password: jpsoft8121234
+    url: jdbc:log4jdbc:mysql://121.37.187.149:8100/smart-bus?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    username: root
+    password: jpsoft8121234
 
 
   devtools:
   devtools:
     add-properties: false
     add-properties: false
     restart:
     restart:
       enabled: true
       enabled: true
   rabbitmq:
   rabbitmq:
-    host: 192.168.33.20
+    host: 119.36.146.59
     virtual-host: tomatozq
     virtual-host: tomatozq
 
 
 logger:
 logger: