Merge remote-tracking branch 'origin/dev_jcet' into dev_jcet

epmet-auth/src/main/java/com/epmet/dto/form/SsoEnteOrgFormDTO.java

@@ -15,10 +15,10 @@ public class SsoEnteOrgFormDTO implements Serializable {
     public interface AddUserInternalGroup {}
     public interface AddUserShowGroup extends CustomerClientShowGroup {}
     /**
-     * wxCode
+     *  sso票据，有效期为300秒
      */
-    @NotBlank(message = "ticket不能为空",groups = {AddUserInternalGroup.class})
-    private String ticket;
+    @NotBlank(message = "ssotoken不能为空",groups = SsoWorkLoginFormDTO.SsoLoginForm.class)
+    private String token;
 
     /**
      * 手机号

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

@@ -433,7 +433,7 @@ public class SsoServiceImpl implements SsoService {
         ThirdPlatUserInfo userInfo;
         try {
             AbstractApiService apiService = (AbstractApiService) SpringContextUtils.getBean(apiServiceResult.getData().getApiServiceName());
-            userInfo = apiService.getGUserInfoBySSOToken(formDTO.getTicket());
+            userInfo = apiService.getGUserInfoBySSOToken(formDTO.getToken());
         } catch (Exception e) {
             throw new RenException(e.getMessage());
         }