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 = { @@ -42,15 +42,7 @@ module.exports = {
42 retries: 0 42 retries: 0
43 }, 43 },
44 interfaceShunt: { 44 interfaceShunt: {
45 - useInterfaceShunt: false,  
46 - tencentServers: {  
47 - api: ['123.206.1.98', '123.206.2.80'],  
48 - service: ['123.206.1.98', '123.206.2.80']  
49 - },  
50 - awsServers: {  
51 - api: 'app-java-168863769.cn-north-1.elb.amazonaws.com.cn',  
52 - service: 'service-yoho-579825100.cn-north-1.elb.amazonaws.com.cn'  
53 - } 45 + open: false
54 }, 46 },
55 loggers: { 47 loggers: {
56 infoFile: { 48 infoFile: {
@@ -103,15 +95,8 @@ if (isProduction) { @@ -103,15 +95,8 @@ if (isProduction) {
103 useOneapm: true, 95 useOneapm: true,
104 useCache: true, 96 useCache: true,
105 interfaceShunt: { 97 interfaceShunt: {
106 - useInterfaceShunt: false,  
107 - tencentServers: {  
108 - api: ['123.206.1.98', '123.206.2.80'],  
109 - service: ['123.206.1.98', '123.206.2.80']  
110 - },  
111 - awsServers: {  
112 - api: 'app-java-168863769.cn-north-1.elb.amazonaws.com.cn',  
113 - service: 'service-yoho-579825100.cn-north-1.elb.amazonaws.com.cn'  
114 - } 98 + open: true,
  99 + url: 'http://123.206.2.55/strategy'
115 } 100 }
116 }); 101 });
117 } else if (isTest) { 102 } else if (isTest) {
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 "uuid": "^2.0.2", 56 "uuid": "^2.0.2",
57 "winston": "^2.2.0", 57 "winston": "^2.2.0",
58 "winston-daily-rotate-file": "^1.2.0", 58 "winston-daily-rotate-file": "^1.2.0",
59 - "yoho-node-lib": "0.0.43" 59 + "yoho-node-lib": "0.0.46"
60 }, 60 },
61 "devDependencies": { 61 "devDependencies": {
62 "autoprefixer": "^6.3.7", 62 "autoprefixer": "^6.3.7",
@@ -284,9 +284,11 @@ function get_websocket_server(type) { @@ -284,9 +284,11 @@ function get_websocket_server(type) {
284 var arr = data.data[0].split(':'); 284 var arr = data.data[0].split(':');
285 var ip = arr[0]; 285 var ip = arr[0];
286 var port = arr[1]; 286 var port = arr[1];
  287 + var protocol = location.protocol === 'https:' ? 'wss' :'ws'
287 288
288 if (is_live) { 289 if (is_live) {
289 - ip = 'ws://' + ip; 290 +
  291 + ip = protocol + '://' + ip;
290 link_to_websocket_server(ip, port); 292 link_to_websocket_server(ip, port);
291 } 293 }
292 } 294 }
@@ -33,28 +33,36 @@ $border: #e0e0e0; @@ -33,28 +33,36 @@ $border: #e0e0e0;
33 position: absolute; 33 position: absolute;
34 top: 30px; 34 top: 30px;
35 left: 30px; 35 left: 30px;
36 - height: 35px;  
37 - padding: 0 10px;  
38 - border: 2px solid $white;  
39 - border-radius: 20px; 36 + height: 70px;
  37 + padding: 0 20px;
  38 + border: 4px solid $white;
  39 + border-radius: 40px;
40 color: $white; 40 color: $white;
41 - font-size: 22px; 41 + font-size: 44px;
42 text-align: center; 42 text-align: center;
43 - line-height: 1.5; 43 + line-height: 70px;
  44 + -webkit-transform: scale(0.5);
  45 + transform: scale(0.5);
  46 + -webkit-transform-origin: 0 0;
  47 + transform-origin: 0 0;
44 } 48 }
45 49
46 .living { 50 .living {
47 position: absolute; 51 position: absolute;
48 top: 30px; 52 top: 30px;
49 left: 30px; 53 left: 30px;
50 - height: 35px;  
51 - width: 70px; 54 + height: 70px;
  55 + width: 140px;
52 background: $red; 56 background: $red;
53 - border-radius: 15px; 57 + border-radius: 40px;
54 color: $white; 58 color: $white;
55 - font-size: 22px; 59 + font-size: 44px;
56 text-align: center; 60 text-align: center;
57 - line-height: 1.5; 61 + line-height: 70px;
  62 + -webkit-transform: scale(0.5);
  63 + transform: scale(0.5);
  64 + -webkit-transform-origin: 0 0;
  65 + transform-origin: 0 0;
58 } 66 }
59 67
60 &_tag { 68 &_tag {
@@ -196,14 +204,18 @@ $border: #e0e0e0; @@ -196,14 +204,18 @@ $border: #e0e0e0;
196 position: absolute; 204 position: absolute;
197 top: 30px; 205 top: 30px;
198 left: 30px; 206 left: 30px;
199 - height: 35px;  
200 - width: 70px; 207 + height: 70px;
  208 + width: 140px;
201 background: $red; 209 background: $red;
202 - border-radius: 20px; 210 + border-radius: 40px;
203 color: $white; 211 color: $white;
204 - font-size: 22px; 212 + font-size: 44px;
205 text-align: center; 213 text-align: center;
206 - line-height: 1.5; 214 + line-height: 70px;
  215 + -webkit-transform: scale(0.5);
  216 + transform: scale(0.5);
  217 + -webkit-transform-origin: 0 0;
  218 + transform-origin: 0 0;
207 } 219 }
208 220
209 .main-intro { 221 .main-intro {
@@ -294,14 +306,18 @@ $border: #e0e0e0; @@ -294,14 +306,18 @@ $border: #e0e0e0;
294 position: absolute; 306 position: absolute;
295 top: 20px; 307 top: 20px;
296 left: 220px; 308 left: 220px;
297 - height: 35px;  
298 - width: 70px;  
299 - border: 2px solid $black;  
300 - border-radius: 20px;  
301 - font-size: 22px;  
302 - line-height: 1.5; 309 + height: 70px;
  310 + width: 140px;
  311 + border: 4px solid $black;
  312 + border-radius: 40px;
  313 + font-size: 44px;
  314 + line-height: 70px;
303 text-align: center; 315 text-align: center;
304 color: $black; 316 color: $black;
  317 + -webkit-transform: scale(0.5);
  318 + transform: scale(0.5);
  319 + -webkit-transform-origin: 0 0;
  320 + transform-origin: 0 0;
305 } 321 }
306 322
307 .pre-time { 323 .pre-time {