From f4ef5312d2c77d1a645689f8d8e1eff135584f2c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 16 九月 2022 17:17:16 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/index.js | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/index.js b/src/index.js
index c094113..39dd308 100644
--- a/src/index.js
+++ b/src/index.js
@@ -70,14 +70,15 @@
GLOB.lineColor = config.lineColor || ''
GLOB.licenseKey = config.licenseKey || ''
GLOB.probation = false
- GLOB.watermark = config.watermark !== false
- GLOB.keepKey = config.keepPassword !== 'false'
+ GLOB.watermark = config.watermark + '' !== 'false'
+ GLOB.transfer = config.transfer + '' === 'true'
+ GLOB.keepKey = config.keepPassword + '' !== 'false'
GLOB.WXAppID = config.WXAppID || ''
GLOB.WXminiAppID = config.WXminiAppID || ''
GLOB.accessToken = {}
GLOB.mkHS = false
- if (config.externalDatabase !== false && config.externalDatabase !== 'false' && config.externalDatabase !== undefined) {
+ if (config.externalDatabase + '' !== 'false' && config.externalDatabase !== undefined) {
GLOB.externalDatabase = config.externalDatabase ? `[${config.externalDatabase}]..` : ''
} else {
GLOB.externalDatabase = null
--
Gitblit v1.8.0