From 2b35161dbc5810e75936ca8b4acb28662f5eae90 Mon Sep 17 00:00:00 2001
From: byteblogs168 <598092184@qq.com>
Date: Fri, 1 Dec 2023 22:52:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:2.5.0=201.=E9=92=88=E5=AF=B9=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E7=A9=BA=E9=97=B4=E7=9A=84=E5=94=AF=E4=B8=80=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=202.=E6=96=B0=E5=A2=9E=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=A3=80=E6=9F=A5=E6=98=AF=E5=90=A6=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E5=94=AF=E4=B8=80=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/web/service/impl/NamespaceServiceImpl.java    | 9 +++++++--
 frontend/src/views/namespace/NamespaceForm.vue           | 9 ++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/NamespaceServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/NamespaceServiceImpl.java
index ff5e51f8..cd7b6870 100644
--- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/NamespaceServiceImpl.java
+++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/NamespaceServiceImpl.java
@@ -12,9 +12,7 @@ import com.aizuda.easy.retry.server.web.model.response.NamespaceResponseVO;
 import com.aizuda.easy.retry.server.web.service.NamespaceService;
 import com.aizuda.easy.retry.server.web.service.convert.NamespaceResponseVOConverter;
 import com.aizuda.easy.retry.template.datasource.persistence.mapper.NamespaceMapper;
-import com.aizuda.easy.retry.template.datasource.persistence.po.JobTaskBatch;
 import com.aizuda.easy.retry.template.datasource.persistence.po.Namespace;
-import com.aizuda.easy.retry.template.datasource.persistence.po.SystemUser;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +33,13 @@ public class NamespaceServiceImpl implements NamespaceService {
 
     @Override
     public Boolean saveNamespace(final NamespaceRequestVO namespaceRequestVO) {
+
+        if (StrUtil.isNotBlank(namespaceRequestVO.getUniqueId())) {
+            Assert.isTrue(namespaceMapper.selectCount(new LambdaQueryWrapper<Namespace>()
+                            .eq(Namespace::getUniqueId, namespaceRequestVO.getUniqueId())) == 0,
+                    () -> new EasyRetryServerException("空间唯一标记已经存在 {}", namespaceRequestVO.getUniqueId()));
+        }
+
         Namespace namespace = new Namespace();
         namespace.setName(namespaceRequestVO.getName());
         if (StrUtil.isBlank(namespaceRequestVO.getUniqueId())) {
diff --git a/frontend/src/views/namespace/NamespaceForm.vue b/frontend/src/views/namespace/NamespaceForm.vue
index 0d9d5440..8b3cebeb 100644
--- a/frontend/src/views/namespace/NamespaceForm.vue
+++ b/frontend/src/views/namespace/NamespaceForm.vue
@@ -13,7 +13,7 @@
           :disabled="isEdit"
           v-decorator="[
             'uniqueId',
-            {rules: [{ required: false, message: '请输入空间名称', whitespace: true}]}
+            {rules: [{ required: false, message: '请输入空间名称', whitespace: true},{required: true, max: 64, message: '最多支持64个字符！'}, {validator: validate, trigger: ['change', 'blur']}]}
           ]" />
       </a-form-item>
       <a-form-item
@@ -60,6 +60,13 @@ export default {
       this.visible = true
       this.form.resetFields()
     },
+    validate (rule, value, callback) {
+      const regex = /^[A-Za-z0-9_]+$/
+      if (!regex.test(value)) {
+        callback(new Error('仅支持数字字母下划线'))
+      }
+      callback()
+    },
     handleOk (e) {
       e.preventDefault()
       this.form.validateFields((err, values) => {