Merge pull request #129 from SonicCloudOrg/v1.3.1-beta

V1.3.1 beta
SonicCloudOrg · Feb 11, 2022 · a4ab8d6 · a4ab8d6
2 parents 5df4c47 + 3482ffd
commit a4ab8d6
Show file tree

Hide file tree

Showing 18 changed files with 199 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 </p>
 <p align="center">
   <a href="#">  
-    <img src="https://img.shields.io/badge/release-v1.2.0-orange">
+    <img src="https://img.shields.io/github/v/release/SonicCloudOrg/sonic-server?include_prereleases">
   </a>
   <a href="#">  
     <img src="https://img.shields.io/github/commit-activity/m/SonicCloudOrg/sonic-agent">

diff --git a/README_CN.md b/README_CN.md
@@ -10,7 +10,7 @@
 </p>
 <p align="center">
   <a href="#">  
-    <img src="https://img.shields.io/badge/release-v1.2.0-orange">
+    <img src="https://img.shields.io/github/v/release/SonicCloudOrg/sonic-server?include_prereleases">
   </a>
   <a href="#">  
     <img src="https://img.shields.io/github/commit-activity/m/SonicCloudOrg/sonic-agent">

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   sonic-server-eureka:
-    image: "sonicorg/sonic-server-eureka:v1.3.0-release"
+    image: "sonicorg/sonic-server-eureka:v1.3.1-beta"
     hostname: sonic-server-eureka
     environment:
       - EUREKA_HOST=sonic-server-eureka
@@ -12,7 +12,7 @@ services:
     ports:
       - "9090:9090"
   sonic-server-bus:
-    image: "sonicorg/sonic-server-bus:v1.3.0-release"
+    image: "sonicorg/sonic-server-bus:v1.3.1-beta"
     environment:
       - PROFILE=prod
       - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/
@@ -24,7 +24,7 @@ services:
     depends_on:
       - sonic-server-eureka
   sonic-server-gateway:
-    image: "sonicorg/sonic-server-gateway:v1.3.0-release"
+    image: "sonicorg/sonic-server-gateway:v1.3.1-beta"
     environment:
       - PROFILE=prod
       - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/
@@ -38,7 +38,7 @@ services:
     ports:
       - "8094:8094"
   sonic-server-controller:
-    image: "sonicorg/sonic-server-controller:v1.3.0-release"
+    image: "sonicorg/sonic-server-controller:v1.3.1-beta"
     environment:
       - PROFILE=prod
       - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/
@@ -51,7 +51,7 @@ services:
       - sonic-server-eureka
       - sonic-server-gateway
   sonic-server-folder:
-    image: "sonicorg/sonic-server-folder:v1.3.0-release"
+    image: "sonicorg/sonic-server-folder:v1.3.1-beta"
     environment:
       - PROFILE=prod
       - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/
@@ -68,7 +68,7 @@ services:
       - sonic-server-eureka
       - sonic-server-gateway
   sonic-server-task:
-    image: "sonicorg/sonic-server-task:v1.3.0-release"
+    image: "sonicorg/sonic-server-task:v1.3.1-beta"
     environment:
       - PROFILE=prod
       - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/
@@ -81,7 +81,7 @@ services:
       - sonic-server-eureka
       - sonic-server-gateway
   sonic-server-transport:
-    image: "sonicorg/sonic-server-transport:v1.3.0-release"
+    image: "sonicorg/sonic-server-transport:v1.3.1-beta"
     environment:
       - PROFILE=prod
       - EUREKA_URL=http://sonic:sonic@sonic-server-eureka:9090/eureka/

diff --git a/pom.xml b/pom.xml
@@ -90,7 +90,7 @@
                         </goals>
                         <configuration>
                             <pushImage>true</pushImage>
-                            <imageName>sonicorg/${project.artifactId}:${project.version}</imageName>
+                            <imageName>sonicorg/${project.artifactId}:v${project.version}</imageName>
                             <baseImage>adoptopenjdk/openjdk15:alpine AS builder</baseImage>
                             <runs>
                                 <run>ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime</run>

diff --git a/sonic-server-bus/pom.xml b/sonic-server-bus/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sonic-server-bus</artifactId>
-    <version>v1.3.0-release</version>
+    <version>1.3.1-beta</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/sonic-server-controller/pom.xml b/sonic-server-controller/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>sonic-server-controller</artifactId>
-    <version>v1.3.0-release</version>
+    <version>1.3.1-beta</version>
     <packaging>jar</packaging>
 
     <!-- 依赖列表   -->

diff --git a/...ontroller/src/main/java/org/cloud/sonic/controller/services/impl/ProjectsServiceImpl.java b/...ontroller/src/main/java/org/cloud/sonic/controller/services/impl/ProjectsServiceImpl.java
@@ -60,6 +60,7 @@ public void delete(int id) throws SonicException {
             versionsService.deleteByProjectId(id);
             baseMapper.deleteById(id);
         } catch (Exception e) {
+            e.printStackTrace();
             throw new SonicException("删除出错！请联系管理员！");
         }
     }

diff --git a/...roller/src/main/java/org/cloud/sonic/controller/services/impl/PublicStepsServiceImpl.java b/...roller/src/main/java/org/cloud/sonic/controller/services/impl/PublicStepsServiceImpl.java
@@ -16,6 +16,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -134,9 +135,14 @@ public PublicStepsDTO findById(int id) {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean deleteByProjectId(int projectId) {
-        PublicSteps publicSteps = lambdaQuery().eq(PublicSteps::getProjectId, projectId).one();
-        publicStepsStepsMapper.delete(new LambdaQueryWrapper<PublicStepsSteps>()
-                .eq(PublicStepsSteps::getPublicStepsId, publicSteps.getId()));
-        return delete(publicSteps.getId());
+        List<PublicSteps> publicSteps = lambdaQuery().eq(PublicSteps::getProjectId, projectId).list();
+        for (PublicSteps publicStep : publicSteps) {
+            if (!ObjectUtils.isEmpty(publicSteps)) {
+                publicStepsStepsMapper.delete(new LambdaQueryWrapper<PublicStepsSteps>()
+                        .eq(PublicStepsSteps::getPublicStepsId, publicStep.getId()));
+                delete(publicStep.getId());
+            }
+        }
+        return true;
     }
 }
diff --git a/...ntroller/src/main/java/org/cloud/sonic/controller/services/impl/TestCasesServiceImpl.java b/...ntroller/src/main/java/org/cloud/sonic/controller/services/impl/TestCasesServiceImpl.java
@@ -130,6 +130,9 @@ public JSONObject findSteps(int id) {
 
     @Override
     public List<TestCases> findByIdIn(List<Integer> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return new ArrayList<>();
+        }
         return listByIds(ids);
     }
 
@@ -160,7 +163,7 @@ private JSONObject getStep(StepsDTO steps) {
 
     @Override
     public boolean deleteByProjectId(int projectId) {
-        return baseMapper.delete(new LambdaQueryWrapper<>()) > 0;
+        return baseMapper.delete(new LambdaQueryWrapper<TestCases>().eq(TestCases::getProjectId, projectId)) > 0;
     }
 
     @Override

diff --git a/...troller/src/main/java/org/cloud/sonic/controller/services/impl/TestSuitesServiceImpl.java b/...troller/src/main/java/org/cloud/sonic/controller/services/impl/TestSuitesServiceImpl.java
@@ -61,6 +61,11 @@ public RespModel<String> runSuite(int suiteId, String strike) {
         }
 
         List<Devices> devicesList = BeanTool.transformFromInBatch(testSuitesDTO.getDevices(), Devices.class);
+        for (int i = devicesList.size() - 1; i >= 0; i--) {
+            if (devicesList.get(i).getStatus().equals(DeviceStatus.OFFLINE) || devicesList.get(i).getStatus().equals(DeviceStatus.DISCONNECTED)) {
+                devicesList.remove(devicesList.get(i));
+            }
+        }
         if (devicesList.size() == 0) {
             return new RespModel<>(3003, "所选设备暂无可用！");
         }
@@ -89,7 +94,7 @@ public RespModel<String> runSuite(int suiteId, String strike) {
         JSONObject gp = new JSONObject();
         for (GlobalParams g : globalParamsList) {
             if (g.getParamsValue().contains("|")) {
-                List<String> shuffle = Arrays.asList(g.getParamsValue().split("\\|"));
+                List<String> shuffle = new ArrayList<>(Arrays.asList(g.getParamsValue().split("\\|")));
                 Collections.shuffle(shuffle);
                 valueMap.put(g.getParamsKey(), shuffle);
             } else {

diff --git a/sonic-server-controller/src/main/resources/mapping/DevicesMapper.xml b/sonic-server-controller/src/main/resources/mapping/DevicesMapper.xml
@@ -43,7 +43,7 @@
                 </foreach>
             </if>
             <if test="params.agentId != null and params.agentId.size() > 0">
-                and d.agentId in
+                and d.agent_id in
                 <foreach collection="params.agentId" item="agentId" open="(" close=")" separator=",">
                     #{agentId}
                 </foreach>