diff --git a/electron/config/config.default.js b/electron/config/config.default.js index 63973cf..6067c5f 100644 --- a/electron/config/config.default.js +++ b/electron/config/config.default.js @@ -126,7 +126,7 @@ module.exports = (appInfo) => { * 主进程 */ config.mainServer = { - host: '127.0.0.1', + host: 'localhost', port: 7072, }; diff --git a/electron/jobs/example.js b/electron/jobs/example.js index d705912..dc6aa85 100644 --- a/electron/jobs/example.js +++ b/electron/jobs/example.js @@ -1,11 +1,35 @@ +// const Exception = require('ee-core/module/exception'); +// Exception.start(); +const Job = require('ee-core/module/jobs/baseJobClass'); const Loader = require('ee-core/module/loader'); const Log = require('ee-core/module/log'); const Ps = require('ee-core/module/utils/ps'); const test = Loader.requireJobsModule('./test'); -// logger.info("[renderer] process: ", process); -Log.info("[child-process] process type: ", Ps.processType()); -Log.info("[child-process] process cwd: ", process.cwd()); +//tests.hello(); -test.hello(); -//test.utilsMod(); +/** + * 示例服务 + * @class + */ +class ExampleJob extends Job { + + constructor(params) { + super(); + } + + /** + * Execute the job + */ + async handle () { + // logger.info("[renderer] process: ", process); + Log.info("[child-process] process type: ", Ps.processType()); + Log.info("[child-process] process cwd: ", process.cwd()); + + tests.hello(); + //test.utilsMod(); + } +} + +ExampleJob.toString = () => '[class ExampleJob]'; +module.exports = ExampleJob; diff --git a/electron/jobs/hello.js b/electron/jobs/hello.js new file mode 100644 index 0000000..e958197 --- /dev/null +++ b/electron/jobs/hello.js @@ -0,0 +1,13 @@ +const Loader = require('ee-core/module/loader'); +const Log = require('ee-core/module/log'); +const Ps = require('ee-core/module/utils/ps'); +const test = Loader.requireJobsModule('./test'); + + +module.exports = () => { + Log.info("[child-process] process type: ", Ps.processType()); + Log.info("[child-process] process cwd: ", process.cwd()); + + test.hello(); + //test.utilsMod(); +}; diff --git a/electron/preload/index.js b/electron/preload/index.js index 350c9ba..ffe9ae7 100644 --- a/electron/preload/index.js +++ b/electron/preload/index.js @@ -3,7 +3,6 @@ *************************************************/ const ChildJob = require('ee-core/module/jobs/child'); -// const OriginJob = require('ee-core/module/jobs/unification'); const UtilsPs = require('ee-core/module/utils/ps'); const Log = require('ee-core/module/log'); const test = require('./test'); @@ -31,7 +30,8 @@ module.exports = async (app) => { test(); let myJob = new ChildJob(); - myJob.run('exampleJob', './jobs/example.js'); + //myJob.run('exampleJob', './jobs/example.js'); + myJob.run('exampleJob', './jobs/hello.js'); // let opt2 = { // dev: true, diff --git a/frontend/src/api/main.js b/frontend/src/api/main.js index a63bf19..737248e 100644 --- a/frontend/src/api/main.js +++ b/frontend/src/api/main.js @@ -52,7 +52,7 @@ const specialIpcRoute = { const requestHttp = (uri, parameter) => { // url转换 const config = storage.get('httpServiceConfig'); - const host = config.server || 'http://127.0.0.1:7071'; + const host = config.server || 'http://localhost:7071'; let url = uri.split('.').join('/'); url = host + '/' + url; console.log('url:', url); diff --git a/frontend/src/views/base/file/Index.vue b/frontend/src/views/base/file/Index.vue index 52b3de3..241cd61 100644 --- a/frontend/src/views/base/file/Index.vue +++ b/frontend/src/views/base/file/Index.vue @@ -117,7 +117,7 @@ export default { storage.set('httpServiceConfig', r); // url转换 - const host = r.server || 'http://127.0.0.1:7071'; + const host = r.server || 'http://localhost:7071'; let uri = ipcApiRoute.uploadFile; let url = uri.split('.').join('/'); this.action_url = host + '/' + url; diff --git a/frontend/src/views/base/socket/SocketServer.vue b/frontend/src/views/base/socket/SocketServer.vue index 86a6e49..22ac588 100644 --- a/frontend/src/views/base/socket/SocketServer.vue +++ b/frontend/src/views/base/socket/SocketServer.vue @@ -31,7 +31,7 @@ export default { data() { return { currentStatus: '关闭', - servicAddress: 'ws://127.0.0.1:7070' + servicAddress: 'ws://localhost:7070' }; }, mounted () {