owl-cli 6.208.0 → 6.210.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/bin/owl.js
CHANGED
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
const {lstatSync, readdirSync} = require('fs')
|
|
4
4
|
const fs = require('fs')
|
|
5
|
-
const {join, resolve} = require('path')
|
|
5
|
+
const {join, resolve,dirname,basename} = require('path')
|
|
6
6
|
const {getFormSpecs, flattenFormSpecs} = require('./dsl')
|
|
7
7
|
const {genTableSql} = require('./table_mysql.js');
|
|
8
8
|
const template = require('art-template')
|
|
9
|
+
const path = require('path');
|
|
9
10
|
|
|
10
11
|
const isDirectory = source => lstatSync(source).isDirectory()
|
|
11
12
|
const isFile = source => {
|
|
@@ -319,4 +320,30 @@ var fulloutPath = resolve(cwd,outPath);
|
|
|
319
320
|
mkdir(fulloutPath);
|
|
320
321
|
|
|
321
322
|
|
|
322
|
-
|
|
323
|
+
|
|
324
|
+
var inputPattern = null;
|
|
325
|
+
if(process.argv.length>2){
|
|
326
|
+
inputPattern = process.argv[2];
|
|
327
|
+
console.log("compiling" + inputPattern);
|
|
328
|
+
}
|
|
329
|
+
|
|
330
|
+
if(inputPattern){
|
|
331
|
+
if(isDirectory(inputPattern)){
|
|
332
|
+
let inDir = resolve(inPath,inputPattern);
|
|
333
|
+
let outDir = resolve(fulloutPath,inputPattern);
|
|
334
|
+
processInputDir(inDir, outDir, templatePath, buildType,project);
|
|
335
|
+
return;
|
|
336
|
+
}
|
|
337
|
+
else if (inputPattern.indexOf('.json') > 0) {
|
|
338
|
+
let inDir = dirname(resolve(inPath,inputPattern));
|
|
339
|
+
let name =basename(resolve(inPath,inputPattern));
|
|
340
|
+
let outDir = dirname(resolve(fulloutPath,inputPattern));
|
|
341
|
+
processOwlFile(inDir, name, outDir, templatePath, buildType, dir, project)
|
|
342
|
+
console.log("processed " + name);
|
|
343
|
+
return;
|
|
344
|
+
}
|
|
345
|
+
}
|
|
346
|
+
else{
|
|
347
|
+
processInputDir(inPath, fulloutPath, templatePath, buildType,project);
|
|
348
|
+
}
|
|
349
|
+
|
|
@@ -26,7 +26,10 @@ function getUserByToken(token){
|
|
|
26
26
|
if(!server_token){
|
|
27
27
|
return null;
|
|
28
28
|
}
|
|
29
|
-
var user_id = server_token.
|
|
29
|
+
var user_id = server_token.user_id;
|
|
30
|
+
if(user_id=='0'){
|
|
31
|
+
return {id:'0'}
|
|
32
|
+
}
|
|
30
33
|
var user = owl_mall_uService.get(user_id);
|
|
31
34
|
return user;
|
|
32
35
|
}
|