From 32ed63d42e84d5c6980f0c4d30fcd2d5a26d589a Mon Sep 17 00:00:00 2001
From: Luk Lu <luk.lu@faronear.org>
Date: Sat, 10 Dec 2022 18:46:25 +0800
Subject: [PATCH] rename envar files

---
 .gitignore    | 126 ++++++++++++++++++++++++++++++++------------------
 envar-tool.js |  10 ++--
 2 files changed, 85 insertions(+), 51 deletions(-)

diff --git a/.gitignore b/.gitignore
index dc3e90b..2ecfc91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,63 +1,97 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
-node_modules/
+### 目录 #################################################################
+
+# wo-服务端
+/_archive/*
+/_datastore/*
+/_filestore/*
+/_logstore/*
+/_webroot/*
+/_ssl/*
+
 /test/unit/coverage/
 /test/e2e/reports/
-.svn/
-.idea/
-.sass-cache/
-.deploy_git/
-.gitattributes
-_desktop.ini
-.DS_Store
-.thumbnails
-Thumbs.db
-thumbs.db
-.umi
-.umi-production
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-selenium-debug.log
-package-lock.json
-*.iml
-*.njsproj
-*.ntvs*
-*.sln
-*.suo
-._*
-.$*
-~$*
 
-.bashrc_custom
-
-# hexo
-db.json
-
-# 客户端 uniapp 项目
+# uniapp 项目
 /unpackage/*
 !/unpackage/res/
 
-/_archive/*
-/_datastore/*
-/_logstore/*
-/_filestore/*
-/_webroot/*
+# vue-cli 项目
 /dist/
+
+# hexo
+/public/
+
+.svn/
+.deploy_git/
+.idea/
+.sass-cache/
+
+node_modules/
+
+
+### 文件 ###################################################################
+
+# seafile 临时文件
+._*
+
+.$*
+
+# office 暂存文件
+~$*
+
 *.apk
 *.min.js
 *.min.css
 *.min.html
-/pages4loader.json5
-envar-web-custom.js
-envar-deploy-secret.js
+*.iml
+*.njsproj
+*.ntvs*
+*.sw*
+*.sln
+*.suo
 
-# hexo 项目
-public/
+.bashrc_custom
 
-# 服务端(server or uniapp-uniCloud)项目
-envar-base-custom.js
-envar-base-dynamic.js
-envar-base-secret.js
+# 苹果系统临时文件
+.DS_Store
+
+.gitattributes
+
+# 来自 vue-cli 创建项目的 .gitignore
+.project
+
+# 安卓缓存文件夹
+.thumbnails
+
+.umi
+.umi-production
+
+# local env files
+.env.local
+.env.*.local
+
+_desktop.ini
+
+# hexo
+/db.json
+
+# wo-客户端环境配置，wo-服务端环境配置(server or uniapp-uniCloud)
+envar-*.gitignore.js
+
+npm-debug.log*
+
+yarn-debug.log*
+yarn-error.log*
+yarn.lock
+
+package-lock.json
+pages4loader.json5
+
+selenium-debug.log
+
+Thumbs.db
+thumbs.db
 
 !.gitkeep
diff --git a/envar-tool.js b/envar-tool.js
index 276b230..3f941a0 100644
--- a/envar-tool.js
+++ b/envar-tool.js
@@ -13,11 +13,11 @@ module.exports = {
     rawEnvar = {},
     envarFiles = [
       './envar-base-basic.js',
-      './envar-base-custom.js',
-      './envar-base-dynamic-dev.js',
+      './envar-base-basic.gitignore.js',
       './envar-base-dynamic.js',
-      './envar-base-secret-dev.js',
+      './envar-base-dynamic.gitignore.js',
       './envar-base-secret.js',
+      './envar-base-secret.gitignore.js',
     ],
   } = {}) {
     if (!global.envar) {
@@ -82,7 +82,7 @@ module.exports = {
 
   /* 读取动态配置文件中的环境变量。
    */
-  get_dynamic_envar ({ dynamicEnvarFiles = ['./envar-base-dynamic-dev.js', './envar-base-dynamic.js'] } = {}) {
+  get_dynamic_envar ({ dynamicEnvarFiles = ['./envar-base-dynamic.js', './envar-base-dynamic.gitignore.js'] } = {}) {
     // config file should be absolute or relative to the node process's dir.
 
     let dynamicEnvar = {}
@@ -118,7 +118,7 @@ module.exports = {
   /* 隐藏机密配置文件中的环境变量。
    * 需要输出当前环境变量时，必须调用本函数，避免机密信息被输出。
    */
-  mask_secret_envar ({ rawEnvar, secretEnvarFiles = ['./envar-base-secret-dev.js', './envar-base-secret.js'] } = {}) {
+  mask_secret_envar ({ rawEnvar, secretEnvarFiles = ['./envar-base-secret.js', './envar-base-secret.gitignore.js'] } = {}) {
     let envar = JSON.parse(JSON.stringify(rawEnvar || global.envar)) // 复制一份，避免污染
 
     let secretEnvar = {}