diff --git a/src/gen/cmd_gen.js b/src/gen/cmd_gen.js
index e62079015162712498fa31eafa3be6d6a45a0683..cff2b185e3a48ea6eb10a88740d6df5987b64f25 100644
--- a/src/gen/cmd_gen.js
+++ b/src/gen/cmd_gen.js
@@ -40,26 +40,33 @@ if (fileNames == null && pathDir == null) {
 }
 
 function readFiles() {
-    let filenameArray = fileNames.split(" ");
+    fileNames = fileNames.replace(/(^\s*)|(\s*$)/g, ''); // trim before and after espace
+    let regex = ',';
+    let filenameArray = fileNames.toString().split(regex);
+
     let n = filenameArray.length;
     for (let i = 0; i < n; i++) {
         let fileName = filenameArray[i];
-        checkGenerate(fileName);
+        if (fileName !== ' ') {
+            fileName = fileName.replace(/(^\s*)|(\s*$)/g, '');
+            checkGenerate(fileName);
+        }
     }
 }
+
 function readDirFiles() {
-    fs.readdir(pathDir + "", function (err, files) {
+    fs.readdir(pathDir + '', function (err, files) {
         if (err) {
-            NapiLog.logError("readdir file error" + err);
+            NapiLog.logError('readdir file error' + err);
             return;
         }
         (function iterator(i) {
-            if (i == files.length) {
+            if (i === files.length) {
                 return;
             }
-            fs.stat(path.join(pathDir + "", files[i]), function (err, data) {
+            fs.stat(path.join(pathDir + '', files[i]), function (err, data) {
                 if (err) {
-                    NapiLog.logError("read file error" + err);
+                    NapiLog.logError('read file error' + err);
                     return;
                 }
                 if (data.isFile()) {
@@ -74,7 +81,7 @@ function readDirFiles() {
 
 function checkGenerate(fileName) {
     let fn = re.getFileInPath(fileName);
-    let tt = re.match("@ohos.[a-zA-Z0-9]+.d.ts", fn);
+    let tt = re.match('@ohos.[a-zA-Z0-9]+.d.ts', fn);
     if (tt) {
         let result = checkFileError(fileName);
         if (result[0]) {
@@ -86,14 +93,14 @@ function checkGenerate(fileName) {
 
     }
     else {
-        NapiLog.logError("file name " + fn + " format invalid, @ohos.input_sample.d.ts");
+        NapiLog.logError('file name ' + fn + ' format invalid, @ohos.input_sample.d.ts');
     }
 }
 
 let ret = NapiLog.getResult();
 if (ret[0]) {
-    NapiLog.logInfo("success");
+    NapiLog.logInfo('success');
 }
 else {
-    NapiLog.logInfo("fail\n" + ret[1]);
+    NapiLog.logInfo('fail\n' + ret[1]);
 }
diff --git a/src/gen/main.js b/src/gen/main.js
index 703b10540c7b496a5bdb513103da727963b6a5dc..95ab5a0ef24b35d2022f947579c347f057413cc1 100644
--- a/src/gen/main.js
+++ b/src/gen/main.js
@@ -19,15 +19,13 @@ const re = require("./tools/re");
 
 function doGenerate(ifname, destdir) {
     let structOfTs = analyzeFile(ifname);
-    let fn = re.getFileInPath(ifname)
-    let tt = re.match("@ohos.([a-zA-Z0-9]+).d.ts", fn)
-    if(tt)
-    {
-        let moduleName=re.getReg(fn,tt.regs[1]);
+    let fn = re.getFileInPath(ifname);
+    let tt = re.match('@ohos.([.a-z_A-Z0-9]+).d.ts', fn);
+    if (tt) {
+        let moduleName = re.getReg(fn, tt.regs[1]);
         generateAll(structOfTs, destdir, moduleName);
-    }
-    else {
-        NapiLog.logError("file name " + fn + " format invalid, @ohos.input_sample.d.ts");
+    } else {
+        NapiLog.logError('file name ' + fn + ' format invalid, @ohos.input_sample.d.ts');
     }
 }