修改文件名和路由

app/controller/ipsecvpn.js

@@ -6,7 +6,7 @@ const filePath = require('../../config/filespath');
 
 class IpsecvpnController extends Controller {
   // 客户端
-  async secclient() {
+  async setClient() {
     const { ctx } = this;
     const { address, addressTow, cert, digit, loglevel, pwa } = ctx.request.body;
     const form = { address, addressTow, cert, digit, loglevel, pwa };
@@ -33,7 +33,7 @@ class IpsecvpnController extends Controller {
     }
   }
   // 服务端
-  async secservice() {
+  async setServer() {
     const { ctx } = this;
     const form = ctx.request.body;
     const person = await this.app.readConfig(filePath.configJson);
@@ -59,7 +59,7 @@ class IpsecvpnController extends Controller {
     }
   }
   // 客户端查询
-  async secclientquery() {
+  async getClient() {
     try {
       const { ctx } = this;
       const person = await this.app.readConfig(filePath.configJson);
@@ -70,7 +70,7 @@ class IpsecvpnController extends Controller {
     }
   }
   // 服务端查询
-  async ipsecservicequery() {
+  async getServer() {
     try {
       const { ctx } = this;
       const person = await this.app.readConfig(filePath.configJson);

app/controller/log.js

@@ -11,7 +11,7 @@ class LogController extends Controller {
       let res;
       if (type === 'ssl') res = await this.service.shell.shell(`tail -n 100 ${filePath.ssllog}`);
       if (type === 'sec') res = await this.service.shell.shell(`tail -n 100 ${filePath.swanlog}`);
-      if (type === 'systemct') res = await this.service.shell.shell(`tail -n 100 ${filePath.systemctllog}`);
+      if (type === 'systemct') res = await this.service.shell.shell(`tail -n 100 ${filePath.systemlog}`);
       if (res.errcode === 0) {
         ctx.body = { errcode: 0, errmsg: '', data: res.data };
       } else {

app/controller/sslvpn.js

@@ -5,7 +5,7 @@ const Controller = require('egg').Controller;
 const filePath = require('../../config/filespath');
 class SslvpnController extends Controller {
   // sslvpn客户端
-  async sslvpnclient() {
+  async setClient() {
     const { ctx } = this;
     const form = ctx.request.body;
     // 引入数据文件
@@ -31,7 +31,7 @@ class SslvpnController extends Controller {
     }
   }
   // ssl服务端
-  async sslvpnservice() {
+  async setServer() {
     const { ctx } = this;
     const form = ctx.request.body;
     const person = await this.app.readConfig(filePath.configJson);
@@ -56,7 +56,7 @@ class SslvpnController extends Controller {
     }
   }
   // 客户端查询
-  async sslquery() {
+  async getClient() {
     try {
       const { ctx } = this;
       const person = await this.app.readConfig(filePath.configJson);
@@ -68,7 +68,7 @@ class SslvpnController extends Controller {
     }
   }
   // 服务端查询
-  async sslserivcequery() {
+  async getServer() {
     try {
       const { ctx } = this;
       const person = await this.app.readConfig(filePath.configJson);

app/controller/systemctl.js

@@ -4,7 +4,7 @@
 const Controller = require('egg').Controller;
 const shells = require('../../config/shells');
 const filePath = require('../../config/filespath');
-class SystemctlController extends Controller {
+class SystemController extends Controller {
   // 重启机器
   async reboot() {
     try {
@@ -161,17 +161,18 @@ class SystemctlController extends Controller {
   // 获取设备信息
   async devinfo() {
     try {
-      const configJson = await this.app.readConfig(filePath.configJson);
+      const configJson = await this.app.readConfig(filePath.vendorJson);
       const model = configJson.model;
       const version = configJson.version;
-      this.ctx.body = { errcode: 0, errmsg: '', data: { model, version } };
+      const type = configJson.type;
+      this.ctx.body = { errcode: 0, errmsg: '', data: { model, version, type } };
     } catch (error) {
       const body = { errcode: -1032, errmsg: '获取设备信息失败', error };
       throw new Error(JSON.stringify(body));
     }
   }
   // sslvpn 启动 停止 重启
-  async sslvpnstate() {
+  async sslState() {
     const { type } = this.ctx.request.query;
     let data;
     if (type === 'stop') {
@@ -196,7 +197,7 @@ class SystemctlController extends Controller {
     }
   }
   // ipsecvpn 启动 停止 重启
-  async ipsecvpnstate() {
+  async ipsecState() {
     const { type } = this.ctx.request.query;
     let data;
     if (type === 'stop') {
@@ -259,4 +260,4 @@ class SystemctlController extends Controller {
   }
 }
 
-module.exports = SystemctlController;
+module.exports = SystemController;

app/router.js

@@ -32,34 +32,34 @@ module.exports = app => {
   router.get('/api/sigcertdelete', jwt, controller.sigcert.sigcertdelete);
   router.get('/api/sigcertdownload', controller.sigcert.sigcertdownload);
   router.get('/api/reqdownload', controller.sigcert.reqdownload);
-  // systemctl
-  router.get('/api/reboot', jwt, controller.systemctl.reboot);
-  router.get('/api/wanDown', jwt, controller.systemctl.wanDown);
-  router.get('/api/wanup', jwt, controller.systemctl.wanup);
-  router.get('/api/lanup', jwt, controller.systemctl.lanup);
-  router.get('/api/lanDown', jwt, controller.systemctl.lanDown);
-  router.post('/api/ping', jwt, controller.systemctl.ping);
-  router.get('/api/getdate', jwt, controller.systemctl.getdate);
-  router.post('/api/setdate', jwt, controller.systemctl.setdate);
-  router.get('/api/vpnstate', jwt, controller.systemctl.vpnstate);
-  router.get('/api/cpu', jwt, controller.systemctl.cpu);
-  router.get('/api/memory', jwt, controller.systemctl.memory);
-  router.get('/api/devinfo', jwt, controller.systemctl.devinfo);
-  router.get('/api/ipsecvpnstate', jwt, controller.systemctl.ipsecvpnstate);
-  router.get('/api/sslvpnstate', jwt, controller.systemctl.sslvpnstate);
-  router.get('/api/recover', jwt, controller.systemctl.recover);
-  router.get('/api/ntp', jwt, controller.systemctl.getNtp);
-  router.post('/api/ntp', jwt, controller.systemctl.setNtp);
+  // system
+  router.get('/api/reboot', jwt, controller.system.reboot);
+  router.get('/api/wanDown', jwt, controller.system.wanDown);
+  router.get('/api/wanup', jwt, controller.system.wanup);
+  router.get('/api/lanup', jwt, controller.system.lanup);
+  router.get('/api/lanDown', jwt, controller.system.lanDown);
+  router.post('/api/ping', jwt, controller.system.ping);
+  router.get('/api/getdate', jwt, controller.system.getdate);
+  router.post('/api/setdate', jwt, controller.system.setdate);
+  router.get('/api/vpnstate', jwt, controller.system.vpnstate);
+  router.get('/api/cpu', jwt, controller.system.cpu);
+  router.get('/api/memory', jwt, controller.system.memory);
+  router.get('/api/devinfo', jwt, controller.system.devinfo);
+  router.get('/api/ipsec/state', jwt, controller.system.ipsecState);
+  router.get('/api/ssl/state', jwt, controller.system.sslState);
+  router.get('/api/recover', jwt, controller.system.recover);
+  router.get('/api/ntp', jwt, controller.system.getNtp);
+  router.post('/api/ntp', jwt, controller.system.setNtp);
   // ipsecvpn
-  router.post('/api/secclient', jwt, controller.ipsecvpn.secclient);
-  router.post('/api/secservice', jwt, controller.ipsecvpn.secservice);
-  router.get('/api/secclientquery', jwt, controller.ipsecvpn.secclientquery);
-  router.get('/api/ipsecservicequery', jwt, controller.ipsecvpn.ipsecservicequery);
+  router.post('/api/ipsec/client', jwt, controller.ipsecvpn.setClient);
+  router.post('/api/ipsec/server', jwt, controller.ipsecvpn.setServer);
+  router.get('/api/ipsec/client', jwt, controller.ipsecvpn.getClient);
+  router.get('/api/ipsec/server', jwt, controller.ipsecvpn.getServer);
   // sslvpn
-  router.post('/api/sslvpnclient', jwt, controller.sslvpn.sslvpnclient);
-  router.post('/api/sslvpnservice', jwt, controller.sslvpn.sslvpnservice);
-  router.get('/api/sslquery', jwt, controller.sslvpn.sslquery);
-  router.get('/api/sslserivcequery', jwt, controller.sslvpn.sslserivcequery);
+  router.post('/api/ssl/client', jwt, controller.sslvpn.setClient);
+  router.post('/api/ssl/server', jwt, controller.sslvpn.setServer);
+  router.get('/api/ssl/client', jwt, controller.sslvpn.getClient);
+  router.get('/api/ssl/server', jwt, controller.sslvpn.getServer);
   // log
   router.get('/api/logquery', jwt, controller.log.logquery);
   router.get('/api/logdownload', controller.log.logdownload);

config/filespath.js

@@ -18,5 +18,6 @@ module.exports = {
   sslConf: '/etc/openvpn/openvpn.conf', // ssl配置文件
   configJson: '/etc/vpn/config.json', // 数据存放文件路径
   resolv: '/etc/resolv.conf', // 上层配置文件
-  systemctllog: '/usr/local/vpnserve/logs/vpnserve/common-error.log', // 系统日志
+  systemlog: '/usr/local/vpnserve/logs/vpnserve/common-error.log', // 系统日志
+  vendorJson: '/etc/vpn/vendor.json', // 设备信息文件路径
 };

config/shells.js

@@ -2,52 +2,52 @@
 
 module.exports = {
   // strongswan相关命令
-  swIsEnabled: 'systemctl is-enabled strongswan-swanctl',
+  swIsEnabled: 'system is-enabled strongswan-swanctl',
   // 查看strongswan服务是否开机自启动
-  swEnable: 'systemctl enable strongswan-swanctl',
+  swEnable: 'system enable strongswan-swanctl',
   // 开启strongswan服务的自启动
-  swDisable: 'systemctl disable strongswan-swanctl',
+  swDisable: 'system disable strongswan-swanctl',
   // 关闭strongswan服务的自启动
-  swStatus: 'systemctl status strongswan-swanctl',
+  swStatus: 'system status strongswan-swanctl',
   // 查看strongswan服务是否正在运行
-  swStart: 'systemctl start strongswan-swanctl',
+  swStart: 'system start strongswan-swanctl',
   // 启动strongswan服务
-  swRestart: 'systemctl restart strongswan-swanctl',
+  swRestart: 'system restart strongswan-swanctl',
   // 重启strongswan服务
-  swStop: 'systemctl stop strongswan-swanctl',
+  swStop: 'system stop strongswan-swanctl',
   // 停止strongswan服务
-  swReload: 'systemctl reload strongswan-swanctl',
+  swReload: 'system reload strongswan-swanctl',
 
   // openvpn相关命令
-  opIsEnabled: 'systemctl is-enabled openvpn',
+  opIsEnabled: 'system is-enabled openvpn',
   // 查看Openvpn是否开机自启动
-  opEnable: 'systemctl enable openvpn',
+  opEnable: 'system enable openvpn',
   // 打开Openvpn服务的自启动
-  opDisable: 'systemctl disable openvpn',
+  opDisable: 'system disable openvpn',
   // 关闭Openvpn服务的自启动
-  opStatus: 'systemctl status openvpn',
+  opStatus: 'system status openvpn',
   // 查看Openvpn服务是否正在运行
-  opStart: 'systemctl start openvpn',
+  opStart: 'system start openvpn',
   // 启动Openvpn服务
-  opRestart: 'systemctl restart openvpn',
+  opRestart: 'system restart openvpn',
   // 重启Openvpn服务
-  opStop: 'systemctl stop openvpn',
+  opStop: 'system stop openvpn',
   // 停止Openvpn服务
 
   //  dhcp相关命令
-  dhcpIsEnabled: 'systemctl is-enabled isc-dhcp-server',
+  dhcpIsEnabled: 'system is-enabled isc-dhcp-server',
   // 查看dhcp是否开机自启动
-  dhcpEnable: 'systemctl enable isc-dhcp-server',
+  dhcpEnable: 'system enable isc-dhcp-server',
   // 打开dhcp服务的自启动
-  dhcpDisable: 'systemctl disable isc-dhcp-server',
+  dhcpDisable: 'system disable isc-dhcp-server',
   // 关闭dhcp服务的自启动
-  dhcpStatus: 'systemctl status isc-dhcp-server',
+  dhcpStatus: 'system status isc-dhcp-server',
   // 查看dhcp服务是否正在运行
-  dhcpStart: 'systemctl start isc-dhcp-server',
+  dhcpStart: 'system start isc-dhcp-server',
   // 启动dhcp服务
-  dhcpRestart: 'systemctl restart isc-dhcp-server',
+  dhcpRestart: 'system restart isc-dhcp-server',
   // 重启dhcp服务
-  dhcpStop: 'systemctl stop isc-dhcp-server',
+  dhcpStop: 'system stop isc-dhcp-server',
   // 停止dhcp服务
 
   // 网络配置相关命令

server.js

@@ -5,4 +5,4 @@ const workers = Number(process.argv[2] || require('os').cpus().length);
 egg.startCluster({
   workers,
   baseDir: __dirname,
-});
+});