owl-cli 6.214.0 → 7.1.0

package/examples/models/owlsys/user_logs/user_login_error_log.json

@@ -0,0 +1,65 @@
+{
+  "base_info": {
+    "#meta": {
+      "fieldLabel": "基本信息",
+      "showTitle": "no",
+      "includeKey": "no",
+      "position": "card",
+      "span": 1
+    },
+    "id": "string(16),formSize:8,listSize:12,disabled:true;日志ID",
+    "api": "string(8),formSize:8,listSize:10,searchable:true,disabled:true;登录入口",
+    "state": "choice,formSize:8,listSize:5,values:0_登录失败/1_登录成功,searchable:true,disabled:true;登录状态",
+    "lid": "string(8),formSize:8,listSize:8,searchable:true,disabled:true;登录账号",
+    "uid": "string(8),formSize:8,listSize:8,searchable:true,disabled:true;用户ID"
+  },
+  "other_info": {
+    "#meta": {
+      "fieldLabel": "IP信息",
+      "showTitle": "no",
+      "includeKey": "no",
+      "position": "card",
+      "span": 1
+    },
+    "owl_createTime": "date,formSize:8,listSize:9,disabled:true;登录时间",
+    "ip": "string(10),formSize:8,listSize:6,disabled:true;ip",
+    "ua": "string(10),formSize:8,listSize:6,disabled:true;ua",
+    "code": "string(10),formSize:8,listSize:4,disabled:true;错误码",
+    "msg": "string(10),formSize:8,listSize:12,disabled:true;错误信息"
+  },
+
+  "_t": "user_login_error_log",
+  "#meta": {
+    "rem": "会员登录异常日志",
+    "projectName": "会员日志",
+    "visitType": [
+      "platform"
+    ],
+    "exLists": [
+      {
+        "name": "默认列表",
+        "code": "defaultList",
+        "buttons":{
+          "showAdd": false,
+          "showDel": false,
+          "showRecycle": false
+        },
+        "expandIconColumnIndex":1,
+        "list": ["id","owl_createTime","state","lid","uid","api","ip","code","msg"]
+      }
+    ],
+    "pos": 12,
+    "group": {
+      "id": "systemadmin",
+      "name": "系统管理",
+      "icon": "setting",
+      "pos": 30,
+      "level2": {
+        "id": "systemlog",
+        "name": "日志管理",
+        "icon": "setting",
+        "pos": 50
+      }
+    }
+  }
+}

package/examples/models/owlsys/user_logs/user_login_log.json

@@ -0,0 +1,64 @@
+{
+  "base_info": {
+    "#meta": {
+      "fieldLabel": "基本信息",
+      "showTitle": "no",
+      "includeKey": "no",
+      "position": "card",
+      "span": 1
+    },
+    "id": "string(16),formSize:8,listSize:12,disabled:true;日志ID",
+    "api": "string(8),formSize:8,listSize:10,searchable:true,disabled:true;登录入口",
+    "state": "choice,formSize:8,listSize:5,values:0_登录失败/1_登录成功,searchable:true,disabled:true;登录状态",
+    "lid": "string(8),formSize:8,listSize:8,searchable:true,disabled:true;登录账号",
+    "uid": "string(8),formSize:8,listSize:8,searchable:true,disabled:true;用户ID"
+  },
+
+  "other_info": {
+    "#meta": {
+      "fieldLabel": "IP信息",
+      "showTitle": "no",
+      "includeKey": "no",
+      "position": "card",
+      "span": 1
+    },
+    "owl_createTime": "date,formSize:8,listSize:9,disabled:true;登录时间",
+    "ip": "string(10),formSize:8,listSize:6,disabled:true;ip",
+    "ua": "string(10),formSize:8,listSize:12,disabled:true;ua"
+  },
+
+  "_t": "user_login_log",
+  "#meta": {
+    "rem": "会员登录日志",
+    "projectName": "会员日志",
+    "visitType": [
+      "platform"
+    ],
+    "exLists": [
+      {
+        "name": "默认列表",
+        "code": "defaultList",
+        "buttons":{
+          "showAdd": false,
+          "showDel": false,
+          "showRecycle": false
+        },
+        "expandIconColumnIndex":1,
+        "list": ["id","owl_createTime","state","lid","uid","api","ip"]
+      }
+    ],
+    "pos": 11,
+    "group": {
+      "id": "systemadmin",
+      "name": "系统管理",
+      "icon": "setting",
+      "pos": 30,
+      "level2": {
+        "id": "systemlog",
+        "name": "日志管理",
+        "icon": "setting",
+        "pos": 50
+      }
+    }
+  }
+}

package/examples/owlsysApps/commonService/build.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<project name="commonService" default="all" basedir=".">
+    <property file="../../buildProperties/build.properties"></property>
+    <property name="libpath" value="../../lib"></property>
+    <target name="build">
+        <mkdir dir="out"/>
+        <exec executable="java">
+            <arg line="-jar"></arg>
+            <arg path="${libpath}/appBuilder.jar"/>
+            <arg line="src/"></arg>
+            <arg line="out/commonService.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/commonService.zip"/>
+            <arg line="通用服务接口"/>
+            <arg line="commonService"/>
+        </exec>
+    </target>
+
+    <target name="all" depends="build,deploy">
+    </target>
+</project>

package/examples/owlsysApps/commonService/src/meta.json

@@ -0,0 +1,10 @@
+{
+  "libs_namespace": "commonService",
+  "libs": [
+    "services/LoginUtil.jsx",
+    "services/PasswordUtil.jsx",
+    "services/CommonUtil.jsx",
+    "services/SessionUtil.jsx",
+    "services/BackendSessionUtil.jsx"
+  ]
+}

package/examples/owlsysApps/commonService/src/services/BackendSessionUtil.jsx

@@ -0,0 +1,84 @@
+//#import $owl_mall_u:services/modelService.jsx
+//#import $owl_backend_session:services/modelService.jsx
+
+var BackendSessionUtil = (function () {
+    var f = {
+        getSessionObject: function (isid) {
+            var sessionRec = owl_backend_sessionService.get("owl_backend_session_" + isid);
+            if (sessionRec && sessionRec.del != 'T') {
+                var sessionObjs = {};
+                if (!sessionRec.sessionObjs) {
+                    sessionObjs = {};
+                } else {
+                    sessionObjs = JSON.parse(sessionRec.sessionObjs)
+                }
+                return sessionObjs;
+            } else {
+                return {};
+            }
+        },
+        saveSessionObject: function (isid, sessionObject) {
+            var sessionRec = owl_backend_sessionService.get("owl_backend_session_" + isid);
+            if (sessionRec && sessionRec.del != 'T') {
+                sessionRec.lastModified = new Date().getTime();
+                sessionRec.sessionObjs = JSON.stringify(sessionObject);
+                owl_backend_sessionService.update(sessionRec);
+            } else {
+                var now = new Date().getTime();
+                sessionRec = {
+                    lastModified: now,
+                    createTime: now,
+                    isid: isid,
+                    sessionObjs: JSON.stringify(sessionObject)
+                }
+                owl_backend_sessionService.add(sessionRec);
+            }
+        },
+        getUserId: function (isid) {
+            if (isid) {
+                var session = f.getSessionObject(isid);
+                if (session && session.loginInfo) {
+                    var now = new Date().getTime();
+
+                    // $.log("BackendSessionUtil.jsx....getUserId...begin....userId=" + session.loginInfo.userId + "...lastActiveTime=" + session.lastActiveTime);
+                    if (!session.lastActiveTime) {
+                        //以免功能更新后，所有用户都自动退出
+                        var jUser = owl_mall_uService.get(session.loginInfo.userId);
+                        if (!jUser || jUser.isEnable != "1") {
+                            //账号异常，自动退出
+                            $.log("BackendSessionUtil.jsx....getUserId...lastActiveTime is null...用户以冻结....userId=" + session.loginInfo.userId);
+                            return "";
+                        }
+                        session.lastActiveTime = now;
+                        f.saveSessionObject(isid, session);
+
+                        $.log("BackendSessionUtil.jsx....getUserId...lastActiveTime init updated....userId=" + session.loginInfo.userId);
+                    } else {
+                        if (now - session.lastActiveTime > 1000 * 3600 * 24 * 30) {
+                            //7天内未做任何操作将自动退出系统
+                            $.log("BackendSessionUtil.jsx....getUserId...lastActiveTime > 7day....userId=" + session.loginInfo.userId);
+                            return "";
+                        }
+                        if (now - session.lastActiveTime > 1000 * 60 * 10) {
+                            var jUser = owl_mall_uService.get(session.loginInfo.userId);
+                            if (!jUser || jUser.isEnable != "1") {
+                                //账号异常，自动退出
+                                $.log("BackendSessionUtil.jsx....getUserId...用户以冻结....userId=" + session.loginInfo.userId);
+                                return "";
+                            }
+
+                            //每10分钟更新一次活跃时间
+                            session.lastActiveTime = now;
+                            f.saveSessionObject(isid, session);
+                            $.log("BackendSessionUtil.jsx....getUserId...lastActiveTime updated....userId=" + session.loginInfo.userId);
+                        }
+                    }
+                    return session.loginInfo.userId;
+                }
+            }
+            return "";
+        }
+    }
+    return f;
+})();
+

package/examples/owlsysApps/commonService/src/services/CommonUtil.jsx

@@ -0,0 +1,165 @@
+//#import $owl_mall_u:services/modelService.jsx
+//#import $owl_mall_u_category:services/modelService.jsx
+//#import $owl_mall_category:services/modelService.jsx
+//#import $owl_org_category:services/modelService.jsx
+
+
+var CommonUtilEx = (function () {
+    var f = {
+        getParentIds: function (cat, catType, modelService) {
+            if (cat.parentPathIds) {
+                var catIds = [].concat(cat.parentPathIds);
+                catIds.push(cat.id);
+                return catIds;
+            } else {
+                var pcat = modelService.get(cat.id);
+                var catIds = [];
+                while (pcat) {
+
+                    catIds.push(pcat.id);
+                    if (pcat.parent_id && pcat.parent_id != '0') {
+                        pcat = modelService.get(pcat.parent_id);
+                    }
+                    if (catIds.indexOf(pcat.id) > -1 || catIds.length > 20) {
+                        break;
+                    }
+                }
+                return catIds;
+            }
+
+
+        },
+
+
+        getUserCatIds(userId) {
+            var user = owl_mall_uService.get(userId);
+
+            if (!user) {
+                return [];
+            }
+
+            var catIds = [];
+            var user_categories = user.user_categories;
+            if (!user_categories) {
+                return [];
+            }
+
+            user_categories.forEach(function (cat) {
+                var parentIds = f.getParentIds(cat, "user", owl_mall_u_categoryService);
+                if (parentIds) {
+                    parentIds.forEach(function (catId) {
+                        if (catIds.indexOf(catId) < 0) {
+                            catIds.push(catId);
+                        }
+                    });
+                }
+            });
+
+            return catIds;
+        },
+
+        shuffleArray(array) {
+            for (var i = array.length - 1; i > 0; i--) {
+                var j = Math.floor(Math.random() * (i + 1));
+                var temp = array[i];
+                array[i] = array[j];
+                array[j] = temp;
+            }
+
+            array.sort(function (a, b) {
+                return b.priority || 0 - a.priority || 0;
+            });
+        },
+
+
+        generatePermutations(n, maxCount) {
+            var arr = [];
+            for (var i = 0; i < n; i++) {
+                arr.push(i);
+            }
+
+            var results = [];
+            var uniquePermutations = {};
+
+            function permute(array, start) {
+                if (start === array.length - 1) {
+                    var permutation = array.slice();
+                    var key = permutation.join(',');
+                    if (!uniquePermutations[key]) {
+                        results.push(permutation);
+                        uniquePermutations[key] = true;
+                    }
+                    return;
+                }
+                for (var i = start; i < array.length; i++) {
+                    var temp = array[start];
+                    array[start] = array[i];
+                    array[i] = temp;
+
+                    permute(array, start + 1);
+
+                    temp = array[start];
+                    array[start] = array[i];
+                    array[i] = temp;
+                }
+            }
+
+            function shuffleAndAddUnique() {
+                while (results.length < maxCount) {
+                    var shuffledArray = arr.slice();
+                    for (var i = n - 1; i > 0; i--) {
+                        var j = Math.floor(Math.random() * (i + 1));
+                        var temp = shuffledArray[i];
+                        shuffledArray[i] = shuffledArray[j];
+                        shuffledArray[j] = temp;
+                    }
+                    var key = shuffledArray.join(',');
+                    if (!uniquePermutations[key]) {
+                        results.push(shuffledArray);
+                        uniquePermutations[key] = true;
+                    }
+                }
+            }
+
+            if (n >= 5) {
+                shuffleAndAddUnique();
+            } else {
+                permute(arr, 0);
+            }
+
+            return results;
+        },
+
+
+        removeNull(obj) {
+            if (typeof obj != "object") {
+                return;
+            }
+            if (!obj) {
+                return;
+            }
+            for (var k in obj) {
+                if (obj[k] == null) {
+                    delete obj[k];
+                } else if (typeof obj[k] == "object" && Array.isArray(obj[k])) {
+                    for (var i = 0; i < obj[k].length; i++) {
+                        f.removeNull(obj[k][i]);
+                    }
+                } else if (typeof obj[k] == "object" && !Array.isArray(obj[k])) {
+                    f.removeNull(obj[k]);
+                }
+            }
+        },
+        roundMoney(money) {
+            if (typeof money === "undefined") {
+                return null;
+            }
+
+            money = Number(money);
+            return Number((money + 0.00001).toFixed(2));
+        }
+
+    }
+    return f;
+})();
+

package/examples/owlsysApps/commonService/src/services/LoginUtil.jsx

@@ -0,0 +1,44 @@
+//#import DigestUtil.js
+//#import $owl_mall_setting:services/modelService.jsx
+
+var LoginUtil = (function () {
+    var f = {
+        checkLogin: function (user, password) {
+            if (user.isEnable != "1") {
+                //用户未激活
+                return "1"
+            }
+            if (!user.passwordhash || !user.random) {
+                //密码为设置
+                return "2"
+            }
+            var passwordhash;
+            if (user.pwdV == "v1") {
+                passwordhash = DigestUtil.digestString(password + user.random, "SHA");
+            } else {
+                passwordhash = DigestUtil.sha1(password + user.random);
+            }
+            if (passwordhash != user.passwordhash) {
+                //密码错误
+                return "3";
+            }
+
+            return "0";
+        },
+        checkEwalletPayPassword: function (jEwallet, password) {
+            if (!jEwallet.pay_passwordhash || !jEwallet.pay_random) {
+                //密码为设置
+                return "2"
+            }
+            var passwordhash = DigestUtil.sha1(password + jEwallet.pay_random);
+            if (passwordhash != jEwallet.pay_passwordhash) {
+                //密码错误
+                return "3";
+            }
+
+            return "0";
+        }
+    }
+    return f;
+})();
+

package/examples/owlsysApps/commonService/src/services/PasswordUtil.jsx

@@ -0,0 +1,62 @@
+
+var PasswordUtil = (function () {
+    var f = {
+        charMode: function (iN) {
+            if (iN >= 48 && iN <= 57) {
+                //数字
+                return 1;
+            }
+            if (iN >= 65 && iN <= 90) {
+                //大写
+                return 2;
+            }
+            if (iN >= 97 && iN <= 122) {
+                //小写
+                return 4;
+            }
+            return 8;
+        },
+        bitTotal: function (num) {
+            var modes = 0;
+            for (i = 0; i < 4; i++) {
+                if (num & 1) modes++;
+                num >>>= 1;
+            }
+            return modes;
+        },
+        checkStrong: function (sPW) {
+            if (sPW.length < 6) {
+                return 0; //密码太短，不检测级别
+            }
+            var Modes = 0;
+            for (var i = 0; i < sPW.length; i++) {
+                //密码模式
+                Modes |= f.charMode(sPW.charCodeAt(i));
+            }
+            return f.bitTotal(Modes);
+        },
+        /**
+         * 判断密码强度，判断安全分数
+         * @param pwd
+         */
+        getPwdGrade: function (pwd) {
+            var baseGrade = 20;
+            var s_level = f.checkStrong(pwd);
+            switch (s_level) {
+                case 0:
+                case 1:
+                    baseGrade = 20;
+                    break;
+                case 2:
+                    baseGrade = 40;
+                    break;
+                default:
+                    baseGrade = 60;
+                    break;
+            }
+            return baseGrade + "";
+        }
+    }
+    return f;
+})();
+

package/examples/owlsysApps/commonService/src/services/SessionUtil.jsx

@@ -0,0 +1,87 @@
+//#import $owl_session:services/modelService.jsx
+//#import $owl_mall_u:services/modelService.jsx
+
+var SessionUtil = (function () {
+    var f = {
+        getSessionObject: function (isid) {
+            var sessionRec = owl_sessionService.get("owl_session_" + isid);
+            if (sessionRec && sessionRec.del != 'T') {
+                var sessionObjs = {};
+                if (!sessionRec.sessionObjs) {
+                    sessionObjs = {};
+                } else {
+                    sessionObjs = JSON.parse(sessionRec.sessionObjs)
+                }
+                return sessionObjs;
+            } else {
+                return {};
+            }
+        },
+        saveSessionObject: function (isid, sessionObject) {
+            var now = new Date().getTime();
+            sessionObject.lastActiveTime = now;
+
+            var sessionRec = owl_sessionService.get("owl_session_" + isid);
+            if (sessionRec && sessionRec.del != 'T') {
+                sessionRec.lastModified = new Date().getTime();
+                sessionRec.sessionObjs = JSON.stringify(sessionObject);
+                owl_sessionService.update(sessionRec);
+            } else {
+                sessionRec = {
+                    lastActiveTime: now,
+                    lastModified: now,
+                    createTime: now,
+                    isid: isid,
+                    sessionObjs: JSON.stringify(sessionObject)
+                }
+                owl_sessionService.add(sessionRec);
+            }
+        },
+        getUserId: function (isid) {
+            if (isid) {
+                var session = f.getSessionObject(isid);
+                if (session && session.loginInfo) {
+                    var now = new Date().getTime();
+
+                    // $.log("SessionUtil.jsx....getUserId...begin....userId=" + session.loginInfo.userId + "...lastActiveTime=" + session.lastActiveTime);
+                    if (!session.lastActiveTime) {
+                        //以免功能更新后，所有用户都自动退出
+                        var jUser = owl_mall_uService.get(session.loginInfo.userId);
+                        if (!jUser || jUser.isEnable != "1") {
+                            //账号异常，自动退出
+                            $.log("SessionUtil.jsx....getUserId...lastActiveTime is null...用户以冻结....userId=" + session.loginInfo.userId);
+                            return "";
+                        }
+                        session.lastActiveTime = now;
+                        f.saveSessionObject(isid, session);
+
+                        $.log("SessionUtil.jsx....getUserId...lastActiveTime init updated....userId=" + session.loginInfo.userId);
+                    } else {
+                        if (now - session.lastActiveTime > 1000 * 3600 * 24 * 30) {
+                            //7天内未做任何操作将自动退出系统
+                            $.log("SessionUtil.jsx....getUserId...lastActiveTime > 7day....userId=" + session.loginInfo.userId);
+                            return "";
+                        }
+                        if (now - session.lastActiveTime > 1000 * 60 * 10) {
+                            var jUser = owl_mall_uService.get(session.loginInfo.userId);
+                            if (!jUser || jUser.isEnable != "1") {
+                                //账号异常，自动退出
+                                $.log("SessionUtil.jsx....getUserId...用户以冻结....userId=" + session.loginInfo.userId);
+                                return "";
+                            }
+
+                            //每10分钟更新一次活跃时间
+                            session.lastActiveTime = now;
+                            f.saveSessionObject(isid, session);
+                            $.log("SessionUtil.jsx....getUserId...lastActiveTime updated....userId=" + session.loginInfo.userId);
+                        }
+                    }
+                    return session.loginInfo.userId;
+                }
+            }
+            return "";
+        }
+    }
+    return f;
+})();
+

package/examples/owlsysApps/owlPermission/build.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<project name="owlService" default="all" basedir=".">
+    <property file="../../buildProperties/build.properties"></property>
+    <property name="libpath" value="../../lib"></property>
+    <target name="build">
+        <mkdir dir="out"/>
+        <exec executable="java">
+            <arg line="-jar"></arg>
+            <arg path="${libpath}/appBuilder.jar"/>
+            <arg line="src/"></arg>
+            <arg line="out/owlPermission.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/owlPermission.zip"/>
+            <arg line="owlPermission"/>
+            <arg line="owlPermission"/>
+        </exec>
+    </target>
+
+    <target name="all" depends="build,deploy">
+    </target>
+</project>

package/examples/owlsysApps/owlPermission/src/meta.json

@@ -0,0 +1,9 @@
+{
+    "libs_namespace": "owlPermission",
+    "libs": [
+        "services/permissionService.jsx",
+        "services/RolesService.jsx"
+    ],
+    "obj_prefixes": [""],
+    "list_prefixes": [""]
+}