解决冲突

epmet-auth/src/main/java/com/epmet/service/SsoService.java

@@ -3,6 +3,7 @@ package com.epmet.service;
 import com.epmet.dto.form.SsoEnteOrgFormDTO;
 import com.epmet.dto.form.SsoLoginFormDTO;
 import com.epmet.dto.form.SsoLoginOperFormDTO;
+import com.epmet.dto.form.SsoWorkLoginFormDTO;
 import com.epmet.dto.result.SsoLoginResultDTO;
 import com.epmet.dto.result.UserTokenResultDTO;
 

epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java

@@ -140,7 +140,7 @@ public class SsoServiceImpl implements SsoService {
             ThirdPlatformEnum platformEnum = ThirdPlatformEnum.getEnum(formDTO.getPlatform());
             String apiService = platformEnum.getApiService();
             AbstractApiService apiServiceImpl = (AbstractApiService) SpringContextUtils.getBean(apiService);
-            thirdUser = apiServiceImpl.getUserInfoByTicket(formDTO.getThirdToken());
+            thirdUser = apiServiceImpl.getCUserInfoByTicket(formDTO.getThirdToken());
         } catch (RenException e) {
             throw new RenException(e.getCode(), e.getMessage());
         } catch (Exception e) {

epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java

@@ -17,7 +17,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -138,7 +137,7 @@ public class JcetApiService extends AbstractApiService {
      */
     private Map<String, Object> getHeaders(int bodyLength, String appKey, String appSecret) throws UnsupportedEncodingException {
 
-        Map<String, String> headers = new HashMap();
+        Map<String, Object> headers = new HashMap();
         long timestamp = System.currentTimeMillis();
         headers.put(JcetConstants.PLAT_HEADER_OPEN_TIMESTAMP, timestamp);
         headers.put(JcetConstants.PLAT_HEADER_OPEN_APP_ID, appKey);

epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/pyld/PyldApiService.java

@@ -47,7 +47,7 @@ public class PyldApiService extends AbstractApiService {
      * @date 2021.01.19 10:26
      */
     @Override
-    public ThirdPlatUserInfo getUserInfoByTicket(String platformToken) {
+    public ThirdPlatUserInfo getCUserInfoByTicket(String platformToken) {
 
         logger.info("【请求平阴联动指挥平台第三方平台】getUserInfoByTicket()接口开始>>>>>>>>>>>>");
         logger.info("【请求平阴联动指挥平台第三方平台】getUserInfoByTicket()接口入参 platformToken:{}", platformToken);
@@ -75,6 +75,18 @@ public class PyldApiService extends AbstractApiService {
 
     }
 
+    /**
+     * G端用户token获取用户信息
+     *
+     * @param token
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public ThirdPlatUserInfo getGUserInfoBySSOToken(String token) throws Exception {
+        return null;
+    }
+
     /**
      * 构建请求头信息
      *