调整配置读取方式

app/controller/admin.js

@@ -7,7 +7,7 @@ class AdminController extends Controller {
   async login() {
     const { ctx, app } = this;
     const { userName, password } = ctx.request.body;
-    const configJson = require(filePath.configJson);
+    const configJson = this.app.readConfig(filePath.configJson);
     const data = configJson.admin.filter(p => p.userName === userName);
     console.log(data);
     let msg;
@@ -28,7 +28,7 @@ class AdminController extends Controller {
   async changePass() {
     const { ctx } = this;
     const { userName, oldpass, newpass } = ctx.request.body;
-    const configJson = require(filePath.configJson);
+    const configJson = this.app.readConfig(filePath.configJson);
     const data = configJson.admin.filter(p => p.userName === userName);
     let msg;
     try {

app/controller/cacert.js

@@ -7,7 +7,7 @@ const filePath = require('../../config/filespath');
 class CAcertController extends Controller {
   async caupload() {
     const { ctx } = this;
-    const configJson = require(filePath.configJson);
+    const configJson = this.app.readConfig(filePath.configJson);
     const uuid = UUID.v1();
     // 获取数据流
     const stream = await ctx.getFileStream();
@@ -42,7 +42,7 @@ class CAcertController extends Controller {
   // 删除ca证书
   async cadelete() {
     const uuid = this.ctx.query.uuid;
-    const configJson = require(filePath.configJson);
+    const configJson = this.app.readConfig(filePath.configJson);
     // 过滤掉当前uuid数据
     const data = configJson.ca.filter(p => p.uuid !== uuid);
     configJson.ca = data;
@@ -65,7 +65,7 @@ class CAcertController extends Controller {
   // 查询ca信息
   async caquery() {
     const { ctx } = this;
-    const configJson = require(filePath.configJson);
+    const configJson = this.app.readConfig(filePath.configJson);
     const data = configJson.ca;
     ctx.body = { errcode: 0, errmsg: '', data };
   }

app/controller/enccert.js

@@ -21,7 +21,7 @@ class EnccertController extends Controller {
     // 创建文件名
     const fileName = `${filePath.p12}${uuid}.p12`;
     // 获取数据文件
-    const configJson = require(filePath.configJson);
+    const configJson = this.app.readConfig(filePath.configJson);
     try {
       // 存储P12文件
       const res = await this.service.fileshandler.upload({ name: fileName, stream });

app/controller/ipsecvpn.js

@@ -10,7 +10,7 @@ class IpsecvpnController extends Controller {
     const { ctx } = this;
     const { address, addressTow, cert, digit, loglevel, pwa } = ctx.request.body;
     const form = { address, addressTow, cert, digit, loglevel, pwa };
-    const person = require(filePath.configJson);
+    const person = this.app.readConfig(filePath.configJson);
     person.ipsecvpn = form;
     const jsonstr = JSON.stringify(person);
     try {
@@ -36,7 +36,7 @@ class IpsecvpnController extends Controller {
   async secservice() {
     const { ctx } = this;
     const form = ctx.request.body;
-    const person = require(filePath.configJson);
+    const person = this.app.readConfig(filePath.configJson);
     person.ipsecservice = form;
     const jsonstr = JSON.stringify(person);
     try {
@@ -62,7 +62,7 @@ class IpsecvpnController extends Controller {
   async secclientquery() {
     try {
       const { ctx } = this;
-      const person = require(filePath.configJson);
+      const person = this.app.readConfig(filePath.configJson);
       const data = person.ipsecvpn;
       ctx.body = { errcode: 0, errmsg: '', data };
     } catch (error) {
@@ -73,7 +73,7 @@ class IpsecvpnController extends Controller {
   async ipsecservicequery() {
     try {
       const { ctx } = this;
-      const person = require(filePath.configJson);
+      const person = this.app.readConfig(filePath.configJson);
       const data = person.ipsecservice;
       ctx.body = { errcode: 0, errmsg: '', data };
     } catch (error) {

app/controller/lan.js

@@ -8,7 +8,7 @@ class LanController extends Controller {
   // 修改lan信息
   async lanupdate() {
     const lanpath = filePath.lan;
-    const configJson = require(filePath.configJson);
+    const configJson = this.app.readConfig(filePath.configJson);
     const { address, start, end, type } = this.ctx.request.body;
     const form = { address, start, end, type };
     form.addressTow = form.address.substring(0, form.address.lastIndexOf('.'));
@@ -45,7 +45,7 @@ class LanController extends Controller {
   // 查询lan信息
   async lanquery() {
     const { ctx } = this;
-    const configJson = require(filePath.configJson);
+    const configJson = this.app.readConfig(filePath.configJson);
     const data = configJson.lan;
     ctx.body = { errcode: 0, errmsg: '', data };
   }

app/controller/sigcert.js

@@ -19,7 +19,7 @@ class SigcertController extends Controller {
         const resreq = await this.service.shell.applyreq({ ...ctx.request.body, keyPath: `${filePath.keys}${uuid}.key`, filePath: `${filePath.req}${uuid}.pem` });
         if (resreq.errcode === 0) {
           const form = { state, dn, pwatype, name, uuid };
-          const person = require(filePath.configJson);
+          const person = this.app.readConfig(filePath.configJson);
           person.cert.push(form);
           const jsonstr = JSON.stringify(person);
           // 添加到数据文件
@@ -35,7 +35,7 @@ class SigcertController extends Controller {
   // 签名证书查询
   async sigcacertquery() {
     const { ctx } = this;
-    const person = require(filePath.configJson);
+    const person = this.app.readConfig(filePath.configJson);
     const data = person.cert;
     const total = data.length || 0;
     ctx.body = { errcode: 0, errmsg: '', data, total };
@@ -43,7 +43,7 @@ class SigcertController extends Controller {
   // 删除签名证书
   async sigcertdelete() {
     const uuid = this.ctx.query.uuid;
-    const configJson = require(filePath.configJson);
+    const configJson = this.app.readConfig(filePath.configJson);
     // 过滤掉当前uuid数据
     const data = configJson.cert.filter(p => p.uuid !== uuid);
     const isdata = configJson.cert.filter(p => p.uuid === uuid);
@@ -65,7 +65,7 @@ class SigcertController extends Controller {
       if (res.length > 0) {
         this.ctx.body = { errcode: 0, errmsg: '' };
       } else {
-        this.ctx.body = { errcode: -1, errmsg: '证书删除失败' };
+        this.ctx.body = { errcode: -1016, errmsg: '证书删除失败' };
       }
     } catch (error) {
       const body = { errcode: -1016, errmsg: '证书删除失败', error };
@@ -75,7 +75,7 @@ class SigcertController extends Controller {
   // 签名证书上传
   async sigcacertupload() {
     const { ctx } = this;
-    const person = require(filePath.configJson);
+    const person = this.app.readConfig(filePath.configJson);
     const stream = await this.ctx.getFileStream();
     const uuid = stream.fields.uuid;
     // 路径 + 文件名

app/controller/sslvpn.js

@@ -9,7 +9,7 @@ class SslvpnController extends Controller {
     const { ctx } = this;
     const form = ctx.request.body;
     // 引入数据文件
-    const person = require(filePath.configJson);
+    const person = this.app.readConfig(filePath.configJson);
     person.sslvpn = form;
     const jsonstr = JSON.stringify(person);
     try {
@@ -34,7 +34,7 @@ class SslvpnController extends Controller {
   async sslvpnservice() {
     const { ctx } = this;
     const form = ctx.request.body;
-    const person = require(filePath.configJson);
+    const person = this.app.readConfig(filePath.configJson);
     person.sslvpnservice = form;
     const jsonstr = JSON.stringify(person);
     try {
@@ -59,7 +59,7 @@ class SslvpnController extends Controller {
   async sslquery() {
     try {
       const { ctx } = this;
-      const person = require(filePath.configJson);
+      const person = this.app.readConfig(filePath.configJson);
       const data = person.sslvpn;
       ctx.body = { errcode: 0, errmsg: '', data };
     } catch (error) {
@@ -71,7 +71,7 @@ class SslvpnController extends Controller {
   async sslserivcequery() {
     try {
       const { ctx } = this;
-      const person = require(filePath.configJson);
+      const person = this.app.readConfig(filePath.configJson);
       const data = person.sslvpnservice;
       ctx.body = { errcode: 0, errmsg: '', data };
     } catch (error) {

app/controller/systemctl.js

@@ -21,7 +21,7 @@ class SystemctlController extends Controller {
       if (res.errcode === 0) {
         this.ctx.body = { errcode: 0, errmsg: 'ok' };
       } else {
-        this.ctx.body = { errcode: -1, errmsg: '禁用wan网卡失败' };
+        this.ctx.body = { errcode: -1022, errmsg: '禁用wan网卡失败' };
       }
     } catch (error) {
       const body = { errcode: -1022, errmsg: '禁用wan网卡失败', error };
@@ -35,7 +35,7 @@ class SystemctlController extends Controller {
       if (res.errcode === 0) {
         this.ctx.body = { errcode: 0, errmsg: 'ok' };
       } else {
-        this.ctx.body = { errcode: -1, errmsg: '启用wan网卡失败' };
+        this.ctx.body = { errcode: -1023, errmsg: '启用wan网卡失败' };
       }
     } catch (error) {
       const body = { errcode: -1023, errmsg: '启用wan网卡失败', error };
@@ -49,7 +49,7 @@ class SystemctlController extends Controller {
       if (res.errcode === 0) {
         this.ctx.body = { errcode: 0, errmsg: 'ok' };
       } else {
-        this.ctx.body = { errcode: -1, errmsg: '启用lan网卡失败' };
+        this.ctx.body = { errcode: -1024, errmsg: '启用lan网卡失败' };
       }
     } catch (error) {
       const body = { errcode: -1024, errmsg: '启用lan网卡失败', error };
@@ -63,7 +63,7 @@ class SystemctlController extends Controller {
       if (res.errcode === 0) {
         this.ctx.body = { errcode: 0, errmsg: 'ok' };
       } else {
-        this.ctx.body = { errcode: -1, errmsg: '禁用lan网卡失败' };
+        this.ctx.body = { errcode: -1025, errmsg: '禁用lan网卡失败' };
       }
     } catch (error) {
       const body = { errcode: -1025, errmsg: '禁用lan网卡失败', error };
@@ -79,7 +79,7 @@ class SystemctlController extends Controller {
       if (res.errcode === 0 && res.data !== '') {
         this.ctx.body = { errcode: 0, errmsg: 'ok' };
       } else {
-        this.ctx.body = { errcode: -1, errmsg: '地址连接失败' };
+        this.ctx.body = { errcode: -1026, errmsg: '地址连接失败' };
       }
     } catch (error) {
       const body = { errcode: -1026, errmsg: '地址连接异常', error };
@@ -93,7 +93,7 @@ class SystemctlController extends Controller {
       if (res.errcode === 0) {
         this.ctx.body = { errcode: 0, errmsg: 'ok' };
       } else {
-        this.ctx.body = { errcode: -1, errmsg: '获取时间失败' };
+        this.ctx.body = { errcode: -1027, errmsg: '获取时间失败' };
       }
     } catch (error) {
       const body = { errcode: -1027, errmsg: '获取时间失败', error };
@@ -137,7 +137,7 @@ class SystemctlController extends Controller {
       if (res.errcode === 0 && res.data) {
         this.ctx.body = { errcode: 0, errmsg: 'ok', data: { cpu: res.data } };
       } else {
-        this.ctx.body = { errcode: -1, errmsg: '获取CPU使用率失败' };
+        this.ctx.body = { errcode: -1030, errmsg: '获取CPU使用率失败' };
       }
     } catch (error) {
       const body = { errcode: -1030, errmsg: '获取CPU使用率失败', error };
@@ -151,7 +151,7 @@ class SystemctlController extends Controller {
       if (res.errcode === 0 && res.data) {
         this.ctx.body = { errcode: 0, errmsg: '', data: { memory: res.data } };
       } else {
-        this.ctx.body = { errcode: -1, errmsg: '获取内存使用率失败' };
+        this.ctx.body = { errcode: -1031, errmsg: '获取内存使用率失败' };
       }
     } catch (error) {
       const body = { errcode: -1031, errmsg: '获取内存使用率失败', error };
@@ -161,7 +161,7 @@ class SystemctlController extends Controller {
   // 获取设备信息
   async devinfo() {
     try {
-      const configJson = require(filePath.configJson);
+      const configJson = this.app.readConfig(filePath.configJson);
       const model = configJson.model;
       const version = configJson.version;
       this.ctx.body = { errcode: 0, errmsg: '', data: { model, version } };
@@ -188,7 +188,7 @@ class SystemctlController extends Controller {
       if (res.errcode === 0) {
         this.ctx.body = { errcode: 0, errmsg: 'ok' };
       } else {
-        this.ctx.body = { errcode: -1, errmsg: '操作失败' };
+        this.ctx.body = { errcode: -1033, errmsg: '操作失败' };
       }
     } catch (error) {
       const body = { errcode: -1033, errmsg: '操作失败', error };

app/controller/wan.js

@@ -6,7 +6,7 @@ class WanController extends Controller {
   // 修改wan信息
   async wanupdate() {
     const wanpath = filePath.wan;
-    const configJson = require(filePath.configJson);
+    const configJson = this.app.readConfig(filePath.configJson);
     const { address, netmask, gateway, type, dns, staticip } = this.ctx.request.body;
     const form = { address, netmask, gateway, type, dns, staticip };
     console.log(address, netmask, gateway, type, dns, staticip);
@@ -44,7 +44,7 @@ class WanController extends Controller {
   // 查询wan信息
   async wanquery() {
     const { ctx } = this;
-    const configJson = require(filePath.configJson);
+    const configJson = this.app.readConfig(filePath.configJson);
     const data = configJson.wan;
     ctx.body = { errcode: 0, errmsg: '', data };
   }

app/extend/application.js

@@ -0,0 +1,14 @@
+'use strict';
+const fs = require('fs/promises');
+
+module.exports = {
+  async readConfig(path) {
+    try {
+      const data = await fs.readFile(path);
+      return JSON.parse(data);
+    } catch (error) {
+      const body = { errcode: -1000, errmsg: '读取配置文件失败', error };
+      throw new Error(JSON.stringify(body));
+    }
+  },
+};