Browse Source

to feature 7418 (#7420)

Co-authored-by: ouyangyewei <yewei.oyyw@alibaba-inc.com>
ouyangyewei 3 years ago
parent
commit
801e6dd6bb

+ 1 - 1
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AccessTokenController.java

@@ -194,7 +194,7 @@ public class AccessTokenController extends BaseController {
      * @param userId token for user
      * @param expireTime token expire time
      * @param token token string (if it is absent, it will be automatically generated)
-     * @return update result code
+     * @return updated access token entity
      */
     @ApiOperation(value = "updateToken", notes = "UPDATE_TOKEN_NOTES")
     @ApiImplicitParams({

+ 1 - 1
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AccessTokenService.java

@@ -83,7 +83,7 @@ public interface AccessTokenService {
      * @param userId token for user
      * @param expireTime token expire time
      * @param token token string (if it is absent, it will be automatically generated)
-     * @return update result code
+     * @return updated access token entity
      */
     Map<String, Object> updateToken(User loginUser, int id, int userId, String expireTime, String token);
 }

+ 2 - 1
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AccessTokenServiceImpl.java

@@ -208,7 +208,7 @@ public class AccessTokenServiceImpl extends BaseServiceImpl implements AccessTok
      * @param userId token for user
      * @param expireTime token expire time
      * @param token token string (if it is absent, it will be automatically generated)
-     * @return update result code
+     * @return updated access token entity
      */
     @Override
     public Map<String, Object> updateToken(User loginUser, int id, int userId, String expireTime, String token) {
@@ -241,6 +241,7 @@ public class AccessTokenServiceImpl extends BaseServiceImpl implements AccessTok
 
         accessTokenMapper.updateById(accessToken);
 
+        result.put(Constants.DATA_LIST, accessToken);
         putMsg(result, Status.SUCCESS);
         return result;
     }

+ 1 - 0
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AccessTokenControllerTest.java

@@ -193,6 +193,7 @@ public class AccessTokenControllerTest extends AbstractControllerTest {
 
         Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
         Assert.assertEquals(Status.SUCCESS.getCode(), result.getCode().intValue());
+        Assert.assertNotNull(result.getData());
         logger.info(mvcResult.getResponse().getContentAsString());
     }
 }

+ 2 - 0
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/AccessTokenServiceTest.java

@@ -152,11 +152,13 @@ public class AccessTokenServiceTest {
         Map<String, Object> result = accessTokenService.updateToken(getLoginUser(), 1,Integer.MAX_VALUE,getDate(),"token");
         logger.info(result.toString());
         Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
+        Assert.assertNotNull(result.get(Constants.DATA_LIST));
 
         // Token is absent
         result = accessTokenService.updateToken(getLoginUser(), 1, Integer.MAX_VALUE,getDate(),null);
         logger.info(result.toString());
         Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
+        Assert.assertNotNull(result.get(Constants.DATA_LIST));
 
         // ACCESS_TOKEN_NOT_EXIST
         result = accessTokenService.updateToken(getLoginUser(), 2,Integer.MAX_VALUE,getDate(),"token");