Merge remote-tracking branch 'origin/dev/one' into dev/one

diagbotman-service/src/main/java/com/diagbot/facade/ServiceInfoFacade.java

@@ -96,7 +96,7 @@ public class ServiceInfoFacade extends ServiceInfoServiceImpl {
         List<ProductService> psList = productServiceFacade.list(qwps);
         if (psList.size() > 0) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-                    "该服务端正在使用，不允许删除，请先删除关联产品！");
+                    "该服务端正在使用，不允许删除，请先删除关联产品");
         }
         serviceInfo.setIsDeleted(IsDeleteEnum.Y.getKey());
         this.updateById(serviceInfo);

diagbotman-service/src/main/java/com/diagbot/facade/ServiceTokenFacade.java

@@ -69,30 +69,30 @@ public class ServiceTokenFacade extends ServiceTokenServiceImpl {
         if (TokenTypeEnum.Trial.getKey() == st.getType()) {
             ProductService ps = productServiceFacade.getById(st.getProductServiceId());
             if (ps == null) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "无权限访问!");
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "无权限访问");
             }
             if (!ps.getProductId().equals(serviceTokenVo.getProductId())) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "无权限访问!");
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "无权限访问");
             }
             Date date = new Date();
             if (st.getExpiringDate().getTime() < date.getTime()) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "访问权限已过期!");
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "访问权限已过期");
             }
         } else {
             List<OpenedProducts> opList = openedProductsFacade.getByAppkeyAndSecret(paramMap);
             if (ListUtil.isEmpty(opList)) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "无权限访问!");
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "无权限访问");
             }
             if (opList.size() != 1) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "当前appkey和secret对应多条数据!");
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "当前appkey和secret对应多条数据");
             }
             OpenedProducts op = opList.get(0);// 正常只有一条数据
             Date date = new Date();
             if (!(StatusEnum.Enable.getKey() == op.getServiceStatus())) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "当前服务已停用!");
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "当前服务已停用");
             }
             if (op.getEndTime().getTime() < date.getTime()) {
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "访问权限已过期!");
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "访问权限已过期");
             }
         }
         return RespDTO.onSuc(true);