commit

admin/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
+    active: dev
   application:
     name: admin
   datasource:

miniapp/src/main/java/com/kym/miniapp/config/SaTokenConfigure.java

@@ -21,13 +21,14 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                 .addPathPatterns("/**")
                 // login/refresh接口不鉴权
                 .excludePathPatterns(
+                        "/error",
                         "/user/wxLogin",
                         "/user/refresh",
                         "/charge/pullEnStations",
                         "/charge/notification_stationStatus",
                         "/charge/notification_start_charge_result",
                         "/charge/notification_start_charge_status",
-                        "/charge/notification_start_equip_charge_status",
+                        "/charge/notification_equip_charge_status",
                         "/charge/notification_stop_charge_result",
                         "/charge/notification_charge_order_info"
                 );

miniapp/src/main/java/com/kym/miniapp/controller/ChargerController.java

@@ -113,7 +113,6 @@ public class ChargerController {
      */
     @ApiLog("EN+推送启动充电结果")
     @PostMapping("/notification_start_charge_result")
-    @ResponseBody
     EnResponse notificationStartChargeResult(@RequestBody JSONObject json) {
         return new EnResponse(enNotifyService.handleNotificationStartChargeResult(json));
     }
@@ -140,6 +139,7 @@ public class ChargerController {
      * @param json
      * @return
      */
+    @ApiLog("推送停止充电结果")
     @PostMapping("/notification_stop_charge_result")
     EnResponse notificationStopChargeResult(@RequestBody JSONObject json) {
         return new EnResponse(enNotifyService.handleNotificationStopChargeResult(json));
@@ -151,6 +151,7 @@ public class ChargerController {
      * @param json
      * @return
      */
+    @ApiLog("推送充电订单信息")
     @PostMapping("/notification_charge_order_info")
     EnResponse notificationChargeOrderInfo(@RequestBody JSONObject json) {
         return new EnResponse(enNotifyService.handleNotificationChargeOrderInfo(json));
@@ -164,6 +165,7 @@ public class ChargerController {
      *
      * @return
      */
+    @ApiLog("拉取EN+充电站信息数据并更新本地服务器数据")
     @GetMapping("/pullEnStations")
     R pullEnStationInfos() {
         stationService.pullEnStationInfos();