Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java

@@ -35,10 +35,12 @@ import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
-import java.util.Map;
-
 import static org.apache.dolphinscheduler.api.enums.Status.*;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 
 /**
  * user controller
@@ -462,4 +464,24 @@ public class UsersController extends BaseController {
         Map<String, Object> result = usersService.activateUser(loginUser, userName);
         return returnDataList(result);
     }
+
+    /**
+     * user batch activate
+     *
+     * @param  userNames       user names
+     */
+    @ApiOperation(value = "batchActivateUser",notes = "BATCH_ACTIVATE_USER_NOTES")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "userNames", value = "USER_NAMES", type = "String"),
+    })
+    @PostMapping("/batch/activate")
+    @ResponseStatus(HttpStatus.OK)
+    @ApiException(UPDATE_USER_ERROR)
+    public Result<Object> batchActivateUser(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+                                       @RequestBody List<String> userNames) {
+        List<String> formatUserNames = userNames.stream().map(ParameterUtils::handleEscapes).collect(Collectors.toList());
+        logger.info(" activate userNames: {}", formatUserNames);
+        Map<String, Object> result = usersService.batchActivateUser(loginUser, formatUserNames);
+        return returnDataList(result);
+    }
 }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java

@@ -40,6 +40,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
+import java.text.MessageFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -946,6 +947,7 @@ public class UsersService extends BaseService {
      * activate user, only system admin have permission, change user state code 0 to 1
      *
      * @param loginUser login user
+     * @param userName  user name
      * @return create result code
      */
     public Map<String, Object> activateUser(User loginUser, String userName) {
@@ -983,4 +985,52 @@ public class UsersService extends BaseService {
         result.put(Constants.DATA_LIST, responseUser);
         return result;
     }
+
+    /**
+     * activate user, only system admin have permission, change users state code 0 to 1
+     *
+     * @param loginUser login user
+     * @param userNames user name
+     * @return create result code
+     */
+    public Map<String, Object> batchActivateUser(User loginUser, List<String> userNames) {
+        Map<String, Object> result = new HashMap<>();
+
+        if (!isAdmin(loginUser)) {
+            putMsg(result, Status.USER_NO_OPERATION_PERM);
+            return result;
+        }
+
+        int totalSuccess = 0;
+        List<String> successUserNames = new ArrayList<>();
+        Map<String, Object> successRes = new HashMap<>();
+        int totalFailed = 0;
+        List<Map<String, String>> failedInfo = new ArrayList<>();
+        Map<String, Object> failedRes = new HashMap<>();
+        for (String userName : userNames) {
+            Map<String, Object> tmpResult = activateUser(loginUser, userName);
+            if (tmpResult.get(Constants.STATUS) != Status.SUCCESS) {
+                totalFailed++;
+                Map<String, String> failedBody = new HashMap<>();
+                failedBody.put("userName", userName);
+                Status status = (Status) tmpResult.get(Constants.STATUS);
+                String errorMessage = MessageFormat.format(status.getMsg(), userName);
+                failedBody.put("msg", errorMessage);
+                failedInfo.add(failedBody);
+            } else {
+                totalSuccess++;
+                successUserNames.add(userName);
+            }
+        }
+        successRes.put("sum", totalSuccess);
+        successRes.put("userName", successUserNames);
+        failedRes.put("sum", totalFailed);
+        failedRes.put("info", failedInfo);
+        Map<String, Object> res = new HashMap<>();
+        res.put("success", successRes);
+        res.put("failed", failedRes);
+        putMsg(result, Status.SUCCESS);
+        result.put(Constants.DATA_LIST, res);
+        return result;
+    }
 }

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/UsersControllerTest.java

@@ -18,7 +18,7 @@ package org.apache.dolphinscheduler.api.controller;
 
 import org.apache.dolphinscheduler.api.enums.Status;
 import org.apache.dolphinscheduler.api.utils.Result;
-import org.apache.dolphinscheduler.common.utils.*;
+import org.apache.dolphinscheduler.common.utils.JSONUtils;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -33,6 +33,9 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * users controller test
  */
@@ -302,4 +305,22 @@ public class UsersControllerTest extends AbstractControllerTest{
         Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
         Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
     }
+
+    @Test
+    public void testBatchActivateUser() throws Exception {
+        List<String> userNames = new ArrayList<>();
+        userNames.add("user_sky_cxl");
+        userNames.add("19990323");
+        userNames.add("test_sky_post_11");
+        String jsonUserNames = JSONUtils.toJsonString(userNames);
+        MvcResult mvcResult = mockMvc.perform(post("/users/batch/activate")
+                .header(SESSION_ID, sessionId)
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(jsonUserNames))
+                .andExpect(status().isOk())
+                .andReturn();
+
+        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
+        Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
+    }
 }

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java

@@ -42,14 +42,14 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 @RunWith(MockitoJUnitRunner.class)
 public class UsersServiceTest {
     private static final Logger logger = LoggerFactory.getLogger(UsersServiceTest.class);
@@ -528,6 +528,41 @@ public class UsersServiceTest {
         }
     }
 
+    @Test
+    public void testBatchActivateUser() {
+        User user = new User();
+        user.setUserType(UserType.GENERAL_USER);
+        List<String> userNames = new ArrayList<>();
+        userNames.add("userTest0001");
+        userNames.add("userTest0002");
+        userNames.add("userTest0003~");
+        userNames.add("userTest0004");
+
+        try {
+            //not admin
+            Map<String, Object> result = usersService.batchActivateUser(user, userNames);
+            Assert.assertEquals(Status.USER_NO_OPERATION_PERM, result.get(Constants.STATUS));
+
+            //batch activate user names
+            user.setUserType(UserType.ADMIN_USER);
+            when(userMapper.queryByUserNameAccurately("userTest0001")).thenReturn(getUser());
+            when(userMapper.queryByUserNameAccurately("userTest0002")).thenReturn(getDisabledUser());
+            result = usersService.batchActivateUser(user, userNames);
+            Map<String, Object> responseData = (Map<String, Object>) result.get(Constants.DATA_LIST);
+            Map<String, Object> successData = (Map<String, Object>) responseData.get("success");
+            int totalSuccess = (Integer) successData.get("sum");
+
+            Map<String, Object> failedData = (Map<String, Object>) responseData.get("failed");
+            int totalFailed = (Integer) failedData.get("sum");
+
+            Assert.assertEquals(1, totalSuccess);
+            Assert.assertEquals(3, totalFailed);
+            Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
+        } catch (Exception e) {
+            Assert.assertTrue(false);
+        }
+    }
+
     /**
      * get disabled user
      * @return