owl-cli 6.149.0 → 6.151.0

package/defaultTemplate/api/build.xml

@@ -1,95 +1,95 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<project name="@projectCode" default="all" basedir=".">
-    <property environment="env"/>
-    <available file=".git" type="dir" property="git.present"/>
-
-
-
-    <property file="@buildProperties"></property>
-    <tstamp>
-        <format property="buildTime" pattern="yyyy-MM-dd hh:mm aa" offset="+8" unit="hour"/>
-    </tstamp>
-
-    <target name="build" depends="init,copy,doImport,closure,buildZip"></target>
-    <target name="build-debug" depends="init,copy,doImport,rename,buildZip"></target>
-
-    <target name="rename" depends="doImport">
-
-    </target>
-
-    <target name="closure" depends="doImport">
-
-    </target>
-
-    <target name="doImport" >
-
-    </target>
-
-    <target name="clean" >
-        <delete includeemptydirs="true" quiet="true" failonerror="false">
-            <fileset dir="build" includes="**/*"/>
-        </delete>
-    </target>
-
-    <target name="copy">
-        <copy todir="build" overwrite="true">
-            <fileset dir="src">
-                <include name="**/*.*"/>
-            </fileset>
-        </copy>
-
-        <exec executable="git" outputproperty="git.version" failifexecutionfails="false" errorproperty="">
-            <arg value="describe"/>
-            <arg value="--tags"/>
-            <arg value="--always"/>
-            <arg value="HEAD"/>
-        </exec>
-
-        <echoproperties destfile="git.properties" />
-
-        <replace file="build/about.jsx" propertyfile="git.properties">
-            <replacefilter token="@{git.version}" property="git.version"/>
-            <replacefilter token="@{buildTime}" property="buildTime"/>
-        </replace>
-
-        <replace file="build/about.html" propertyfile="git.properties">
-            <replacefilter token="@{git.version}" property="git.version"/>
-            <replacefilter token="@{buildTime}" property="buildTime"/>
-        </replace>
-
-    </target>
-
-    <target name="buildZip">
-        <mkdir dir="out"></mkdir>
-        <mkdir dir="build"></mkdir>
-        <exec executable="java">
-            <arg line="-jar "></arg>
-            <arg path="@libpath/appBuilder.jar"/>
-            <arg line="build"></arg>
-            <arg line="out/@projectCode.zip"/>
-        </exec>
-    </target>
-
-    <target name="deploy">
-        <exec executable="java">
-            <arg line="-jar "></arg>
-            <arg path="@libpath/appDeployer.jar"/>
-            <arg line="${deployUrl}"></arg>
-            <arg line="${deployPass}"></arg>
-            <arg line="out/@projectCode.zip"/>
-            <arg line="@projectNameApi"/>
-            <arg line="@projectCode"/>
-        </exec>
-    </target>
-
-    <target name="all" depends="build,deploy">
-    </target>
-
-    <target name="all-debug" depends="build-debug,deploy"></target>
-
-    <target name="init">
-        <mkdir dir="build/client"></mkdir>
-        <mkdir dir="out"></mkdir>
-    </target>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<project name="@projectCode" default="all" basedir=".">
+    <property environment="env"/>
+    <available file=".git" type="dir" property="git.present"/>
+
+
+
+    <property file="@buildProperties"></property>
+    <tstamp>
+        <format property="buildTime" pattern="yyyy-MM-dd hh:mm aa" offset="+8" unit="hour"/>
+    </tstamp>
+
+    <target name="build" depends="init,copy,doImport,closure,buildZip"></target>
+    <target name="build-debug" depends="init,copy,doImport,rename,buildZip"></target>
+
+    <target name="rename" depends="doImport">
+
+    </target>
+
+    <target name="closure" depends="doImport">
+
+    </target>
+
+    <target name="doImport" >
+
+    </target>
+
+    <target name="clean" >
+        <delete includeemptydirs="true" quiet="true" failonerror="false">
+            <fileset dir="build" includes="**/*"/>
+        </delete>
+    </target>
+
+    <target name="copy">
+        <copy todir="build" overwrite="true">
+            <fileset dir="src">
+                <include name="**/*.*"/>
+            </fileset>
+        </copy>
+
+        <exec executable="git" outputproperty="git.version" failifexecutionfails="false" errorproperty="">
+            <arg value="describe"/>
+            <arg value="--tags"/>
+            <arg value="--always"/>
+            <arg value="HEAD"/>
+        </exec>
+
+        <echoproperties destfile="git.properties" />
+
+        <replace file="build/about.jsx" propertyfile="git.properties">
+            <replacefilter token="@{git.version}" property="git.version"/>
+            <replacefilter token="@{buildTime}" property="buildTime"/>
+        </replace>
+
+        <replace file="build/about.html" propertyfile="git.properties">
+            <replacefilter token="@{git.version}" property="git.version"/>
+            <replacefilter token="@{buildTime}" property="buildTime"/>
+        </replace>
+
+    </target>
+
+    <target name="buildZip">
+        <mkdir dir="out"></mkdir>
+        <mkdir dir="build"></mkdir>
+        <exec executable="java">
+            <arg line="-jar "></arg>
+            <arg path="@libpath/appBuilder.jar"/>
+            <arg line="build"></arg>
+            <arg line="out/@projectCode.zip"/>
+        </exec>
+    </target>
+
+    <target name="deploy">
+        <exec executable="java">
+            <arg line="-jar "></arg>
+            <arg path="@libpath/appDeployer.jar"/>
+            <arg line="${deployUrl}"></arg>
+            <arg line="${deployPass}"></arg>
+            <arg line="out/@projectCode.zip"/>
+            <arg line="@projectNameApi"/>
+            <arg line="@projectCode"/>
+        </exec>
+    </target>
+
+    <target name="all" depends="build,deploy">
+    </target>
+
+    <target name="all-debug" depends="build-debug,deploy"></target>
+
+    <target name="init">
+        <mkdir dir="build/client"></mkdir>
+        <mkdir dir="out"></mkdir>
+    </target>
+
 </project>

package/defaultTemplate/api/src/about.html

@@ -1,13 +1,13 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>about:@projectCodeService</title>
-</head>
-<body style="margin: 60px">
-<h3>git_version: @{git.version}</h3>
-<h3>owl_version: @owl_version</h3>
-<h3>build time : @{buildTime}</h3>
-<h3>spec : @spec</h3>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>about:@projectCodeService</title>
+</head>
+<body style="margin: 60px">
+<h3>git_version: @{git.version}</h3>
+<h3>owl_version: @owl_version</h3>
+<h3>build time : @{buildTime}</h3>
+<h3>spec : @spec</h3>
 </body>

package/defaultTemplate/api/src/about.jsx

@@ -1,12 +1,12 @@
-//#import Util.js
-
-var repository_version = "@{git.version}"
-var buildTime = "@{buildTime}"
-
-var pageData = {
-    repository_version: repository_version,
-    buildTime: buildTime,
-}
-
-var html = $.runArtTemplate(appId,appMd5,"about.html",pageData);
+//#import Util.js
+
+var repository_version = "@{git.version}"
+var buildTime = "@{buildTime}"
+
+var pageData = {
+    repository_version: repository_version,
+    buildTime: buildTime,
+}
+
+var html = $.runArtTemplate(appId,appMd5,"about.html",pageData);
 out.print(html);

package/defaultTemplate/api/src/handlers/aggs.jsx

@@ -1,161 +1,161 @@
-//#import Util.js
-//#import base64.js
-//#import HttpUtil.js
-//#import session.js
-//#import $@projectCode:services/modelService.jsx
-//#import @handlers/include/checklogin.jsx
-
-var spec = @spec;
-
-function trim(s){
-    if(s){
-        return s.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
-    }
-    return ""
-}
-
-;(function(){
-
-    var env = checklogin();
-    if(!env){
-        return;
-    }
-    var shopId = env.shopId;
-    var warehouseId = env.warehouseId;
-    var m = shopId;
-
-    //判断是subplatform,还是shop,还是platform
-    var params = JSON.parse($body);
-    var searchArgs = params.searchArgs;
-    var keyword = searchArgs.keyword;
-    var pageSize = 0;
-    var from = 0;
-
-    function getKeywordQuery(){
-        if(keyword && trim(keyword).length>0){
-            return "\"" + trim(keyword) + "\""
-        }
-        else{
-            return "*"
-        }
-    }
-
-    function getFilters(){
-        delete searchArgs.keyword;
-        var filters = [];
-        for(var k in searchArgs){
-            var v = searchArgs[k];
-            if(typeof(v)=='object' && Array.isArray(v)){
-                var range={}
-                range[k] = {
-                    'gte':v[0],
-                    'lte':v[1]
-                }
-                filters.push({range:range});
-            }
-            else{
-                var term = {};
-                if(v){
-                    term[k+".keyword"] = trim('' + v)
-                    filters.push({term:term})
-                }
-
-            }
-
-        }
-        return filters;
-    }
-
-    var filters = getFilters();
-
-    if(m !== '0'){
-        filters = filters.concat([
-            {"term": { "_m.keyword": m }},
-            {"term":{"_t":spec["_t"]}}
-        ]);
-    }
-    else{
-        //如果m === '0'，代表是平台
-        filters = filters.concat([
-            {"term":{"_t":spec["_t"]}}
-        ]);
-    }
-
-
-    var query = {
-        "query": {
-            "bool": {
-                "must": {
-                    "query_string": {
-                        "query":getKeywordQuery()
-                    }
-                },
-                "must_not": {
-                    "match": {
-                        "del": "T"
-                    }
-                },
-                "filter": filters
-            }
-        }
-    }
-
-    var aggs = {};
-
-    var meta = spec[ "#meta" ];
-    if(meta.charts){
-        for(var i=0; i < meta.charts.length; i++){
-            var chart = meta.charts[i];
-            /*
-            chart = {
-                name:"daily_new_object",
-                agg: {
-                    "date_histogram": {
-                        "field": "owl_createTime",
-                        "calender_interval": "day",
-                        "format" : "yyyy-MM-dd",
-                        "time_zone": "+08:00"
-                    }
-                },
-                description:'新增用户'
-            }
-             */
-            aggs[chart.name] = chart.agg;
-        }
-    }
-
-
-    if(aggs){
-        query.aggs = aggs;
-    }
-
-
-
-    //下面开始计算统计数据
-
-    var elasticSearchUrl = $.getEnv( "elasticSearchUrl" );
-
-    var headers = { "Content-Type": "application/json;charset=utf-8" };
-    var elasticSearchUser = $.getEnv("elasticSearchUser");
-    var elasticSearchPass = $.getEnv("elasticSearchPass");
-    if(elasticSearchUser && elasticSearchPass){
-        var auth =Base64.encode(elasticSearchUser + ":" + elasticSearchPass);
-        var basicAuth = "Basic " + auth;
-        headers["Authorization"] = basicAuth;
-    }
-    var searchUrl = elasticSearchUrl+"/@projectCode/_search";
-
-    var sndTxt = JSON.stringify(query);
-    $.log(sndTxt);
-
-
-    var s = HttpUtils.postRaw( searchUrl, sndTxt, headers);
-    var result = JSON.parse(s);
-
-    result.state = 'ok';
-    out.print(JSON.stringify(result));
-
-})();
-
-
-
+//#import Util.js
+//#import base64.js
+//#import HttpUtil.js
+//#import session.js
+//#import $@projectCode:services/modelService.jsx
+//#import @handlers/include/checklogin.jsx
+
+var spec = @spec;
+
+function trim(s){
+    if(s){
+        return s.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
+    }
+    return ""
+}
+
+;(function(){
+
+    var env = checklogin();
+    if(!env){
+        return;
+    }
+    var shopId = env.shopId;
+    var warehouseId = env.warehouseId;
+    var m = shopId;
+
+    //判断是subplatform,还是shop,还是platform
+    var params = JSON.parse($body);
+    var searchArgs = params.searchArgs;
+    var keyword = searchArgs.keyword;
+    var pageSize = 0;
+    var from = 0;
+
+    function getKeywordQuery(){
+        if(keyword && trim(keyword).length>0){
+            return "\"" + trim(keyword) + "\""
+        }
+        else{
+            return "*"
+        }
+    }
+
+    function getFilters(){
+        delete searchArgs.keyword;
+        var filters = [];
+        for(var k in searchArgs){
+            var v = searchArgs[k];
+            if(typeof(v)=='object' && Array.isArray(v)){
+                var range={}
+                range[k] = {
+                    'gte':v[0],
+                    'lte':v[1]
+                }
+                filters.push({range:range});
+            }
+            else{
+                var term = {};
+                if(v){
+                    term[k+".keyword"] = trim('' + v)
+                    filters.push({term:term})
+                }
+
+            }
+
+        }
+        return filters;
+    }
+
+    var filters = getFilters();
+
+    if(m !== '0'){
+        filters = filters.concat([
+            {"term": { "_m.keyword": m }},
+            {"term":{"_t":spec["_t"]}}
+        ]);
+    }
+    else{
+        //如果m === '0'，代表是平台
+        filters = filters.concat([
+            {"term":{"_t":spec["_t"]}}
+        ]);
+    }
+
+
+    var query = {
+        "query": {
+            "bool": {
+                "must": {
+                    "query_string": {
+                        "query":getKeywordQuery()
+                    }
+                },
+                "must_not": {
+                    "match": {
+                        "del": "T"
+                    }
+                },
+                "filter": filters
+            }
+        }
+    }
+
+    var aggs = {};
+
+    var meta = spec[ "#meta" ];
+    if(meta.charts){
+        for(var i=0; i < meta.charts.length; i++){
+            var chart = meta.charts[i];
+            /*
+            chart = {
+                name:"daily_new_object",
+                agg: {
+                    "date_histogram": {
+                        "field": "owl_createTime",
+                        "calender_interval": "day",
+                        "format" : "yyyy-MM-dd",
+                        "time_zone": "+08:00"
+                    }
+                },
+                description:'新增用户'
+            }
+             */
+            aggs[chart.name] = chart.agg;
+        }
+    }
+
+
+    if(aggs){
+        query.aggs = aggs;
+    }
+
+
+
+    //下面开始计算统计数据
+
+    var elasticSearchUrl = $.getEnv( "elasticSearchUrl" );
+
+    var headers = { "Content-Type": "application/json;charset=utf-8" };
+    var elasticSearchUser = $.getEnv("elasticSearchUser");
+    var elasticSearchPass = $.getEnv("elasticSearchPass");
+    if(elasticSearchUser && elasticSearchPass){
+        var auth =Base64.encode(elasticSearchUser + ":" + elasticSearchPass);
+        var basicAuth = "Basic " + auth;
+        headers["Authorization"] = basicAuth;
+    }
+    var searchUrl = elasticSearchUrl+"/@projectCode/_search";
+
+    var sndTxt = JSON.stringify(query);
+    $.log(sndTxt);
+
+
+    var s = HttpUtils.postRaw( searchUrl, sndTxt, headers);
+    var result = JSON.parse(s);
+
+    result.state = 'ok';
+    out.print(JSON.stringify(result));
+
+})();
+
+
+