From facda9c629e266b487c809fce525858fe183a850 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 19 Jan 2021 18:20:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?byTicket=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/SsoController.java   | 18 ++++++++++++++
 .../apiservice/AbstractApiService.java        |  4 +++-
 .../dto/result/jcet/UserInfoResultDTO.java    | 24 +++++++++++++++----
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/epmet-auth/src/main/java/com/epmet/controller/SsoController.java b/epmet-auth/src/main/java/com/epmet/controller/SsoController.java
index 3251b5a06c..cc53f86f2e 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/SsoController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/SsoController.java
@@ -1,5 +1,7 @@
 package com.epmet.controller;
 
+import com.epmet.commons.thirdplat.apiservice.jcet.JcetApiService;
+import com.epmet.commons.thirdplat.dto.result.jcet.UserInfoResultDTO;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.SsoLoginFormDTO;
@@ -11,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.UnsupportedEncodingException;
+
 /**
  * @Author zxc
  * @DateTime 2021/1/18 下午4:33
@@ -22,6 +26,9 @@ public class SsoController {
     @Autowired
     private SsoService ssoService;
 
+    @Autowired
+    private JcetApiService jcetApiService;
+
     /**
      * @Description  0、入口：得到token
      * @Param formDTO
@@ -34,4 +41,15 @@ public class SsoController {
         return new Result<SsoLoginResultDTO>().ok(ssoService.ssoLogin(formDTO));
     }
 
+    @PostMapping("testlogin")
+    public Result<UserInfoResultDTO> testssoLogin(){
+        UserInfoResultDTO userInfoByTicket = null;
+        try {
+            userInfoByTicket = jcetApiService.getUserInfoByTicket("ssoTicket-vYtMRuXAQZri3wpA2vyq5D8n3Q9oO7ui");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return new Result<UserInfoResultDTO>().ok(userInfoByTicket);
+    }
+
 }
diff --git a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/AbstractApiService.java b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/AbstractApiService.java
index 7950526fd1..b0aa1e0d0b 100644
--- a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/AbstractApiService.java
+++ b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/AbstractApiService.java
@@ -1,6 +1,7 @@
 package com.epmet.commons.thirdplat.apiservice;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.epmet.commons.thirdplat.dto.result.jcet.JcetResult;
 import com.epmet.commons.thirdplat.properties.ThirdplatProps;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -29,6 +30,7 @@ public class AbstractApiService {
                     jcetResult.getMsg().concat(",错误码:") + jcetResult.getCode());
         }
 
-        return JSON.parseObject(jcetResult.getMsg(), resultType);
+        JSONObject jo = (JSONObject) jcetResult.getData();
+        return jo.toJavaObject(resultType);
     }
 }
diff --git a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/dto/result/jcet/UserInfoResultDTO.java b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/dto/result/jcet/UserInfoResultDTO.java
index 5adf33436d..09fc1bcace 100644
--- a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/dto/result/jcet/UserInfoResultDTO.java
+++ b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/dto/result/jcet/UserInfoResultDTO.java
@@ -4,10 +4,26 @@ import lombok.Data;
 
 @Data
 public class UserInfoResultDTO {
-
-    private String name;
+    private String id;
+    /**
+     * 用户名称
+     */
+    private String userName;
+    /**
+     * 手机号码
+     */
     private String mobile;
-    private String uid;
-    private String account;
+    /**
+     * 姓名
+     */
+    private String name;
+    /**
+     * 邮箱
+     */
+    private String email;
 
+    /**
+     * sessionId,用于维持在线状态
+     */
+    private String oaSessionId;
 }