fe / yohobuywap-node · Commits

Go to a project

Authored by zzzzzzz
Commit 1b5cb1b0af1981b6ad5cce6abdc4bf0460de0cb0 2 parents 6eb4d697 572b4c68

Merge branch 'hotfix/live' into release/4.9.2

Inline Side-by-side
Showing 4 changed files with 45 additions and 42 deletions
... ... @@ -42,15 +42,7 @@ module.exports = {
retries: 0
},
interfaceShunt: {
useInterfaceShunt: false,
tencentServers: {
api: ['123.206.1.98', '123.206.2.80'],
service: ['123.206.1.98', '123.206.2.80']
},
awsServers: {
api: 'app-java-168863769.cn-north-1.elb.amazonaws.com.cn',
service: 'service-yoho-579825100.cn-north-1.elb.amazonaws.com.cn'
}
open: false
},
loggers: {
infoFile: {
... ... @@ -103,15 +95,8 @@ if (isProduction) {
useOneapm: true,
useCache: true,
interfaceShunt: {
useInterfaceShunt: false,
tencentServers: {
api: ['123.206.1.98', '123.206.2.80'],
service: ['123.206.1.98', '123.206.2.80']
},
awsServers: {
api: 'app-java-168863769.cn-north-1.elb.amazonaws.com.cn',
service: 'service-yoho-579825100.cn-north-1.elb.amazonaws.com.cn'
}
open: true,
url: 'http://123.206.2.55/strategy'
}
});
} else if (isTest) {
... ...
... ... @@ -56,7 +56,7 @@
"uuid": "^2.0.2",
"winston": "^2.2.0",
"winston-daily-rotate-file": "^1.2.0",
"yoho-node-lib": "0.0.43"
"yoho-node-lib": "0.0.46"
},
"devDependencies": {
"autoprefixer": "^6.3.7",
... ...
... ... @@ -284,9 +284,11 @@ function get_websocket_server(type) {
var arr = data.data[0].split(':');
var ip = arr[0];
var port = arr[1];
var protocol = location.protocol === 'https:' ? 'wss' :'ws'
if (is_live) {
ip = 'ws://' + ip;
ip = protocol + '://' + ip;
link_to_websocket_server(ip, port);
}
}
... ...
... ... @@ -33,28 +33,36 @@ $border: #e0e0e0;
position: absolute;
top: 30px;
left: 30px;
height: 35px;
padding: 0 10px;
border: 2px solid $white;
border-radius: 20px;
height: 70px;
padding: 0 20px;
border: 4px solid $white;
border-radius: 40px;
color: $white;
font-size: 22px;
font-size: 44px;
text-align: center;
line-height: 1.5;
line-height: 70px;
-webkit-transform: scale(0.5);
transform: scale(0.5);
-webkit-transform-origin: 0 0;
transform-origin: 0 0;
}
.living {
position: absolute;
top: 30px;
left: 30px;
height: 35px;
width: 70px;
height: 70px;
width: 140px;
background: $red;
border-radius: 15px;
border-radius: 40px;
color: $white;
font-size: 22px;
font-size: 44px;
text-align: center;
line-height: 1.5;
line-height: 70px;
-webkit-transform: scale(0.5);
transform: scale(0.5);
-webkit-transform-origin: 0 0;
transform-origin: 0 0;
}
&_tag {
... ... @@ -196,14 +204,18 @@ $border: #e0e0e0;
position: absolute;
top: 30px;
left: 30px;
height: 35px;
width: 70px;
height: 70px;
width: 140px;
background: $red;
border-radius: 20px;
border-radius: 40px;
color: $white;
font-size: 22px;
font-size: 44px;
text-align: center;
line-height: 1.5;
line-height: 70px;
-webkit-transform: scale(0.5);
transform: scale(0.5);
-webkit-transform-origin: 0 0;
transform-origin: 0 0;
}
.main-intro {
... ... @@ -294,14 +306,18 @@ $border: #e0e0e0;
position: absolute;
top: 20px;
left: 220px;
height: 35px;
width: 70px;
border: 2px solid $black;
border-radius: 20px;
font-size: 22px;
line-height: 1.5;
height: 70px;
width: 140px;
border: 4px solid $black;
border-radius: 40px;
font-size: 44px;
line-height: 70px;
text-align: center;
color: $black;
-webkit-transform: scale(0.5);
transform: scale(0.5);
-webkit-transform-origin: 0 0;
transform-origin: 0 0;
}
.pre-time {
... ...