commit

admin/src/main/java/com/kym/admin/AdminApplication.java

@@ -1,11 +1,14 @@
 package com.kym.admin;
 
+import com.kym.service.wechat.impl.WxPayServiceImpl;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 
-@SpringBootApplication(scanBasePackages = {"com.kym"})
+@SpringBootApplication()
+@ComponentScan(value = {"com.kym"}, excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {WxPayServiceImpl.class}))
 @MapperScan(basePackages = {"com.kym.mapper"})
 public class AdminApplication {
 

admin/src/main/java/com/kym/admin/controller/AdminUserController.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 用户表 前端控制器
+ * admin用户表 前端控制器
  * </p>
  *
  * @author skyline

miniapp/src/main/java/com/kym/miniapp/enums/EnPlusApi.java

@@ -1,44 +0,0 @@
-package com.kym.miniapp.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-
-/**
- * @author skyline
- * @description EN+接口
- * @date 2023-07-29 12:33
- */
-@AllArgsConstructor
-@Getter
-public enum EnPlusApi implements Api {
-
-
-    // 认证-获取token
-    EN_PLUS_QUERY_TOKEN(Constants.DOMAIN + "query_token", RequestMethod.POST),
-
-    // 站点
-    EN_PLUS_STATION_INFO(Constants.DOMAIN + "query_stations_info", RequestMethod.POST),
-
-    // 充电
-    // 请求设备认证
-    EM_PLUS_QUERY_EQUIP_AUTH(Constants.DOMAIN + "query_equip_auth", RequestMethod.POST),
-    // 查询业务策略信息
-    EM_PLUS_QUERY_EQUIP_BUSINESS_POLICY(Constants.DOMAIN + "query_equip_business_policy", RequestMethod.POST),
-    // 请求启动充电
-    EM_PLUS_QUERY_START_CHARGE(Constants.DOMAIN + "query_start_charge", RequestMethod.POST),
-
-
-    // 微信
-    WX_MP_GET_PHONE("", RequestMethod.POST),
-    WX_GET_ACCESS_TOKEN("", RequestMethod.POST);
-
-    private final String api;
-    private final RequestMethod requestMethod;
-
-    private static class Constants {
-        private static final String DOMAIN = "https://api.en-plus.cn:8080/Charge/evcs/v1//MA5HJNDG1/";
-    }
-
-}

service/src/main/java/com/kym/service/admin/impl/AdminUserServiceImpl.java

@@ -4,11 +4,11 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.kym.mapper.admin.AdminUserMapper;
-import com.kym.service.admin.AdminUserService;
 import com.kym.common.R;
 import com.kym.common.constant.ResponseEnum;
 import com.kym.entity.admin.AdminUser;
+import com.kym.mapper.admin.AdminUserMapper;
+import com.kym.service.admin.AdminUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -43,7 +43,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
             this.updateById(user);
             LOGGER.info("用户：" + username + "/id:" + user.getId() + "登录");
             // token在cookie中有隐式返回，这里多做显式返回
-            return R.success(Map.of("id", user.getId(), "token", StpUtil.getTokenValue()));
+            return R.success(Map.of("id", user.getId(), "satoken", StpUtil.getTokenValue()));
         }
         return R.failed(ResponseEnum.LOGIN_FAILED);
     }

service/src/main/java/com/kym/service/miniapp/impl/ChargeServiceImpl.java

@@ -54,7 +54,7 @@ public class ChargeServiceImpl implements ChargeService {
     @Override
     public Map queryStartCharge(String connectorId, String stationId) {
         var userId = StpUtil.getSession().getLong("userId");
-        stationId = getConnectorId(stationId);
+        connectorId = getConnectorId(connectorId);
 
         // 二维码文本
         var qrCode = "";