owl-cli 7.12.0 → 7.14.0

package/examples/models/owlsys/systemAdmin/process_job_checklog.json

@@ -0,0 +1,66 @@
+{
+  "base_info": {
+    "#meta": {
+      "fieldLabel": "其他信息",
+      "showTitle": "no",
+      "includeKey": "no",
+      "position": "card",
+      "span": 3
+    },
+    "id": "string(12);id",
+    "process_id": "string(10),formSize:2,require:true,disabled:true;任务Key",
+    "name": "string(10),formSize:8;任务名称",
+    "endTime": "date,formSize:2,listSize:9;异常最后执行时间",
+    "rerunTime": "number(6),formSize:4,listSize:16;任务异常停止后自动恢复时间(单位：分钟)",
+    "remark": "string(14),formSize:8,multiline:T;备注说明"
+  },
+
+  "other_info": {
+    "#meta": {
+      "fieldLabel": "其他信息",
+      "showTitle": "no",
+      "includeKey": "no",
+      "position": "card",
+      "span": 1
+    },
+    "owl_createTime": "date,formSize:8,disabled:true,listSize:9;自动恢复时间"
+  },
+
+  "_t": "process_job_checklog",
+  "#meta": {
+    "rem": "定时任务巡查日志",
+    "projectName": "mall",
+    "parent": [
+      "platform"
+    ],
+    "visitType": [
+      "platform"
+    ],
+    "exLists": [
+      {
+        "name": "默认列表",
+        "code": "defaultList",
+        "buttons":{
+          "showAdd": false,
+          "showDel": false,
+          "showRecycle": false
+        },
+        "expandIconColumnIndex":1,
+        "list": ["id","process_id","name","endTime","owl_createTime","rerunTime","remark"]
+      }
+    ],
+    "pos": 11,
+    "group": {
+      "id": "systemadmin",
+      "name": "系统管理",
+      "icon": "setting",
+      "pos": 30,
+      "level2": {
+        "id": "systemtask",
+        "name": "任务管理",
+        "icon": "setting",
+        "pos": 51
+      }
+    }
+  }
+}

package/examples/models/owlsys/systemAdmin/process_job_log.json

@@ -0,0 +1,34 @@
+{
+  "id": "string(12);id",
+  "process_id": "string(12),formSize:2,require:true,disabled:true;任务Key",
+  "objId": "string(12),formSize:2,require:true,disabled:true,isId:true;相关对象",
+  "state": "choice,formSize:1,values:notstart_未执行/running_正在执行,searchable:true;状态",
+  "name": "string(12),formSize:8;任务名称",
+  "startTime": "date,formSize:4;开始时间",
+  "endTime": "date,formSize:4;结束时间",
+  "remark": "string(12),formSize:8,multiline:T;任务说明",
+  "_t": "process_job_log",
+  "#meta": {
+    "rem": "定时任务日志",
+    "projectName": "mall",
+    "parent": [
+      "platform"
+    ],
+    "visitType": [
+      "platform"
+    ],
+    "pos": 1,
+    "group": {
+      "id": "systemadmin",
+      "name": "系统管理",
+      "icon": "setting",
+      "pos": 30,
+      "level2": {
+        "id": "systemtask",
+        "name": "任务管理",
+        "icon": "setting",
+        "pos": 51
+      }
+    }
+  }
+}

package/examples/models/owlsys/systemAdmin/roleOptions.json

@@ -0,0 +1,36 @@
+{
+  "id": "string(128),listSize:18,tab:01,disabled:true,formSize:2;角色Id",
+  "roleId": "string(128),listSize:18,tab:01,disabled:true,formSize:2;角色Id",
+  "roleName": "string(128),listSize:16,tab:02,searchable:true,formSize:2,required:true;角色名称",
+  "modelId": "string(128),tab:03,multiLine:T,formSize:8,help:从哪个model取出数据;modelId",
+  "searchArgs": "string(128),tab:03,multiLine:T,formSize:8;搜索条件",
+  "_t":"roleOptions",
+  "#meta":{
+    "push": true,
+    "hide": "true",
+    "rem":"角色选项",
+    "projectName":"roles",
+    "parent":["platform"],
+    "visitType": [
+      "platform"
+    ],
+    "pos": 100,
+    "group": {
+      "id": "systemadmin",
+      "name": "系统管理",
+      "icon": "setting",
+      "pos": 30
+    },
+    "export":[
+      {
+        "label":"导出完整",
+        "mainTitleFormat":{"background":"#474747","color":"#cccccc"},
+        "subTitleFormat":{"background":"#777777","color":"#ffffff"},
+        "subRecordFormat":{"background":"#ffffff","color":"#000000"},
+        "mainRecordFormat":{"background":"#555555","color":"#FFFFFF"},
+        "key":"completeDoc",
+        "fields":["*"]
+      }
+    ]
+  }
+}

package/examples/models/owlsys/systemAdmin/sensitive_keywords.json

@@ -0,0 +1,58 @@
+{
+  "id": "string(64),formSize:2,listSize:12,hidden:false,disabled:true;内部ID",
+  "args_key": "string(32),formSize:1,listSize:12,tab:02,searchable:true,required:true;参数键",
+  "isEnable": "choice,formSize:1,listSize:5,values:y_是/n_否,defaultValue:y,searchable:true,required:true;是否启用",
+  "blank1": "space,formSize:4;空白",
+  "content":"string(128),formSize:8,listSize:20,multiline:T;敏感关键词",
+
+  "_t": "mall_sensitive_keywords",
+  "#meta": {
+    "id": "<%=#args_key%>",
+    "push": true,
+    "rem": "敏感关键词管理",
+    "projectName": "敏感关键词管理",
+    "changeLogEnabled": false,
+    "parent": [
+      "platform"
+    ],
+    "visitType": [
+      "platform"
+    ],
+    "list": [
+      "id",
+      "args_key"
+    ],
+    "pos": 10,
+    "group": {
+      "id": "systemadmin",
+      "name": "系统管理",
+      "icon": "setting",
+      "pos": 30
+    },
+    "export": [
+      {
+        "label": "导出完整",
+        "mainTitleFormat": {
+          "background": "#474747",
+          "color": "#cccccc"
+        },
+        "subTitleFormat": {
+          "background": "#777777",
+          "color": "#ffffff"
+        },
+        "subRecordFormat": {
+          "background": "#ffffff",
+          "color": "#000000"
+        },
+        "mainRecordFormat": {
+          "background": "#555555",
+          "color": "#FFFFFF"
+        },
+        "key": "completeDoc",
+        "fields": [
+          "*"
+        ]
+      }
+    ]
+  }
+}

package/examples/models/owlsys/systemAdmin/server_token.json

@@ -0,0 +1,38 @@
+{
+  "id": "string(12),formSize:2;id",
+  "blank1": "spacer,formSize:6;空白",
+  "token": "string(12),unique:true,formSize:2;token",
+  "spacer1": "blank,formSize:6;空白",
+  "user_id": "string(12),formSize:2;user_id",
+  "spacer2": "blank,formSize:6;空白",
+  "expire_date": "date,formSize:2;过期时间",
+  "spacer3": "blank,formSize:6;空白",
+  "description": "string(16),multiline:T,formSize:2;描述",
+  "spacer4": "blank,formSize:6;空白",
+  "_t": "server_token",
+
+  "#meta": {
+    "rem": "系统token",
+    "projectName": "mall",
+    "hide": "true",
+    "parent": [
+      "platform"
+    ],
+    "visitType": [
+      "platform"
+    ],
+    "pos": 1,
+    "group": {
+      "id": "systemadmin",
+      "name": "系统管理",
+      "icon": "setting",
+      "pos": 30,
+      "level2": {
+        "id": "interface",
+        "name": "系统对接",
+        "icon": "setting",
+        "pos": 51
+      }
+    }
+  }
+}

package/examples/models/owlsys/systemAdmin/session.json

@@ -0,0 +1,51 @@
+{
+  "id": "string(19),listSize:18,tab:01,disabled:true,formSize:2;内部ID",
+  "isid": "string(12),listSize:16,tab:02,searchable:true,formSize:2,required:true;isid",
+  "openId": "string(12),listSize:16,tab:03,searchable:true,formSize:2,required:false;openId",
+  "unionId":"string(12),listSize:16,tab:04,searchable:true,formSize:2,required:false;unionId",
+  "userId": "string(12),listSize:18,searchableTrue,tab:06;userId",
+  "loginDate": "date;登录时间",
+  "expired_date": "date;过期时间",
+  "loginIp": "string(12),listSize:18,searchable:true,tab:06;loginIp",
+  "accessToken": "string(12),listSize:18,searchable:true,multiline:T,formSize:8,tab:07;accessToken",
+  "refreshToken": "string(12),listSize:18,searchable:true,multiline:T,formSize:8,tab:08;refreshToken",
+  "accessTokenExpires": "date,listSize:18,searchable:true,tab:09;accessTokenExpires",
+  "switchFromOrgId":"string(12),tab,searchable:true:10;switchFromOrgId",
+  "switchFromBcid":"string(12),tab,searchable:true:10;switchFromBcid",
+  "runAsOrgId":"string(12),tab,searchable:true:10;switchFromBcid",
+  "runAsOrgIdBegin": "date,listSize:18,searchable:true,tab:09;runAsOrgIdBegin",
+  "runAsOrgIdEnd": "date,listSize:18,searchable:true,tab:09;runAsOrgIdEnd",
+  "sessionObjs":"string(128),multiline:T,formSize:8,tab:10;sessionObjs",
+
+  "_t":"mall_session",
+  "#meta":{
+    "id": "<%=#isid%>",
+    "push": true,
+    "hide": "true",
+    "rem":"session",
+    "projectName":"session",
+    "parent":["platform"],
+    "visitType": [
+      "platform",
+      "shop"
+    ],
+    "pos": 100,
+    "group": {
+      "id": "systemadmin",
+      "name": "系统管理",
+      "icon": "setting",
+      "pos": 30
+    },
+    "export":[
+      {
+        "label":"导出完整",
+        "mainTitleFormat":{"background":"#474747","color":"#cccccc"},
+        "subTitleFormat":{"background":"#777777","color":"#ffffff"},
+        "subRecordFormat":{"background":"#ffffff","color":"#000000"},
+        "mainRecordFormat":{"background":"#555555","color":"#FFFFFF"},
+        "key":"completeDoc",
+        "fields":["*"]
+      }
+    ]
+  }
+}

package/examples/models/owlsys/systemAdmin/task_version.json

@@ -0,0 +1,60 @@
+{
+  "base_info": {
+    "#meta": {
+      "fieldLabel": "基本信息",
+      "showTitle": "no",
+      "includeKey": "no",
+      "position": "card",
+      "span": 3
+    },
+    "id": "string(12),formSize:3,disabled:true;id",
+    "tn": "string(32),formSize:8,disabled:true;task说明"
+  },
+  "other_info": {
+    "#meta": {
+      "fieldLabel": "其他信息",
+      "showTitle": "no",
+      "includeKey": "no",
+      "position": "card",
+      "span": 1
+    },
+    "owl_createTime": "date,formSize:8,disabled:true,listSize:12;操作时间",
+    "owl_createUserId": "string(18),formSize:8,listSize:12,disabled:true;操作人"
+  },
+
+
+  "_t": "task_version",
+  "#meta":{
+    "push": false,
+    "rem":"任务版本号",
+    "projectName":"任务版本号",
+    "parent":["platform"],
+    "visitType": [
+      "platform"
+    ],
+    "pos": 20,
+    "group": {
+      "id": "systemadmin",
+      "name": "系统管理",
+      "icon": "setting",
+      "pos": 30,
+      "level2": {
+        "id": "systemlog",
+        "name": "日志管理",
+        "icon": "setting",
+        "pos": 50
+      }
+    },
+    "export":[
+      {
+        "label":"导出完整",
+        "mainTitleFormat":{"background":"#474747","color":"#cccccc"},
+        "subTitleFormat":{"background":"#777777","color":"#ffffff"},
+        "subRecordFormat":{"background":"#ffffff","color":"#000000"},
+        "mainRecordFormat":{"background":"#555555","color":"#FFFFFF"},
+        "key":"completeDoc",
+        "fields":["*"]
+      }
+    ]
+  }
+}

package/examples/models/owlsys/systemAdmin/taskinfo.json

@@ -0,0 +1,38 @@
+{
+  "id": "string(12);id",
+  "beginTime": "date;开始时间",
+  "submitTime": "date;提交时间",
+  "lastTime": "date;最后时间",
+  "endTime": "date;结束时间",
+  "submitUserId": "string(12),isId:true;提交用户",
+  "processState": "choice:notstart_未开始/processing_正在执行/succeeded_成功/failed_失败;状态",
+  "taskId": "string(12);任务ID",
+  "appId": "string(12);appId",
+  "pageId": "string(12);pageId",
+  "params": "string(12),formSize:8,multiline:T;参数",
+  "percent" : "number(3);百分比",
+  "msg":"string(12),formSize:8,multiline:T;执行消息",
+  "fileUrl": "string(12);文件路径",
+  "_t": "task_info",
+  "#meta": {
+    "rem": "任务日志",
+    "projectName":"mall",
+    "parent":["platform"],
+    "visitType": [
+      "platform"
+    ],
+    "pos": 3,
+    "group": {
+      "id": "systemadmin",
+      "name": "系统管理",
+      "icon": "setting",
+      "pos": 30,
+      "level2": {
+        "id": "systemtask",
+        "name": "任务管理",
+        "icon": "setting",
+        "pos": 51
+      }
+    }
+  }
+}

package/examples/models/owlsys/systemAdmin/tasks/api/src/plugins/doRunTask.jsx

@@ -0,0 +1,32 @@
+//#import jobs.js
+//#import $owl_tasks:services/modelService.jsx
+
+function main() {
+
+    var params = JSON.parse($body);
+    var taskId = params.id;
+    if (!taskId) {
+        out.print(JSON.stringify({state: "err", msg: "参数错误"}));
+        return;
+    }
+
+    var jTask = owl_tasksService.get(taskId);
+    if (!jTask) {
+        out.print(JSON.stringify({state: "err", msg: "任务不存在"}));
+        return;
+    }
+    if (jTask.state == "running") {
+        out.print(JSON.stringify({state: "err", msg: "当前任务正在执行，请等待本次执行完毕后再提交"}));
+        return;
+    }
+    var jParams = JSON.parse(jTask.params || "{}");
+    jParams.taskId = jTask.id;
+    jParams.taskVid = jTask._v;
+
+    var curTime = new Date().getTime();
+    JobsService.submitTask(jTask.appId, jTask.pageId, jParams, curTime);
+
+    out.print(JSON.stringify({state: "ok", msg: "操作成功"}));
+}
+
+main();

package/examples/models/owlsys/systemAdmin/tasks.json

@@ -0,0 +1,43 @@
+{
+  "id": "string(12);id",
+  "_v": "number(12),disabled:false;版本",
+  "appId": "string(12),formSize:2;appId",
+  "pageId": "string(12),formSize:2;pageId",
+  "state": "choice,formSize:1,values:notstart_未执行/running_正在执行,searchable:true;状态",
+  "name": "string(12),formSize:8;任务名称",
+  "params": "string(12),formSize:8,multiline:T;参数",
+  "remark": "string(12),formSize:8,multiline:T;任务说明",
+  "_t": "tasks",
+  "#meta": {
+    "rem": "任务管理",
+    "projectName": "mall",
+    "parent": [
+      "platform"
+    ],
+    "visitType": [
+      "platform"
+    ],
+    "pos": 2,
+    "formPlugins": [
+      {
+        "label": "开始执行",
+        "id": "tasks_doRunTask",
+        "action": "/owl_tasks/plugins/doRunTask.jsx",
+        "responseAction": "showMessage",
+        "help": "开始执行任务"
+      }
+    ],
+    "group": {
+      "id": "systemadmin",
+      "name": "系统管理",
+      "icon": "setting",
+      "pos": 30,
+      "level2": {
+        "id": "systemtask",
+        "name": "任务管理",
+        "icon": "setting",
+        "pos": 51
+      }
+    }
+  }
+}

package/examples/owlsysApps/owlPasswordService/build.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <project name="owlPasswordService" default="all" basedir=".">
-    <property file="../../owl-models/build.properties"></property>
+    <property file="../../buildProperties/build.properties"></property>
+    <property name="libpath" value="${antlibpath}"></property>
     <target name="build">
         <mkdir dir="out"/>
         <exec executable="java">
             <arg line="-jar"></arg>
-            <arg path="../lib/appBuilder.jar"/>
+            <arg path="${libpath}/appBuilder.jar"/>
             <arg line="src/"></arg>
             <arg line="out/owlPasswordService.zip"/>
         </exec>
@@ -14,7 +15,7 @@
     <target name="deploy">
         <exec executable="java">
             <arg line="-jar "></arg>
-            <arg path="../lib/appDeployer.jar"/>
+            <arg path="${libpath}/appDeployer.jar"/>
             <arg line="${deployUrl}"></arg>
             <arg line="${deployPass}"></arg>
             <arg line="out/owlPasswordService.zip"/>

package/package.json

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