abler-api 0.1.29 → 0.1.32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -26,7 +26,9 @@ const {
26
26
  dbUtil,
27
27
  kvStorage
28
28
  } = require$$2__default["default"];
29
- const netUtil$1 = require$$3__default["default"];
29
+ const {
30
+ netUtil: netUtil$1
31
+ } = require$$3__default["default"];
30
32
  const fs$1 = require$$4__default["default"];
31
33
  let conf$3, appSetting$1, err$2, dbSql;
32
34
  const pnToken = "access_token",
@@ -192,7 +194,7 @@ class apiUtil$2 {
192
194
 
193
195
  static sendOrRedirect(res, redirectUrl, data) {
194
196
  if (redirectUrl) {
195
- redirectUrl = urlAppendParams(redirectUrl, data, true);
197
+ redirectUrl = netUtil$1.urlAppendParams(redirectUrl, data, true);
196
198
  res.redirect(redirectUrl);
197
199
  } else {
198
200
  res.send(data);
@@ -1560,9 +1562,9 @@ class preconditions$1 {
1560
1562
 
1561
1563
  }
1562
1564
 
1563
- async function createEnvSettingFile(fileName) {
1565
+ async function createEnvSettingFile(fileName, lastEnvSettingEx) {
1564
1566
  try {
1565
- const cfgText = await ppUtil$3.doCreateEnvSettingFile(fileName);
1567
+ const cfgText = await ppUtil$3.doCreateEnvSettingFile(fileName, lastEnvSettingEx);
1566
1568
 
1567
1569
  if (cfgText.indexOf(`cfgVersion: "${conf$2._envSetting.cfgVersion}"`) > 0) {
1568
1570
  console.log(`\n*** 已創建新的本機環境配置文件\n${fileName}\n请檢查各項內容是否正确(此项更新服务可正常运行)\n\n`);
@@ -1588,14 +1590,14 @@ async function checkExEnvSetting(loadjs) {
1588
1590
  if (envSettingEx.cfgVersion !== conf$2._envSettings.default.cfgVersion) {
1589
1591
  if (envSettingEx.cfgVersion !== "0.0") {
1590
1592
  let fp = path.parse(fileName);
1591
- let newFileName = path.join(fp.dir, fp.name + envSettingEx.cfgVersion + fp.ext);
1593
+ let lastVerFileName = path.join(fp.dir, fp.name + envSettingEx.cfgVersion + fp.ext);
1592
1594
 
1593
- if (!fs.existsSync(newFileName)) {
1594
- fs.renameSync(fileName, newFileName);
1595
+ if (!fs.existsSync(lastVerFileName)) {
1596
+ fs.renameSync(fileName, lastVerFileName);
1595
1597
  }
1596
1598
  }
1597
1599
 
1598
- return await createEnvSettingFile(fileName);
1600
+ return await createEnvSettingFile(fileName, envSettingEx);
1599
1601
  }
1600
1602
  }
1601
1603
  } // async function checkDatabase() {
@@ -13,7 +13,9 @@ const {
13
13
  dbUtil,
14
14
  kvStorage
15
15
  } = require$$2;
16
- const netUtil$1 = require$$3;
16
+ const {
17
+ netUtil: netUtil$1
18
+ } = require$$3;
17
19
  const fs$1 = require$$4;
18
20
  let conf$3, appSetting$1, err$2, dbSql;
19
21
  const pnToken = "access_token",
@@ -179,7 +181,7 @@ class apiUtil$2 {
179
181
 
180
182
  static sendOrRedirect(res, redirectUrl, data) {
181
183
  if (redirectUrl) {
182
- redirectUrl = urlAppendParams(redirectUrl, data, true);
184
+ redirectUrl = netUtil$1.urlAppendParams(redirectUrl, data, true);
183
185
  res.redirect(redirectUrl);
184
186
  } else {
185
187
  res.send(data);
@@ -1547,9 +1549,9 @@ class preconditions$1 {
1547
1549
 
1548
1550
  }
1549
1551
 
1550
- async function createEnvSettingFile(fileName) {
1552
+ async function createEnvSettingFile(fileName, lastEnvSettingEx) {
1551
1553
  try {
1552
- const cfgText = await ppUtil$3.doCreateEnvSettingFile(fileName);
1554
+ const cfgText = await ppUtil$3.doCreateEnvSettingFile(fileName, lastEnvSettingEx);
1553
1555
 
1554
1556
  if (cfgText.indexOf(`cfgVersion: "${conf$2._envSetting.cfgVersion}"`) > 0) {
1555
1557
  console.log(`\n*** 已創建新的本機環境配置文件\n${fileName}\n请檢查各項內容是否正确(此项更新服务可正常运行)\n\n`);
@@ -1575,14 +1577,14 @@ async function checkExEnvSetting(loadjs) {
1575
1577
  if (envSettingEx.cfgVersion !== conf$2._envSettings.default.cfgVersion) {
1576
1578
  if (envSettingEx.cfgVersion !== "0.0") {
1577
1579
  let fp = path.parse(fileName);
1578
- let newFileName = path.join(fp.dir, fp.name + envSettingEx.cfgVersion + fp.ext);
1580
+ let lastVerFileName = path.join(fp.dir, fp.name + envSettingEx.cfgVersion + fp.ext);
1579
1581
 
1580
- if (!fs.existsSync(newFileName)) {
1581
- fs.renameSync(fileName, newFileName);
1582
+ if (!fs.existsSync(lastVerFileName)) {
1583
+ fs.renameSync(fileName, lastVerFileName);
1582
1584
  }
1583
1585
  }
1584
1586
 
1585
- return await createEnvSettingFile(fileName);
1587
+ return await createEnvSettingFile(fileName, envSettingEx);
1586
1588
  }
1587
1589
  }
1588
1590
  } // async function checkDatabase() {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "abler-api",
3
- "version": "0.1.29",
3
+ "version": "0.1.32",
4
4
  "description": "API服务相关工具",
5
5
  "main": "./dist/cjs/pp-util.js",
6
6
  "module": "./dist/es/pp-util.js",