chanjs 2.0.20 → 2.1.1

package/core/service.js

@@ -212,9 +212,10 @@ async find(query = {}) {
    * @param {number} options.pageSize - 每页条数
    * @param {Object} options.query    - 查询条件
    * @param {Array}  options.field    - 返回字段
+   * @param {Object} options.sort     - 排序条件 { field: 'asc|desc' }
    * @returns {Promise} 查询结果
    */
-  async query({ current = 1, pageSize = 10, query = {}, field = [] }) {
+  async query({ current = 1, pageSize = 10, query = {}, field = [], sort = {} }) {
     try {
       const size = pageSize; // 如需要可再做非空校验
       const offset = (current - 1) * size;
@@ -231,6 +232,16 @@ async find(query = {}) {
 
       if (field && field.length) dataQuery = dataQuery.select(field);
 
+      // 应用排序（仅支持对象模式）
+      if (sort && typeof sort === 'object' && Object.keys(sort).length) {
+        for (const [field, dir] of Object.entries(sort)) {
+          const direction = ['asc', 'desc'].includes(dir.toLowerCase()) 
+            ? dir.toLowerCase() 
+            : 'asc';
+          dataQuery = dataQuery.orderBy(field, direction);
+        }
+      }
+
       const [totalResult, list] = await Promise.all([
         countQuery.first(),
         dataQuery.offset(offset).limit(size),

package/helper/ip.js

@@ -6,8 +6,6 @@
 export const getIp = (req) => {
   // 优先级从高到低获取可能的IP来源
   const ipSources = [
-    req.headers["x-forwarded-for"], // 代理场景下的真实IP（可能多个，逗号分隔）
-    req.headers["x-real-ip"], // 部分代理服务器使用
     req.ip, // Express内置的IP获取（已处理代理）
     req.connection?.remoteAddress, // 底层连接的远程地址
     req.socket?.remoteAddress, // 套接字的远程地址

package/index.js

@@ -67,9 +67,10 @@ class Chan {
       statics,
       logger,
       cors,
+      PROXY,
     } = Chan.config;
 
-    this.app.set("trust proxy", true);
+    this.app.set("trust proxy", PROXY === "true" ? true : false);
     log(this.app, logger);
     setFavicon(this.app);
     setCookie(this.app, cookieKey);
@@ -166,11 +167,10 @@ class Chan {
         path: r.route.path,
         methods: Object.keys(r.route.methods),
       }));
-
   }
 
   run(cb) {
-    const port = parseInt(process.env.PORT) || 3000;
+    const port = parseInt(Chan.config.PORT) || 3000;
     this.app.listen(port, () => {
       cb ? cb(port) : console.log(`Server is running on port ${port}`);
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "chanjs",
-  "version": "2.0.20",
+  "version": "2.1.1",
   "description": "chanjs基于express5 纯js研发的轻量级mvc框架。",
   "main": "index.js",
   "module": "index.js",