'1'

jkt-admin/src/main/java/com/miaxis/system/controller/system/SysLoginController.java

@@ -18,7 +18,7 @@ import com.miaxis.system.dto.common.RouterDTO;
 import com.miaxis.system.dto.system.TokenDTO;
 import com.miaxis.system.dto.system.UserInfoDTO;
 import com.miaxis.system.service.ISysMenuService;
-import com.miaxis.wx.dto.WxResult;
+import com.miaxis.common.core.domain.model.WxResult;
 import com.miaxis.wx.service.WxService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -127,7 +127,7 @@ public class SysLoginController
         String token = loginService.login(wxResult.getOpenid(),null, StudentLoginTypeEnum.OPENID_LOGIN.getCode());
         TokenDTO tokenDTO = new TokenDTO();
         tokenDTO.setToken(token);
-        tokenDTO.setWxToken(wxResult.getAccess_token());
+        tokenDTO.setWxResult(wxResult);
         return Response.success(tokenDTO) ;
 
 

jkt-service/src/main/java/com/miaxis/wx/dto/WxResult.java → jkt-common/src/main/java/com/miaxis/common/core/domain/model/WxResult.java

@@ -1,4 +1,4 @@
-package com.miaxis.wx.dto;
+package com.miaxis.common.core.domain.model;
 
 
 import lombok.Data;

jkt-service/src/main/java/com/miaxis/wx/service/WxService.java

@@ -2,7 +2,6 @@ package com.miaxis.wx.service;
 
 
 import com.miaxis.common.config.FeignConfig;
-import com.miaxis.wx.dto.WxResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;

jkt-system/src/main/java/com/miaxis/system/dto/system/TokenDTO.java

@@ -1,5 +1,6 @@
 package com.miaxis.system.dto.system;
 
+import com.miaxis.common.core.domain.model.WxResult;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,6 +17,6 @@ public class TokenDTO {
     private static final long serialVersionUID = 1L;
     @ApiModelProperty(value = "令牌")
     private String token;
-    @ApiModelProperty(value = "微信访问token")
-    private String wxToken;
+    @ApiModelProperty(value = "微信返回数据")
+    private WxResult wxResult;
 }