
--- client/views/component/Calendar_admin.jsx
+++ client/views/component/Calendar_admin.jsx
... | ... | @@ -68,11 +68,15 @@ |
68 | 68 |
temperatureData = '-' |
69 | 69 |
} else { |
70 | 70 |
if (todayTemperature.length > 0) { |
71 |
+ var temperatures = ""; |
|
72 |
+ |
|
71 | 73 |
if (moment(date['date']).format("MM") >= 11 || moment(date['date']).format("MM") <= 2) { |
72 |
- temperatureData = Math.min.apply(null, todayTemperature) + '℃' |
|
74 |
+ temperatures = Math.min.apply(null, todayTemperature); |
|
73 | 75 |
} else { |
74 |
- temperatureData = Math.max.apply(null, todayTemperature) + '℃' |
|
76 |
+ temperatures = Math.max.apply(null, todayTemperature); |
|
75 | 77 |
} |
78 |
+ |
|
79 |
+ temperatureData = temperatures + '℃' |
|
76 | 80 |
} |
77 | 81 |
} |
78 | 82 |
|
--- server/modules/web/Server.js
+++ server/modules/web/Server.js
... | ... | @@ -17,12 +17,12 @@ |
17 | 17 |
|
18 | 18 |
http.createServer(webServer).listen(PORT); |
19 | 19 |
https.createServer({ |
20 |
- /* key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com_nopass.key`), |
|
20 |
+ key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com_nopass.key`), |
|
21 | 21 |
cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com.pem`), |
22 |
- ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/Chain_RootCA_Bundle.crt`), */ |
|
23 |
- key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr_nopass.key`), |
|
22 |
+ ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/Chain_RootCA_Bundle.crt`), |
|
23 |
+/* key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr_nopass.key`), |
|
24 | 24 |
cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr.pem`), |
25 |
- ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/Chain_RootCA_Bundle.crt`), |
|
25 |
+ ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/Chain_RootCA_Bundle.crt`), */ |
|
26 | 26 |
/* requestCert: false, |
27 | 27 |
rejectUnauthorized: false */ |
28 | 28 |
}, webServer).listen(443); |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?