微信登录返回修改

src/main/java/com/ydtech/config/resttemplate/RestTemplateConfig.java

@@ -15,10 +15,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.http.converter.BufferedImageHttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.Arrays;
 import java.util.Collections;
 
 @Configuration
@@ -38,7 +36,8 @@ public class RestTemplateConfig {
 
     @Bean
     public HttpClient httpClient() {
-        Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create().register("http", PlainConnectionSocketFactory.getSocketFactory()).register("https", SSLConnectionSocketFactory.getSocketFactory()).build();
+        Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create().register("http",
+                PlainConnectionSocketFactory.getSocketFactory()).register("https", SSLConnectionSocketFactory.getSocketFactory()).build();
         PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(registry);
         //设置整个连接池最大连接数
         connectionManager.setMaxTotal(1000);
@@ -47,7 +46,7 @@ public class RestTemplateConfig {
         connectionManager.setDefaultMaxPerRoute(100);
         RequestConfig requestConfig = RequestConfig.custom()
                 .setSocketTimeout(60000)  //返回数据的超时时间
-                .setConnectTimeout(10000) //连接上服务器的超时时间
+                .setConnectTimeout(3000) //连接上服务器的超时时间
                 .setConnectionRequestTimeout(1000) //从连接池中获取连接的超时时间
                 .build();
 

src/main/java/com/ydtech/modules/admin/controller/WechatController.java

@@ -4,6 +4,7 @@ import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.vo.WechatBindVo;
 import com.ydtech.modules.admin.model.vo.WechatLoginVo;
+import com.ydtech.modules.admin.model.vo.WechatVo;
 import com.ydtech.modules.admin.service.WechatService;
 import com.ydtech.modules.base.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -27,7 +28,7 @@ public class WechatController extends BaseController {
 
     @PostMapping("/login")
     @ApiOperation(value = "登录")
-    public HttpResult<Object> login(@RequestBody WechatLoginVo wechatLoginVo) {
+    public HttpResult<WechatVo> login(@RequestBody WechatLoginVo wechatLoginVo) {
         try {
             return wechatService.login(wechatLoginVo);
         } catch (WxErrorException e) {

src/main/java/com/ydtech/modules/admin/model/vo/WechatVo.java

@@ -0,0 +1,20 @@
+package com.ydtech.modules.admin.model.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@ApiModel("微信登录返回实体")
+@AllArgsConstructor
+@Data
+public class WechatVo {
+
+    @ApiModelProperty("登录token")
+    private String token;
+
+    @ApiModelProperty("用户id")
+    private String userId;
+
+}

src/main/java/com/ydtech/modules/admin/service/WechatService.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.admin.service;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.vo.WechatBindVo;
 import com.ydtech.modules.admin.model.vo.WechatLoginVo;
+import com.ydtech.modules.admin.model.vo.WechatVo;
 import me.chanjar.weixin.common.error.WxErrorException;
 
 public interface WechatService {
@@ -10,7 +11,7 @@ public interface WechatService {
     /**
      * 微信登录
      */
-    HttpResult<Object> login(WechatLoginVo code) throws WxErrorException;
+    HttpResult<WechatVo> login(WechatLoginVo code) throws WxErrorException;
 
     /**
      * 绑定微信

src/main/java/com/ydtech/modules/admin/service/impl/WechatServiceImpl.java

@@ -7,6 +7,7 @@ import com.ydtech.modules.admin.dao.SysUserRoleMapper;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.vo.WechatBindVo;
 import com.ydtech.modules.admin.model.vo.WechatLoginVo;
+import com.ydtech.modules.admin.model.vo.WechatVo;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.admin.service.WechatService;
 import lombok.RequiredArgsConstructor;
@@ -32,7 +33,7 @@ public class WechatServiceImpl implements WechatService {
     private final WxMpService wxMpService;
 
     @Override
-    public HttpResult<Object> login(WechatLoginVo wechatLoginVo) throws WxErrorException {
+    public HttpResult<WechatVo> login(WechatLoginVo wechatLoginVo) throws WxErrorException {
         WxOAuth2AccessToken accessToken = wxMpService.getOAuth2Service().getAccessToken(wechatLoginVo.getCode());
         String openId = accessToken.getOpenId();
         SysUser sysUser = sysUserService.lambdaQuery()
@@ -45,7 +46,10 @@ public class WechatServiceImpl implements WechatService {
         }
 
         String token = StpUtil.createLoginSession(sysUser.getId());
-        return HttpResult.ok("", token);
+        WechatVo wechatVo = new WechatVo(token, sysUser.getId());
+
+
+        return HttpResult.ok("", wechatVo);
     }
 
     @Override

src/main/java/com/ydtech/modules/ins/controller/InsZhongmeiController.java

@@ -37,7 +37,6 @@ public class InsZhongmeiController {
     @GetMapping("/vinSearch")
     @ApiOperation("vin码查询")
     public HttpResult vinSearch(@RequestParam String frameNo) {
-
         return insZhongmeiService.vinSearch(frameNo);
     }