Merge branch 'engine-product' of gitlab.gongsibao.com:jiangyong/zhichan into engine-product

engine-product/app/base/service/impl/product/productSve.js

@@ -46,7 +46,6 @@ class ProductService extends ServiceBase {
       })
       })
 
 
       for (let j = 0; j <= resItem.length; ++j) {
       for (let j = 0; j <= resItem.length; ++j) {
-        console.log(resItem[j])
         if (resItem[j] && resItem[j].price && resItem[j].price > 0) {
         if (resItem[j] && resItem[j].price && resItem[j].price > 0) {
           resItem[j].price = resItem[j].price / 100
           resItem[j].price = resItem[j].price / 100
         }
         }

engine-product/app/config/localsettings.js

-var settings={
-  redis:{
+var settings = {
+  redis: {
     host: "43.247.184.32",
     host: "43.247.184.32",
     port: 8967,
     port: 8967,
     password: "Gongsibao2018",
     password: "Gongsibao2018",
-    db:10,
+    db: 10,
   },
   },
-  database:{
-    dbname : "engine-product",
+  database: {
+    dbname: "engine-product",
     user: "write",
     user: "write",
     password: "write",
     password: "write",
     config: {
     config: {
@@ -16,22 +16,25 @@ var settings={
       port: 8899,
       port: 8899,
 
 
       dialect: 'mysql',
       dialect: 'mysql',
-        operatorsAliases: false,
-        pool: {
-          max: 5,
-          min: 0,
-          acquire: 90000000,
-          idle: 1000000
-        },
-        debug:false,
-        dialectOptions:{
-            requestTimeout: 999999,
-            // instanceName:'DEV'
-        }  //设置MSSQL超时时间
-   }
- },
- reqEsDevUrl:"http://192.168.4.249:9200/",
- reqHomePageDevUrl:"http://sj.app.com:3002/",
- reqAuthUrl:"http://sj.app.com:3002/auth"
+      operatorsAliases: false,
+      pool: {
+        max: 5,
+        min: 0,
+        acquire: 90000000,
+        idle: 1000000
+      },
+      debug: false,
+      timezone: '+08:00',
+      dialectOptions: {
+        dateStrings: true,
+        typeCast: true,
+        requestTimeout: 999999,
+        // instanceName:'DEV'
+      }  //设置MSSQL超时时间
+    }
+  },
+  reqEsDevUrl: "http://192.168.4.249:9200/",
+  reqHomePageDevUrl: "http://sj.app.com:3002/",
+  reqAuthUrl: "http://sj.app.com:3002/auth"
 };
 };
 module.exports = settings;
 module.exports = settings;