chore: migrate strapi from 3.0.0-beta.13 to 3.0.0-beta.17.8

ly525 · 小小鲁班
1 parent fad25b88
Showing 7 changed files with 43 additions and 38 deletions
back-end/h5-api/api/work/controllers/Work.js
back-end/h5-api/api/work/models/Work.settings.json
back-end/h5-api/api/workform/models/Workform.settings.json
back-end/h5-api/config/environments/production/database.json
back-end/h5-api/config/functions/bootstrap.js
back-end/h5-api/config/hook.json
back-end/h5-api/package.json
@@ -2,7 +2,7 @@
  * @Author: ly525
  * @Date: 2019-12-04 19:55:24
  * @LastEditors: ly525
- * @LastEditTime: 2019-12-14 21:34:57
+ * @LastEditTime: 2019-12-15 18:56:44
  * @FilePath: /luban-h5/back-end/h5-api/api/work/controllers/Work.js
  * @Github: https://github.com/ly525/luban-h5
  * @Description:
@@ -20,13 +20,12 @@ module.exports = {
   // GET /previewOne
   // strapi-hook-ejs: https://github.com/strapi/strapi/tree/master/packages/strapi-hook-ejs
   previewOne: async (ctx) => {
-    let work = await strapi.services.work.findOne(ctx.params);
-    work = work.toJSON();
+    const work = await strapi.services.work.findOne(ctx.params);
     return ctx.render('engine', { work });
   },
   submitForm: async (ctx) => {
     const work = await strapi.services.work.findOne(ctx.params);
-    const formData = ctx.request.body.fields;
+    const formData = ctx.request.body;
     // eslint-disable-next-line no-unused-vars
     const workform = await strapi.services.workform.create({ form: formData, work });
  
@@ -50,8 +49,7 @@ module.exports = {
       return uuidMap2Name;
     }
  
-    let work = await strapi.services.work.findOne(ctx.params);
-    work = work.toJSON();
+    const work = await strapi.services.work.findOne(ctx.params);
  
     // learn the query from: https://github.com/strapi/foodadvisor/blob/master/api/api/restaurant/controllers/Restaurant.js#L40
     // eslint-disable-next-line no-undef
@@ -65,16 +63,14 @@ module.exports = {
     return ctx.body = { uuidMap2Name, formRecords };
   },
   setAsTemplate: async (ctx) => {
-    let work = await strapi.services.work.findOne(ctx.params);
-    work = work.toJSON();
+    const work = await strapi.services.work.findOne(ctx.params);
  
     // eslint-disable-next-line no-unused-vars
     const templateWork = await strapi.services.work.create();
     return strapi.services.work.update({id: templateWork.id}, { pages: work.pages, is_template: true, cover_image_url: work.cover_image_url });
   },
   useTemplate: async (ctx) => {
-    let templateWork = await strapi.services.work.findOne(ctx.params);
-    templateWork = templateWork.toJSON();
+    const templateWork = await strapi.services.work.findOne(ctx.params);
  
     // eslint-disable-next-line no-unused-vars
     const work = await strapi.services.work.create();
@@ -31,10 +31,6 @@
     },
     "is_template": {
       "type": "boolean"
-    },
-    "workforms": {
-      "collection": "workform",
-      "via": "work"
     }
   }
 }
 \ No newline at end of file
@@ -7,7 +7,10 @@
   },
   "options": {
     "increments": true,
-    "timestamps": true,
+    "timestamps": [
+      "created_at",
+      "updated_at"
+    ],
     "comment": ""
   },
   "attributes": {
@@ -15,8 +18,7 @@
       "type": "json"
     },
     "work": {
-      "model": "work",
-      "via": "workforms"
+      "model": "work"
     }
   }
 }
 \ No newline at end of file
@@ -4,11 +4,22 @@
     "default": {
       "connector": "strapi-hook-bookshelf",
       "settings": {
-        "client": "sqlite",
-        "filename": ".tmp/data.db"
+        "client": "mysql",
+        "host": "${process.env.DATABASE_HOST || 'localhost'}",
+        "port": "${process.env.DATABASE_PORT || '3306'}",
+        "database": "${process.env.DATABASE_NAME || 'lubanh5'}",
+        "username": "${process.env.DATABASE_USERNAME || ''}",
+        "password": "${process.env.DATABASE_PASSWORD || ''}"
       },
       "options": {
-        "useNullAsDefault": true
+        "debug": true,
+        "pool": {
+          "min": 0,
+          "max": 10,
+          "idleTimeoutMillis": 30000,
+          "createTimeoutMillis": 30000,
+          "acquireTimeoutMillis": 30000
+        }
       }
     }
   }
@@ -6,8 +6,8 @@
  *
  * This gives you an opportunity to set up your data model,
  * run jobs, or perform some special logic.
+ *
+ * See more details here: https://strapi.io/documentation/3.0.0-beta.x/configurations/configurations.html#bootstrap
  */
  
-module.exports = cb => {
-  cb();
-};
+module.exports = () => {};
 {
-  "timeout": 3000,
+  "timeout": 30000,
   "load": {
     "before": [],
     "order": [
@@ -19,22 +19,22 @@
     "eslint-plugin-react": "^7.14.0"
   },
   "dependencies": {
-    "knex": "latest",
     "lodash": "^4.17.5",
     "psd": "^3.2.0",
-    "sqlite3": "latest",
-    "strapi": "3.0.0-beta.13",
-    "strapi-admin": "3.0.0-beta.13",
-    "strapi-hook-bookshelf": "3.0.0-beta.13",
-    "strapi-hook-ejs": "3.0.0-alpha.13",
-    "strapi-hook-knex": "3.0.0-beta.13",
-    "strapi-plugin-content-manager": "3.0.0-beta.13",
-    "strapi-plugin-content-type-builder": "3.0.0-beta.13",
-    "strapi-plugin-email": "3.0.0-beta.13",
-    "strapi-plugin-settings-manager": "3.0.0-beta.13",
-    "strapi-plugin-upload": "3.0.0-beta.13",
-    "strapi-plugin-users-permissions": "3.0.0-beta.13",
-    "strapi-utils": "3.0.0-beta.13"
+    "strapi-hook-ejs": "3.0.0-beta.17.8",
+    "strapi": "3.0.0-beta.17.8",
+    "strapi-admin": "3.0.0-beta.17.8",
+    "strapi-utils": "3.0.0-beta.17.8",
+    "strapi-plugin-content-type-builder": "3.0.0-beta.17.8",
+    "strapi-plugin-content-manager": "3.0.0-beta.17.8",
+    "strapi-plugin-users-permissions": "3.0.0-beta.17.8",
+    "strapi-plugin-email": "3.0.0-beta.17.8",
+    "strapi-plugin-upload": "3.0.0-beta.17.8",
+    "strapi-hook-bookshelf": "3.0.0-beta.17.8",
+    "strapi-hook-knex": "3.0.0-beta.17.8",
+    "knex": "latest",
+    "mysql": "latest",
+    "sqlite3": "latest"
   },
   "author": {
     "name": "A Strapi developer"