owl-cli 6.152.0 → 6.154.0

package/bin/owl.js

@@ -67,9 +67,11 @@ function mkdir(path) {
 function getIndexMapping(flatternedSpecs){
     var allFields = flatternedSpecs.allFields;
     var propMappings = {};
+    var stockFields = ["owl_createTime","m","_t","_v","_orgIds","_orgId","del","owl_createUserId","owl_lastModifiedUserId","owl_modifyTime","owl_createTime"];
     for(var i=0; i<allFields.length; i++){
         var field = allFields[i];
-        if(field.key == 'owl_createTime' || field.key == 'm' ){
+
+        if(stockFields.indexOf(field.key)>=0){
             continue;
         }
         if(field.fieldType == 'date'){
@@ -78,7 +80,7 @@ function getIndexMapping(flatternedSpecs){
             };
 
         }
-        else if(field.fieldType == 'string'){
+        else if(field.fieldType == 'string' || field.fieldType == 'choice'){
             propMappings[field.key] = {
                 "type":"text",
                 "fields": {
@@ -89,6 +91,11 @@ function getIndexMapping(flatternedSpecs){
                 }
             };
         }
+        else if(field.fieldType=='number'){
+            propMappings[field.key] = {
+                "type":"double"
+            };
+        }
     }
     if(Object.keys(propMappings).length>0){
         var s = JSON.stringify(propMappings);
@@ -262,6 +269,9 @@ function processOwlFile(dir,name, outdir, templatePath, buildType, modelDir,proj
 
 function processInputDir(dir, outdir, templatePath, buildType, project) {
     readdirSync(resolve(cwd, dir)).map(name => {
+        if(name == 'api' || name=='sql'){
+            return;
+        }
         if (isDirectory(resolve(dir, name))) {
             try {
                 fs.mkdirSync(resolve(outdir, name))

package/defaultTemplate/api/src/init/indexConfigs/createIndex.json

@@ -12,40 +12,73 @@
       }
     }
   },
-
   "mappings": {
-      "dynamic_templates": [
-        {
-          "integers": {
-            "match_mapping_type": "long",
-            "mapping": {
-              "type": "double"
-            }
+    "dynamic": "false",
+    "properties": {
+      "m": {
+        "type": "keyword"
+      },
+      "_t": {
+        "type": "keyword"
+      },
+      "_v": {
+        "type": "integer"
+      },
+      "_orgIds": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword",
+            "ignore_above": 256
           }
-        },{
-            "geo_point": {
-                "match_mapping_type": "object",
-                "match": "*_geo_point",
-                "mapping": {
-                    "type": "geo_point"
-                }
-            }
         }
-      ],
-      "properties": {
-        "m": {
-          "type":  "keyword"
-        },
-        "_t":{
-          "type": "keyword"
-        },
-        "owl_createTime":{
-          "type":"date"
+      },
+      "_orgId": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword",
+            "ignore_above": 256
+          }
         }
-        @fieldMappings
+      },
+      "del": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword",
+            "ignore_above": 256
+          }
+        }
+      },
+      "owl_createUserId": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword",
+            "ignore_above": 256
+          }
+        }
+      },
+      "owl_lastModifiedUserId": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword",
+            "ignore_above": 256
+          }
+        }
+      },
+      "owl_modifyTime": {
+        "type": "date"
+      },
+      "owl_createTime": {
+        "type": "date"
       }
+      @fieldMappings
+    }
   },
-  "aliases" : {
+  "aliases": {
     "@projectCode": {}
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owl-cli",
-  "version": "6.152.0",
+  "version": "6.154.0",
   "main": "index.js",
   "preferGlobal": true,
   "bin": {