Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415

5 years ago · 2633bbcb09
1 changed files with 1 additions and 1 deletions
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java
@ -80,7 +80,7 @@ public class TenantService extends BaseService{
    Tenant tenant = new Tenant();
    Date now = new Date();

-    if (!tenantCode.matches("^[0-9a-zA-Z_.]{1,}$") || tenantCode.startsWith("-")){
+    if (!tenantCode.matches("^[0-9a-zA-Z_.-]{1,}$") || tenantCode.startsWith("-") || tenantCode.startsWith(".")){
      putMsg(result, Status.VERIFY_TENANT_CODE_ERROR);
      return result;
    }