Commit @5563cf6bc8f97200c14da5819bd4dd07f52d6f93

1875972

5563cf6

Global.js

--- Global.js

+++ Global.js


 const SERVICE_STATUS = process.env.NODE_ENV;//development, production
 const PORT = 80;
 const API_SERVER_HOST = 'localhost:8080';
-const JUSO_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzIxNDY1NjExMzY5NTg='//실사용 Key u-dolbom.com
-const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzE2MTgyNzExMzY5MzE=';//실사용 Key u-dolbom.com
-//const JUSO_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE3NDE1NzExMzI0MjU=';//Test용
-//const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE4MDIxOTExMzI0MzU=';//Test용
+//const JUSO_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzIxNDY1NjExMzY5NTg='//실사용 Key u-dolbom.com
+//const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzE2MTgyNzExMzY5MzE=';//실사용 Key u-dolbom.com
+const JUSO_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE3NDE1NzExMzI0MjU=';//Test용
+const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE4MDIxOTExMzI0MzU=';//Test용
 
 
 module.exports = {

1875972

5563cf6

client/views/pages/callcenter/QandASelectOne.jsx

--- client/views/pages/callcenter/QandASelectOne.jsx

+++ client/views/pages/callcenter/QandASelectOne.jsx


 		navigate('/EquipmentSelect', {state: {
 			searchType: 'equipment_serial_number',
 			searchText: equipmentInquiry.equipment['equipment_serial_number'],
-			tabIndex: 1,
+			tabIndex: 2,
 
 			'government_id': equipmentInquiry['insert_user_government_id']
 		}});

1875972

5563cf6

client/views/pages/equipment/EquipmentSelect.jsx

--- client/views/pages/equipment/EquipmentSelect.jsx

+++ client/views/pages/equipment/EquipmentSelect.jsx


 		orgSelectListOfHierarchy();
 		equipmentStatesSelect();
 		equipmentSearching();
+
+		/* if (CommonUtil.isEmpty(location.state['searchType']) == false && CommonUtil.isEmpty(location.state['searchText']) == false
+			&& location.state['searchType'] == 'equipment_serial_number') {
+
+		} */
 	}, []);
 
 

1875972

5563cf6

firebase-messaging-sw.js

--- firebase-messaging-sw.js

+++ firebase-messaging-sw.js


     if (!e.data.json()) return;
   
     const resultData = e.data.json().notification;
+    console.log("push resultData : ", resultData);
+    console.log("push resultData.image : ", resultData.image);
     const notificationTitle = resultData.title;
     const notificationOptions = {
       body: resultData.body,
-      icon: resultData.image, // 웹 푸시 이미지는 icon
+      //icon: resultData.image, // 웹 푸시 이미지는 icon
       tag: resultData.tag,
     };
   

1875972

5563cf6

server/modules/web/Server.js

--- server/modules/web/Server.js

+++ server/modules/web/Server.js


 
 http.createServer(webServer).listen(PORT);
 https.createServer({
-    key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com_nopass.key`),
+    /* key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com_nopass.key`),
     cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/u-dolbom.com.pem`),
-    ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/Chain_RootCA_Bundle.crt`),
+    ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.com/Chain_RootCA_Bundle.crt`), */
+    key: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr_nopass.key`),
+    cert: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/u-dolbom.co.kr.pem`),
+    ca: fs.readFileSync(`${BASE_DIR}/server/modules/web/ssl/u-dolbom.co.kr/Chain_RootCA_Bundle.crt`),
     /* requestCert: false,
     rejectUnauthorized: false */
 }, webServer).listen(443);

...	...	@@ -191,7 +191,7 @@
191	191	navigate('/EquipmentSelect', {state: {
192	192	searchType: 'equipment_serial_number',
193	193	searchText: equipmentInquiry.equipment['equipment_serial_number'],
194		- tabIndex: 1,
	194	+ tabIndex: 2,
195	195
196	196	'government_id': equipmentInquiry['insert_user_government_id']
197	197	}});

...	...	@@ -527,6 +527,11 @@
527	527	orgSelectListOfHierarchy();
528	528	equipmentStatesSelect();
529	529	equipmentSearching();
	530	+
	531	+ /* if (CommonUtil.isEmpty(location.state['searchType']) == false && CommonUtil.isEmpty(location.state['searchText']) == false
	532	+ && location.state['searchType'] == 'equipment_serial_number') {
	533	+
	534	+ } */
530	535	}, []);
531	536
532	537

...	...	@@ -29,10 +29,12 @@
29	29	if (!e.data.json()) return;
30	30
31	31	const resultData = e.data.json().notification;
	32	+ console.log("push resultData : ", resultData);
	33	+ console.log("push resultData.image : ", resultData.image);
32	34	const notificationTitle = resultData.title;
33	35	const notificationOptions = {
34	36	body: resultData.body,
35		- icon: resultData.image, // 웹 푸시 이미지는 icon
	37	+ //icon: resultData.image, // 웹 푸시 이미지는 icon
36	38	tag: resultData.tag,
37	39	};
38	40

...	...	@@ -5,10 +5,10 @@
5	5	const SERVICE_STATUS = process.env.NODE_ENV;//development, production
6	6	const PORT = 80;
7	7	const API_SERVER_HOST = 'localhost:8080';
8		-const JUSO_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzIxNDY1NjExMzY5NTg='//실사용 Key u-dolbom.com
9		-const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzE2MTgyNzExMzY5MzE=';//실사용 Key u-dolbom.com
10		-//const JUSO_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE3NDE1NzExMzI0MjU=';//Test용
11		-//const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE4MDIxOTExMzI0MzU=';//Test용
	8	+//const JUSO_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzIxNDY1NjExMzY5NTg='//실사용 Key u-dolbom.com
	9	+//const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIzMDQxNzE2MTgyNzExMzY5MzE=';//실사용 Key u-dolbom.com
	10	+const JUSO_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE3NDE1NzExMzI0MjU=';//Test용
	11	+const JUSO_CORRD_API_KEY = 'U01TX0FVVEgyMDIyMTEyMTE4MDIxOTExMzI0MzU=';//Test용
12	12
13	13
14	14	module.exports = {

...	...	@@ -17,9 +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`),
	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	+ 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`),
23	26	/* requestCert: false,
24	27	rejectUnauthorized: false */
25	28	}, webServer).listen(443);

Delete comment