Merge pull request #117 from pbca26/master

app

main.js

@@ -29,7 +29,7 @@ Promise = require('bluebird');
 
 const appBasicInfo = {
 	name: 'Agama',
-	version: '0.1.7.77a-beta'
+	version: '0.2.0.1a-beta'
 };
 
 app.setName(appBasicInfo.name);
@@ -46,7 +46,7 @@ var shepherd = require('./routes/shepherd'),
 
 shepherd.createIguanaDirs();
 
-const appSessionHash = md5(new Date(Date.now()).toLocaleString);
+const appSessionHash = md5(Date.now());
 
 shepherd.writeLog('app init ' + appSessionHash);
 shepherd.writeLog('app info: ' + appBasicInfo.name + ' ' + appBasicInfo.version);
@@ -365,10 +365,10 @@ function createWindow (status) {
 		if (appConfig.edexGuiOnly) {
 			if (appConfig.v2) {
 				shepherd.writeLog('show edex gui');
-				mainWindow.loadURL('http://127.0.0.1:3000');
+				// mainWindow.loadURL('http://127.0.0.1:3000');
 				mainWindow.appConfig = appConfig;
 				mainWindow.appSessionHash = appSessionHash;
-				//mainWindow.loadURL('http://' + appConfig.host + ':' + appConfig.agamaPort + '/gui/EasyDEX-GUI/react/build');
+				mainWindow.loadURL('http://' + appConfig.host + ':' + appConfig.agamaPort + '/gui/EasyDEX-GUI/react/build');
 			} else {
 				shepherd.writeLog('show edex gui');
 				mainWindow.loadURL('http://' + appConfig.host + ':' + appConfig.agamaPort + '/gui/EasyDEX-GUI/');

routes/shepherd.js

@@ -475,7 +475,7 @@ shepherd.getSyncOnlyForksInfo = function() {
     if (iguanaInstanceRegistry[port].mode.indexOf('/sync') > -1) {
       syncOnlyIguanaInstanceInfo[port] = {};
       request({
-        url: 'http://localhost:' + port + '/api/bitcoinrpc/getinfo?userpass=tmpIgRPCUser@1234',
+        url: 'http://localhost:' + port + '/api/bitcoinrpc/getinfo?userpass=tmpIgRPCUser@' + shepherd.appSessionHash,
         method: 'GET'
       }, function (error, response, body) {
         if (response && response.statusCode && response.statusCode === 200) {
@@ -488,7 +488,7 @@ shepherd.getSyncOnlyForksInfo = function() {
         }
       });
       request({
-        url: 'http://localhost:' + port + '/api/SuperNET/activehandle?userpass=tmpIgRPCUser@1234',
+        url: 'http://localhost:' + port + '/api/SuperNET/activehandle?userpass=' + shepherd.appSessionHash,
         method: 'GET'
       }, function (error, response, body) {
         if (response && response.statusCode && response.statusCode === 200) {