@nocobase/server 2.0.0-alpha.2 → 2.0.0-alpha.20

package/lib/aes-encryptor.js

@@ -109,6 +109,10 @@ const _AesEncryptor = class _AesEncryptor {
     return appKeyPath;
   }
   static async create(app) {
+    if (process.env.APP_AES_SECRET_KEY) {
+      const key2 = Buffer.from(process.env.APP_AES_SECRET_KEY, "hex");
+      return new _AesEncryptor(key2);
+    }
     const KEY_PATH = process.env.APP_AES_SECRET_KEY_PATH;
     const keyPath = KEY_PATH ? (0, import_path.resolve)(process.cwd(), KEY_PATH) : await this.getKeyPath(app.name);
     const key = await _AesEncryptor.getOrGenerateKey(keyPath);

package/lib/middlewares/data-template.js

@@ -126,12 +126,7 @@ const traverseJSON = /* @__PURE__ */ __name((data, options) => {
         include: subInclude
       });
     } else if (field.type === "belongsTo") {
-      result[key] = traverseJSON(data[key], {
-        collection: collection.db.getCollection(field.target),
-        // exclude: [field.foreignKey],
-        include: subInclude,
-        excludePk: false
-      });
+      result[key] = data[key];
     } else if (field.type === "belongsToMany") {
       result[key] = traverseBelongsToMany(data[key], {
         collection: collection.db.getCollection(field.target),

package/lib/migrations/20250902230900-update-primary-keys.js

@@ -82,9 +82,7 @@ const _update_primary_keys_default = class _update_primary_keys_default extends
         } else {
           await queryInterface.changeColumn(tableName, "id", {
             type: import_sequelize.DataTypes.BIGINT,
-            primaryKey: true,
-            allowNull: false,
-            autoIncrement: false
+            allowNull: false
           });
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.20",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,20 +10,20 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "2.0.0-alpha.2",
-    "@nocobase/actions": "2.0.0-alpha.2",
-    "@nocobase/auth": "2.0.0-alpha.2",
-    "@nocobase/cache": "2.0.0-alpha.2",
-    "@nocobase/data-source-manager": "2.0.0-alpha.2",
-    "@nocobase/database": "2.0.0-alpha.2",
-    "@nocobase/evaluators": "2.0.0-alpha.2",
-    "@nocobase/lock-manager": "2.0.0-alpha.2",
-    "@nocobase/logger": "2.0.0-alpha.2",
-    "@nocobase/resourcer": "2.0.0-alpha.2",
-    "@nocobase/sdk": "2.0.0-alpha.2",
-    "@nocobase/snowflake-id": "2.0.0-alpha.2",
-    "@nocobase/telemetry": "2.0.0-alpha.2",
-    "@nocobase/utils": "2.0.0-alpha.2",
+    "@nocobase/acl": "2.0.0-alpha.20",
+    "@nocobase/actions": "2.0.0-alpha.20",
+    "@nocobase/auth": "2.0.0-alpha.20",
+    "@nocobase/cache": "2.0.0-alpha.20",
+    "@nocobase/data-source-manager": "2.0.0-alpha.20",
+    "@nocobase/database": "2.0.0-alpha.20",
+    "@nocobase/evaluators": "2.0.0-alpha.20",
+    "@nocobase/lock-manager": "2.0.0-alpha.20",
+    "@nocobase/logger": "2.0.0-alpha.20",
+    "@nocobase/resourcer": "2.0.0-alpha.20",
+    "@nocobase/sdk": "2.0.0-alpha.20",
+    "@nocobase/snowflake-id": "2.0.0-alpha.20",
+    "@nocobase/telemetry": "2.0.0-alpha.20",
+    "@nocobase/utils": "2.0.0-alpha.20",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -59,5 +59,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "1322f486b248bef53ed8c8f42f0a39dfd02125fd"
+  "gitHead": "af5ff4eaa490349420135405128da466d72ac74c"
 }