@domain.js/main 0.7.6 → 0.7.8

package/dist/deps/rest/utils.js

@@ -336,6 +336,12 @@ function Utils(cnf, deps) {
                 where[sequelize_1.Op.and] = [];
             where[sequelize_1.Op.and].push(sequelize_1.Sequelize.where(sequelize_1.Sequelize.fn("FIND_IN_SET", params[`${name}_ins`], sequelize_1.Sequelize.col(`${modelAlias4Ins}.${col}`)), sequelize_1.Op.gte, 1));
         }
+        // 处理 json_contains 方式的过滤
+        if (_.isString(params[`${name}_contains`]) || _.isNumber(params[`${name}_contains`])) {
+            if (!where[sequelize_1.Op.and])
+                where[sequelize_1.Op.and] = [];
+            where[sequelize_1.Op.and].push(sequelize_1.Sequelize.where(sequelize_1.Sequelize.fn("JSON_CONTAINS", sequelize_1.Sequelize.col(`${modelAlias4Ins}.${col}`), params[`${name}_contains`]), true));
+        }
         // 处理 find_in_set 方式的过滤 _ins_and
         if (_.isString(params[`${name}_ins_and`])) {
             if (!where[sequelize_1.Op.and])

package/dist/http/utils.js

@@ -34,6 +34,18 @@ const enc = encodeURI;
 const TMPDIR = os.tmpdir();
 function Utils(cnf) {
     const proxyIps = new Set((cnf.proxyIps || "127.0.0.1").split(","));
+    /**
+     * 判断是否是内网ip
+     * 10.0.0.0 - 10.255.255.255 (10/8 前缀)
+     * 172.16.0.0 - 172.31.255.255 (172.16/12 到 172.31/12 前缀)
+     * 192.168.0.0 - 192.168.255.255 (192.168/16 前缀)
+     */
+    const isInternalIp = (ip) => {
+        const parts = ip.split(".").map(Number);
+        return (parts[0] === 10 ||
+            (parts[0] === 192 && parts[1] === 168) ||
+            (parts[0] === 172 && parts[1] >= 16 && parts[1] <= 31));
+    };
     const utils = {
         ucwords(value) {
             return `${value[0].toUpperCase()}${value.substring(1)}`;
@@ -56,7 +68,7 @@ function Utils(cnf) {
          */
         realIp(req) {
             const remoteIp = utils.remoteIp(req);
-            if (!proxyIps.has(remoteIp))
+            if (!proxyIps.has(remoteIp) && !isInternalIp(remoteIp))
                 return remoteIp;
             return (req.headers["x-real-ip"] || remoteIp).toString();
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domain.js/main",
-  "version": "0.7.6",
+  "version": "0.7.8",
   "description": "DDD framework",
   "main": "dist/index.js",
   "bin": {
@@ -78,10 +78,10 @@
     "mysql2": "^2.3.3",
     "restify": "^11.1.0",
     "restify-errors": "^8.0.2",
-    "sequelize": "^6.16.1",
+    "sequelize": "^6.37.3",
     "socket.io": "^4.4.1",
     "type-fest": "^2.8.0",
     "uuid": "^8.3.2",
-    "xlsx": "^0.17.4"
+    "xlsx": "^0.18.5"
   }
 }