@zgfe/business-lib 1.1.45 → 1.1.47

package/config.js

@@ -6,14 +6,34 @@ const path = require('path');
  * @param defaultConfig
  * @returns
  */
-function getConfig(defaultConfig) {
-  const configPath = path.resolve(__dirname, '.config.json');
-  if (fs.existsSync(configPath)) {
-    const config = fs.readFileSync(configPath, 'utf-8');
-    return JSON.parse(config);
+function getConfig(defaultConfig, basePath) {
+  const configPath = path.resolve(basePath, '.config.json');
+  let resConfig = defaultConfig;
+  try {
+    if (fs.existsSync(configPath)) {
+      const config = fs.readFileSync(configPath, 'utf-8');
+      if (!config || config === '{}') {
+        throw new Error('配置文件为空');
+      }
+      const configObj = JSON.parse(config);
+      // 如果读取的配置文件，数据结构与默认配置不一致，则更新配置文件，更新规则：以默认配置为准，保留用户自定义配置
+      const isSame = Object.keys(defaultConfig).every((key) => {
+        return configObj.hasOwnProperty(key);
+      });
+      if (!isSame) {
+        resConfig = Object.assign({}, defaultConfig, configObj);
+        throw new Error('配置文件数据结构不一致');
+      }
+      resConfig = configObj;
+    } else {
+      throw new Error('配置文件不存在');
+    }
+  } catch (e) {
+    console.log(e.message);
+    fs.writeFileSync(configPath, JSON.stringify(resConfig, null, 2));
   }
-  fs.writeFileSync(configPath, JSON.stringify(defaultConfig, null, 2));
-  return defaultConfig;
+  console.log('配置详情', resConfig);
+  return resConfig;
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.45",
+  "version": "1.1.47",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "e7de87fb82df4120fa0dd1f115a64768dd2c6dfb"
+  "gitHead": "6a4976b13f69cc950fcfe71b494c1fde7499ac63"
 }