diff --git a/server/controllers/project.js b/server/controllers/project.js index 84cf97e8..6e53388e 100644 --- a/server/controllers/project.js +++ b/server/controllers/project.js @@ -26,7 +26,7 @@ class projectController extends baseController { verifyDomain(domain){ if(!domain) return false; - if(/^[a-zA-Z0-9\-_\.]+[a-zA-Z]{2,6}$/.test(domain)){ + if(/^[a-zA-Z0-9\-_\.]+?\.[a-zA-Z0-9\-_\.]*?[a-zA-Z]{2,6}$/.test(domain)){ return true; } return false; @@ -332,7 +332,7 @@ class projectController extends baseController { let projectData = await this.Model.get(id); - if(params.basepath = (this.handleBasepath(params.basepath)) === false){ + if((params.basepath = this.handleBasepath(params.basepath)) === false){ return ctx.body = yapi.commons.resReturn(null, 401, 'basepath格式有误') } diff --git a/server_dist/controllers/project.js b/server_dist/controllers/project.js index da77135f..a93f4d3e 100644 --- a/server_dist/controllers/project.js +++ b/server_dist/controllers/project.js @@ -86,7 +86,7 @@ var projectController = function (_baseController) { key: 'verifyDomain', value: function verifyDomain(domain) { if (!domain) return false; - if (/^[a-zA-Z0-9\-_\.]+[a-zA-Z]{2,6}$/.test(domain)) { + if (/^[a-zA-Z0-9\-_\.]+?\.[a-zA-Z0-9\-_\.]*?[a-zA-Z]{2,6}$/.test(domain)) { return true; } return false; @@ -778,7 +778,7 @@ var projectController = function (_baseController) { case 12: projectData = _context8.sent; - if (!(params.basepath = this.handleBasepath(params.basepath) === false)) { + if (!((params.basepath = this.handleBasepath(params.basepath)) === false)) { _context8.next = 15; break; }