Skip to content

Commit 1244301

Browse files
committed
v3.0.9
1 parent 130a6c3 commit 1244301

File tree

6 files changed

+22
-19
lines changed

6 files changed

+22
-19
lines changed

app/localWebServer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ const saveLog = (err) => {
4545
});
4646
};
4747
const saveServerStartup = (localIpaddress) => {
48-
const info = `\n*************************** CoNET Platform [ ${Tool.packageFile.version} ] server start up *****************************\n` +
48+
const info = `\n*************************** CoNET Platform [ ${Tool.CoNET_version} ] server start up *****************************\n` +
4949
`Access url: http://${localIpaddress}:${Tool.LocalServerPortNumber}\n`;
5050
saveLog(info);
5151
};
5252
const saveServerStartupError = (err) => {
53-
const info = `\n*************************** CoNET Platform [ ${Tool.packageFile.version} ] server startup falied *****************************\n` +
53+
const info = `\n*************************** CoNET Platform [ ${Tool.CoNET_version} ] server startup falied *****************************\n` +
5454
`platform ${process.platform}\n` +
5555
`${err['message']}\n`;
5656
saveLog(info);

app/localWebServer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ const saveLog = ( err: {} | string ) => {
5454
}
5555

5656
const saveServerStartup = ( localIpaddress: string ) => {
57-
const info = `\n*************************** CoNET Platform [ ${ Tool.packageFile.version } ] server start up *****************************\n` +
57+
const info = `\n*************************** CoNET Platform [ ${ Tool.CoNET_version } ] server start up *****************************\n` +
5858
`Access url: http://${localIpaddress}:${ Tool.LocalServerPortNumber }\n`
5959
saveLog ( info )
6060
}
6161

6262
const saveServerStartupError = ( err: {} ) => {
63-
const info = `\n*************************** CoNET Platform [ ${ Tool.packageFile.version } ] server startup falied *****************************\n` +
63+
const info = `\n*************************** CoNET Platform [ ${ Tool.CoNET_version } ] server startup falied *****************************\n` +
6464
`platform ${ process.platform }\n` +
6565
`${ err['message'] }\n`
6666
saveLog ( info )

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "conet",
3-
"version": "3.0.7",
3+
"version": "3.0.9",
44
"license": "MIT",
55
"description": "CoNET",
66
"repository": {

app/tools/initSystem.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
"use strict";
2+
Object.defineProperty(exports, "__esModule", { value: true });
3+
exports.CoNET_version = '3.0.9';
24
/*!
35
* Copyright 2018 CoNET Technology Inc. All Rights Reserved.
46
*
@@ -14,7 +16,6 @@
1416
* See the License for the specific language governing permissions and
1517
* limitations under the License.
1618
*/
17-
Object.defineProperty(exports, "__esModule", { value: true });
1819
const Fs = require("fs");
1920
const Path = require("path");
2021
const Os = require("os");
@@ -64,8 +65,8 @@ exports.CoNET_Home = Path.join(__dirname);
6465
exports.CoNET_PublicKey = Path.join(exports.CoNET_Home, '3C272D2E.pem');
6566
exports.LocalServerPortNumber = 3000;
6667
exports.configPath = Path.join(exports.QTGateFolder, 'config.json');
67-
const packageFilePath = Path.join('..', '..', 'package.json');
68-
exports.packageFile = require(packageFilePath);
68+
//const packageFilePath = Path.join ( __dirname,'package.json')
69+
//export const packageFile = require ( packageFilePath )
6970
exports.QTGateSignKeyID = /3acbe3cbd3c1caa9/i;
7071
exports.twitterDataFileName = Path.join(exports.QTGateFolder, 'twitterData.pem');
7172
exports.checkFolder = (folder, CallBack) => {
@@ -135,7 +136,7 @@ exports.InitConfig = () => {
135136
firstRun: true,
136137
alreadyInit: false,
137138
multiLogin: false,
138-
version: exports.packageFile.version,
139+
version: exports.CoNET_version,
139140
newVersion: null,
140141
newVerReady: false,
141142
keypair: InitKeyPair(),
@@ -226,7 +227,7 @@ exports.emitConfig = (config, passwordOK) => {
226227
firstRun: config.firstRun,
227228
alreadyInit: config.alreadyInit,
228229
newVerReady: config.newVerReady,
229-
version: config.version,
230+
version: exports.CoNET_version,
230231
multiLogin: config.multiLogin,
231232
freeUser: config.freeUser,
232233
account: config.keypair && config.keypair.email ? config.keypair.email : null,
@@ -258,12 +259,12 @@ exports.checkConfig = CallBack => {
258259
}
259260
config.salt = Buffer.from(config.salt['data']);
260261
// update?
261-
config.version = exports.packageFile.version;
262+
config.version = exports.CoNET_version;
262263
config.newVerReady = false;
263264
config.newVersion = null;
264265
config.serverPort = exports.LocalServerPortNumber;
265266
config.localIpAddress = exports.getLocalInterface();
266-
config.firstRun = exports.packageFile.firstRun || false;
267+
config.firstRun = false;
267268
if (!config.keypair || !config.keypair.publicKey) {
268269
return CallBack(null, config);
269270
}

app/tools/initSystem.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
export const CoNET_version = '3.0.9'
2+
13
/*!
24
* Copyright 2018 CoNET Technology Inc. All Rights Reserved.
35
*
@@ -71,8 +73,8 @@ export const CoNET_PublicKey = Path.join ( CoNET_Home, '3C272D2E.pem')
7173

7274
export const LocalServerPortNumber = 3000
7375
export const configPath = Path.join ( QTGateFolder, 'config.json' )
74-
const packageFilePath = Path.join ( '..', '..','package.json')
75-
export const packageFile = require ( packageFilePath )
76+
//const packageFilePath = Path.join ( __dirname,'package.json')
77+
//export const packageFile = require ( packageFilePath )
7678
export const QTGateSignKeyID = /3acbe3cbd3c1caa9/i
7779
export const twitterDataFileName = Path.join ( QTGateFolder, 'twitterData.pem' )
7880

@@ -150,7 +152,7 @@ export const InitConfig = () => {
150152
firstRun: true,
151153
alreadyInit: false,
152154
multiLogin: false,
153-
version: packageFile.version,
155+
version: CoNET_version,
154156
newVersion: null,
155157
newVerReady: false,
156158
keypair: InitKeyPair (),
@@ -250,7 +252,7 @@ export const emitConfig = ( config: install_config, passwordOK: boolean ) => {
250252
firstRun: config.firstRun,
251253
alreadyInit: config.alreadyInit,
252254
newVerReady: config.newVerReady,
253-
version: config.version,
255+
version: CoNET_version,
254256
multiLogin: config.multiLogin,
255257
freeUser: config.freeUser,
256258
account: config.keypair && config.keypair.email ? config.keypair.email : null,
@@ -287,12 +289,12 @@ export const checkConfig = CallBack => {
287289

288290
// update?
289291

290-
config.version = packageFile.version
292+
config.version = CoNET_version
291293
config.newVerReady = false
292294
config.newVersion = null
293295
config.serverPort = LocalServerPortNumber
294296
config.localIpAddress = getLocalInterface ()
295-
config.firstRun = packageFile.firstRun || false
297+
config.firstRun = false
296298
if ( !config.keypair || ! config.keypair.publicKey ) {
297299
return CallBack ( null, config )
298300
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "conet",
3-
"version": "3.0.6",
3+
"version": "3.0.9",
44
"license": "MIT",
55
"description": "CoNET platform",
66
"scripts": {

0 commit comments

Comments
 (0)