
--- Global.js
+++ Global.js
... | ... | @@ -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 |
module.exports = { |
14 | 14 |
PROJECT_NAME, |
--- client/resources/css/main.css
+++ client/resources/css/main.css
... | ... | @@ -845,7 +845,7 @@ |
845 | 845 |
margin-bottom: 0; |
846 | 846 |
} |
847 | 847 |
|
848 |
-/* 보호사 정보 */ |
|
848 |
+/* 생활보호사 정보 */ |
|
849 | 849 |
.caregiver-info p { |
850 | 850 |
font-size: 1.6rem; |
851 | 851 |
margin-bottom: 1rem; |
--- client/views/component/Modal_Guardian.jsx
+++ client/views/component/Modal_Guardian.jsx
... | ... | @@ -305,7 +305,7 @@ |
305 | 305 |
</div> |
306 | 306 |
<div className="modal-main"> |
307 | 307 |
<SubTitle explanation={"최초 ID는 연락처, PW는 qwer1234!입니다."} className="margin-bottom" /> |
308 |
- {CommonUtil.isEmpty(guardian['user_phonenumber']) ? |
|
308 |
+ {CommonUtil.isEmpty(guardian['guardian_id']) ? |
|
309 | 309 |
<div className="flex-end margin-bottom"> |
310 | 310 |
<div className="flex searchselect" style={{ width: 'auto' }}> |
311 | 311 |
<input type="radio" id="new_guardian" name="guardian" checked={isNewGuardian} |
... | ... | @@ -319,7 +319,7 @@ |
319 | 319 |
</div> : null |
320 | 320 |
} |
321 | 321 |
|
322 |
- {CommonUtil.isEmpty(guardian['user_phonenumber']) && !isNewGuardian ? ( |
|
322 |
+ {CommonUtil.isEmpty(guardian['guardian_id']) && !isNewGuardian ? ( |
|
323 | 323 |
<table className="margin-bottom2 senior-insert"> |
324 | 324 |
<tr> |
325 | 325 |
<th><span style={{ color: "red" }}>*</span>연락처 검색</th> |
--- client/views/component/Modal_Matching.jsx
+++ client/views/component/Modal_Matching.jsx
... | ... | @@ -24,9 +24,9 @@ |
24 | 24 |
|
25 | 25 |
const thead = [ |
26 | 26 |
"No", |
27 |
- "보호사 명", |
|
28 |
- "보호사 ID", |
|
29 |
- "보호사 연락처", |
|
27 |
+ "생활보호사 명", |
|
28 |
+ "생활보호사 ID", |
|
29 |
+ "생활보호사 연락처", |
|
30 | 30 |
"매칭 일자", |
31 | 31 |
"삭제" |
32 | 32 |
]; |
--- client/views/layout/Menu.jsx
+++ client/views/layout/Menu.jsx
... | ... | @@ -7,13 +7,13 @@ |
7 | 7 |
import MenuIcon from "@mui/icons-material/Menu"; |
8 | 8 |
import CloseIcon from '@mui/icons-material/Close'; |
9 | 9 |
|
10 |
-export default function Sidebar({items}) { |
|
10 |
+export default function Sidebar({ items }) { |
|
11 | 11 |
//전역 변수 저장 객체 |
12 |
- const state = useSelector((state) => {return state}); |
|
12 |
+ const state = useSelector((state) => { return state }); |
|
13 | 13 |
|
14 | 14 |
const [menuToggle, setMenuToggle] = React.useState(false); |
15 | 15 |
|
16 |
- const onClickshow=()=>{ |
|
16 |
+ const onClickshow = () => { |
|
17 | 17 |
setMenuToggle(!menuToggle) |
18 | 18 |
} |
19 | 19 |
const navigate = useNavigate(); |
... | ... | @@ -37,15 +37,15 @@ |
37 | 37 |
}); |
38 | 38 |
}; |
39 | 39 |
const [iconIndex, setIconIndex] = React.useState(0); |
40 |
- const icons = [<MenuIcon sx={{ fontSize: 40, }}/>, <CloseIcon sx={{ fontSize: 40, }}/>]; |
|
40 |
+ const icons = [<MenuIcon sx={{ fontSize: 40, }} />, <CloseIcon sx={{ fontSize: 40, }} />]; |
|
41 | 41 |
const handleClick = () => { |
42 |
- setIconIndex((iconIndex + 1) % icons.length); |
|
42 |
+ setIconIndex((iconIndex + 1) % icons.length); |
|
43 | 43 |
}; |
44 | 44 |
return ( |
45 |
- <> |
|
46 |
- <nav className={menuToggle? "nav on" : "nav"}> |
|
47 |
- <div className="menuicon" onClick={() => {onClickshow(); handleClick();}}> |
|
48 |
- {icons[iconIndex]} |
|
45 |
+ <> |
|
46 |
+ <nav className={menuToggle ? "nav on" : "nav"}> |
|
47 |
+ <div className="menuicon" onClick={() => { onClickshow(); handleClick(); }}> |
|
48 |
+ {icons[iconIndex]} |
|
49 | 49 |
</div> |
50 | 50 |
<h1 className="logo"><img src={logo} alt="" /></h1> |
51 | 51 |
<div className="flex-align-column" style={{ marginTop: `3rem` }}> |
... | ... | @@ -59,21 +59,22 @@ |
59 | 59 |
} |
60 | 60 |
</ul> |
61 | 61 |
</div> |
62 |
- <div className="bottom-section flex-center" style={{width: '100%'}}> |
|
63 |
- {state.loginUser['authority'] == 'ROLE_ADMIN' |
|
64 |
- || state.loginUser['authority'] == 'ROLE_GOVERNMENT' |
|
65 |
- || state.loginUser['authority'] == 'ROLE_AGENCYADMIN' |
|
66 |
- || state.loginUser['authority'] == 'ROLE_AGENCY' ? |
|
67 |
- <div className="info-id" > |
|
68 |
- <span onClick={() => { |
|
69 |
- navigate("/Join"); |
|
70 |
- }}>계정추가</span> |
|
71 |
- </div> |
|
62 |
+ <div className="bottom-section flex-center" style={{ width: '100%' }}> |
|
63 |
+ {state.loginUser['authority'] == 'ROLE_ADMIN' |
|
64 |
+ || state.loginUser['authority'] == 'ROLE_GOVERNMENT' |
|
65 |
+ || state.loginUser['authority'] == 'ROLE_AGENCYADMIN' |
|
66 |
+ // || state.loginUser['authority'] == 'ROLE_AGENCY' |
|
67 |
+ ? |
|
68 |
+ <div className="info-id" > |
|
69 |
+ <span onClick={() => { |
|
70 |
+ navigate("/Join"); |
|
71 |
+ }}>관리자추가</span> |
|
72 |
+ </div> |
|
72 | 73 |
: null} |
73 |
- <div className="logout" onClick={logout}><span>로그아웃</span></div> |
|
74 |
- </div> |
|
74 |
+ <div className="logout" onClick={logout}><span>로그아웃</span></div> |
|
75 |
+ </div> |
|
75 | 76 |
</nav> |
76 |
- |
|
77 |
- </> |
|
77 |
+ |
|
78 |
+ </> |
|
78 | 79 |
); |
79 | 80 |
} |
--- client/views/pages/AppRoute.jsx
+++ client/views/pages/AppRoute.jsx
... | ... | @@ -291,6 +291,15 @@ |
291 | 291 |
icon: <HouseIcon sx={{ fontSize: 20, color: "#333333", marginRight: 1 }} />, |
292 | 292 |
}, |
293 | 293 |
{ |
294 |
+ title: "사용자 관리", |
|
295 |
+ path: "/UserSelect", |
|
296 |
+ icon: ( |
|
297 |
+ <PersonIcon |
|
298 |
+ sx={{ fontSize: 20, marginRight: 1 }} |
|
299 |
+ /> |
|
300 |
+ ), |
|
301 |
+ }, |
|
302 |
+ { |
|
294 | 303 |
title: "대상자 관리", |
295 | 304 |
path: "/AgencyAdminSeniorSelect", |
296 | 305 |
icon: ( |
... | ... | @@ -342,6 +351,7 @@ |
342 | 351 |
<Route path="/SeniorEdit" element={<SeniorEdit />}></Route> |
343 | 352 |
<Route path="/SeniorSelectOne" element={<SeniorSelectOne />}></Route> |
344 | 353 |
<Route path="/UserEdit" element={<UserEdit />}></Route> |
354 |
+ <Route path="/UserSelect" element={<UserSelect />}></Route> |
|
345 | 355 |
<Route path="/AgentSelectOne" element={<AgentSelectOne />}></Route> |
346 | 356 |
<Route |
347 | 357 |
path="/HealthcareSelectOne" |
--- client/views/pages/equipment/AgencyEquipmentSelect.jsx
+++ client/views/pages/equipment/AgencyEquipmentSelect.jsx
... | ... | @@ -96,12 +96,13 @@ |
96 | 96 |
const [rentalEquipmentSearch, setRentalEquipmentSearch] = React.useState({ |
97 | 97 |
'government_id': defaultGovernmentId, |
98 | 98 |
'agency_id': defaultAgencyId, |
99 |
- 'senior_id': 'IS_NOT_NULL', |
|
99 |
+ // 'senior_id': 'IS_NOT_NULL', |
|
100 | 100 |
'currentPage': 1, |
101 | 101 |
'perPage': 10, |
102 | 102 |
}); |
103 | 103 |
//입고 및 미대여 목록 |
104 | 104 |
const [rentalEquipment, setRentalEquipment] = React.useState({ equipmentList: [], equipmentListCount: 0 }); |
105 |
+ console.log("rentalEquipmentSearch:", rentalEquipmentSearch) |
|
105 | 106 |
//입고 및 미대여 목록 조회 |
106 | 107 |
const rentalEquipmentSelectList = (currentPage) => { |
107 | 108 |
rentalEquipmentSearch.currentPage = CommonUtil.isEmpty(currentPage) ? 1 : currentPage; |
... | ... | @@ -185,12 +186,13 @@ |
185 | 186 |
<td data-label="장비상태">{equipmentStates[item['equipment_state']]}</td> |
186 | 187 |
<td>{item['agency_name']}</td> |
187 | 188 |
<td data-label="대여시행자"> |
188 |
- {item['rental_detail_insert_user_name']} |
|
189 |
- ({item['rental_detail_insert_user_id']}) |
|
189 |
+ {CommonUtil.isEmpty(item['rental_detail_insert_user_name']) == false ? |
|
190 |
+ item['rental_detail_insert_user_name'] + '(' + item['rental_detail_insert_user_id'] + ')' |
|
191 |
+ : '-'} |
|
190 | 192 |
</td> |
191 |
- <td data-label="대여일">{item['rental_start_date']}</td> |
|
193 |
+ <td data-label="대여일">{CommonUtil.isEmpty(item['rental_start_date']) == false ? item['rental_start_date'] : '-'}</td> |
|
192 | 194 |
<td data-label="대여여부">{CommonUtil.isEmpty(item['user_name']) == false ? '대여중' : '미대여'}</td> |
193 |
- <td data-label="장비사용대상자">{item['user_name']}</td> |
|
195 |
+ <td data-label="장비사용대상자">{CommonUtil.isEmpty(item['user_name']) == false ? item['user_name'] : '-'}</td> |
|
194 | 196 |
</tr> |
195 | 197 |
) |
196 | 198 |
})} |
--- client/views/pages/equipment/GovernmentEquipmentSelect.jsx
+++ client/views/pages/equipment/GovernmentEquipmentSelect.jsx
... | ... | @@ -431,12 +431,13 @@ |
431 | 431 |
const [selectEquipment, setSelectEquipment] = React.useState() |
432 | 432 |
|
433 | 433 |
//장비 대여 등록 |
434 |
- const equipmentRentalInsert = (seniorId) => { |
|
434 |
+ const equipmentRentalInsert = (senior) => { |
|
435 | 435 |
if (confirm('해당 장비를 추가하시겠습니까?') == false) { |
436 | 436 |
return; |
437 | 437 |
} |
438 | 438 |
|
439 |
- selectEquipment['senior_id'] = seniorId; |
|
439 |
+ selectEquipment['agency_id'] = senior['agency_id']; // 장비에 시행기관이 '없음'일 경우 배포한 시니어의 시행기관을 등록 |
|
440 |
+ selectEquipment['senior_id'] = senior['senior_id']; |
|
440 | 441 |
selectEquipment['rental_start_date'] = new Date(); |
441 | 442 |
|
442 | 443 |
fetch("/equipment/equipmentRentalInsert.json", { |
... | ... | @@ -850,7 +851,7 @@ |
850 | 851 |
<td data-label="생년월일">{item['user_birth']}</td> |
851 | 852 |
<td data-label="성별">{item['user_gender']}</td> |
852 | 853 |
<td data-label="배포"> |
853 |
- <button className="btn-small gray-btn" onClick={() => { equipmentRentalInsert(item['senior_id']) }}>배포하기</button> |
|
854 |
+ <button className="btn-small gray-btn" onClick={() => { equipmentRentalInsert(item) }}>배포하기</button> |
|
854 | 855 |
</td> |
855 | 856 |
</tr> |
856 | 857 |
) |
--- client/views/pages/healthcare/Healthcare.jsx
+++ client/views/pages/healthcare/Healthcare.jsx
... | ... | @@ -43,7 +43,7 @@ |
43 | 43 |
React.useEffect(() => { |
44 | 44 |
searching(); |
45 | 45 |
}, [isMySenior]) |
46 |
- //보호사(간호사)의 돌봄 대상자(시니어) |
|
46 |
+ //생활보호사(간호사)의 돌봄 대상자(시니어) |
|
47 | 47 |
const [senior, setSenior] = React.useState({ |
48 | 48 |
seniorList: [], seniorListCount: 0, search: { |
49 | 49 |
'government_id': CommonUtil.isEmpty(state.loginUser) ? null : state.loginUser['government_id'], |
... | ... | @@ -54,7 +54,7 @@ |
54 | 54 |
'perPage': 10, |
55 | 55 |
} |
56 | 56 |
}); |
57 |
- //보호사(간호사)의 돌봄 대상자(시니어) 목록 조회 |
|
57 |
+ //생활보호사(간호사)의 돌봄 대상자(시니어) 목록 조회 |
|
58 | 58 |
const seniorSelectList = (currentPage) => { |
59 | 59 |
senior.search.currentPage = CommonUtil.isEmpty(currentPage) ? 1 : currentPage; |
60 | 60 |
|
--- client/views/pages/healthcare/HealthcareAdmin.jsx
+++ client/views/pages/healthcare/HealthcareAdmin.jsx
... | ... | @@ -43,7 +43,7 @@ |
43 | 43 |
React.useEffect(() => { |
44 | 44 |
searching(); |
45 | 45 |
}, [isMySenior]) |
46 |
- //보호사(간호사)의 돌봄 대상자(시니어) |
|
46 |
+ //생활보호사(간호사)의 돌봄 대상자(시니어) |
|
47 | 47 |
const [senior, setSenior] = React.useState({ |
48 | 48 |
seniorList: [], seniorListCount: 0, search: { |
49 | 49 |
'government_id': CommonUtil.isEmpty(state.loginUser) ? null : state.loginUser['government_id'], |
... | ... | @@ -54,7 +54,7 @@ |
54 | 54 |
'perPage': 10, |
55 | 55 |
} |
56 | 56 |
}); |
57 |
- //보호사(간호사)의 돌봄 대상자(시니어) 목록 조회 |
|
57 |
+ //생활보호사(간호사)의 돌봄 대상자(시니어) 목록 조회 |
|
58 | 58 |
const seniorSelectList = (currentPage) => { |
59 | 59 |
senior.search.currentPage = CommonUtil.isEmpty(currentPage) ? 1 : currentPage; |
60 | 60 |
|
--- client/views/pages/healthcare/Medicalcare.jsx
+++ client/views/pages/healthcare/Medicalcare.jsx
... | ... | @@ -46,7 +46,7 @@ |
46 | 46 |
React.useEffect(() => { |
47 | 47 |
searching(); |
48 | 48 |
}, [isMySenior]) |
49 |
- //보호사(간호사)의 돌봄 대상자(시니어) |
|
49 |
+ //생활보호사(간호사)의 돌봄 대상자(시니어) |
|
50 | 50 |
const [senior, setSenior] = React.useState({seniorList: [], seniorListCount: 0, search: { |
51 | 51 |
'government_id': CommonUtil.isEmpty(state.loginUser) ? null : state.loginUser['government_id'], |
52 | 52 |
'agency_id': CommonUtil.isEmpty(state.loginUser) ? null : state.loginUser['agency_id'], |
... | ... | @@ -55,7 +55,7 @@ |
55 | 55 |
'currentPage': 1, |
56 | 56 |
'perPage': 10, |
57 | 57 |
}}); |
58 |
- //보호사(간호사)의 돌봄 대상자(시니어) 목록 조회 |
|
58 |
+ //생활보호사(간호사)의 돌봄 대상자(시니어) 목록 조회 |
|
59 | 59 |
const seniorSelectList = (currentPage) => { |
60 | 60 |
senior.search.currentPage = CommonUtil.isEmpty(currentPage) ? 1 : currentPage; |
61 | 61 |
|
--- client/views/pages/healthcare/MedicalcareAdmin.jsx
+++ client/views/pages/healthcare/MedicalcareAdmin.jsx
... | ... | @@ -46,7 +46,7 @@ |
46 | 46 |
React.useEffect(() => { |
47 | 47 |
searching(); |
48 | 48 |
}, [isMySenior]) |
49 |
- //보호사(간호사)의 돌봄 대상자(시니어) |
|
49 |
+ //생활보호사(간호사)의 돌봄 대상자(시니어) |
|
50 | 50 |
const [senior, setSenior] = React.useState({ |
51 | 51 |
seniorList: [], seniorListCount: 0, search: { |
52 | 52 |
'government_id': CommonUtil.isEmpty(state.loginUser) ? null : state.loginUser['government_id'], |
... | ... | @@ -57,7 +57,7 @@ |
57 | 57 |
'perPage': 10, |
58 | 58 |
} |
59 | 59 |
}); |
60 |
- //보호사(간호사)의 돌봄 대상자(시니어) 목록 조회 |
|
60 |
+ //생활보호사(간호사)의 돌봄 대상자(시니어) 목록 조회 |
|
61 | 61 |
const seniorSelectList = (currentPage) => { |
62 | 62 |
senior.search.currentPage = CommonUtil.isEmpty(currentPage) ? 1 : currentPage; |
63 | 63 |
|
--- client/views/pages/healthcare/statistics/GuardianStatistics.jsx
+++ client/views/pages/healthcare/statistics/GuardianStatistics.jsx
... | ... | @@ -27,7 +27,7 @@ |
27 | 27 |
<li className="flex-start"> |
28 | 28 |
<p><img className="guardian-img" src={calendarBig} alt="" /></p> |
29 | 29 |
<p>방문 그래프</p> |
30 |
- <p>이번달 보호사님이 방문한 횟수는 총 4회 입니다.</p> |
|
30 |
+ <p>이번달 생활보호사님이 방문한 횟수는 총 4회 입니다.</p> |
|
31 | 31 |
</li> |
32 | 32 |
<li className="chart-guardian"> |
33 | 33 |
<Chart /> |
--- client/views/pages/join/Join.jsx
+++ client/views/pages/join/Join.jsx
... | ... | @@ -118,8 +118,8 @@ |
118 | 118 |
const userAuthorityChange = (value) => { |
119 | 119 |
let newUser = JSON.parse(JSON.stringify(user)); |
120 | 120 |
newUser['authority'] = value; |
121 |
- newUser['government_id'] = null; |
|
122 |
- newUser['agency_id'] = null; |
|
121 |
+ // newUser['government_id'] = null; |
|
122 |
+ // newUser['agency_id'] = null; |
|
123 | 123 |
setUser(newUser); |
124 | 124 |
} |
125 | 125 |
//등록할 사용자의 관리기관 변경 |
... | ... | @@ -253,7 +253,7 @@ |
253 | 253 |
}); |
254 | 254 |
} |
255 | 255 |
|
256 |
- //보호사 등록 |
|
256 |
+ //생활보호사 등록 |
|
257 | 257 |
const agentInsert = () => { |
258 | 258 |
if (userInsertValidation() == false) { |
259 | 259 |
return; |
... | ... | @@ -266,7 +266,7 @@ |
266 | 266 |
}, |
267 | 267 |
body: JSON.stringify(user), |
268 | 268 |
}).then((response) => response.json()).then((data) => { |
269 |
- console.log("보호사 등록 결과(건수) : ", data); |
|
269 |
+ console.log("생활보호사 등록 결과(건수) : ", data); |
|
270 | 270 |
if (data > 0) { |
271 | 271 |
alert("계정생성완료"); |
272 | 272 |
navigate(-1); |
... | ... | @@ -310,7 +310,7 @@ |
310 | 310 |
{CommonUtil.isEmpty(state.loginUser) == false && (state.loginUser['authority'] == 'ROLE_ADMIN' || state.loginUser['authority'] == 'ROLE_GOVERNMENT' || state.loginUser['authority'] == 'ROLE_AGENCYADMIN') ? |
311 | 311 |
<option value="ROLE_AGENCYADMIN" selected={user['authority'] == "ROLE_AGENCYADMIN"}>센터 관리자</option> |
312 | 312 |
: null} |
313 |
- <option value="ROLE_AGENCY" selected={user['authority'] == "ROLE_AGENCY"}>보호사</option> |
|
313 |
+ <option value="ROLE_AGENCY" selected={user['authority'] == "ROLE_AGENCY"}>생활보호사</option> |
|
314 | 314 |
</select> |
315 | 315 |
</div> |
316 | 316 |
</div> |
--- client/views/pages/main/Main_agency.jsx
+++ client/views/pages/main/Main_agency.jsx
... | ... | @@ -87,7 +87,7 @@ |
87 | 87 |
} |
88 | 88 |
|
89 | 89 |
seniorGenderArr.map((item, idx) => { |
90 |
- for (let i = 4; i < 14; i++) { |
|
90 |
+ for (let i = 0; i < 18; i++) { |
|
91 | 91 |
if (item['age'] > i * 5 && item['age'] < ((i + 1) * 5) - 1) { |
92 | 92 |
if (item['gender'] == "남") { |
93 | 93 |
genderData[i]['male'] = genderData[i]['male'] + 1 |
--- client/views/pages/main/Main_agencyAdmin.jsx
+++ client/views/pages/main/Main_agencyAdmin.jsx
... | ... | @@ -132,7 +132,7 @@ |
132 | 132 |
}); |
133 | 133 |
} |
134 | 134 |
|
135 |
- //보호사별 대상자(시니어) 등록 현황 |
|
135 |
+ //생활보호사별 대상자(시니어) 등록 현황 |
|
136 | 136 |
const [seniorEnroll, setSeniorEnroll] = React.useState([]); |
137 | 137 |
const seniorByAgent = () => { |
138 | 138 |
fetch("/stats/seniorByAgent.json", { |
... | ... | @@ -149,7 +149,7 @@ |
149 | 149 |
item['agent_name'] = "미배정"; |
150 | 150 |
} |
151 | 151 |
}) |
152 |
- console.log("보호사별 시니어 등록 현황 : ", data); |
|
152 |
+ console.log("생활보호사별 시니어 등록 현황 : ", data); |
|
153 | 153 |
setSeniorEnroll(data); |
154 | 154 |
}).catch((error) => { |
155 | 155 |
console.log('seniorByAgent() /stats/seniorByAgent.json error : ', error); |
... | ... | @@ -334,7 +334,7 @@ |
334 | 334 |
</div> |
335 | 335 |
<div className="content-box combine-right-government"> |
336 | 336 |
<div className="flex"> |
337 |
- <Title title={`보호사별 대상자 등록 현황`} explanation={"약상자 사용자의 데이터 차트가 보여집니다."} /> |
|
337 |
+ <Title title={`생활보호사별 대상자 등록 현황`} explanation={"약상자 사용자의 데이터 차트가 보여집니다."} /> |
|
338 | 338 |
</div> |
339 | 339 |
<Chart5_agencyadmin data={seniorEnroll} /> |
340 | 340 |
</div> |
--- client/views/pages/org/OrgSelect.jsx
+++ client/views/pages/org/OrgSelect.jsx
... | ... | @@ -587,7 +587,7 @@ |
587 | 587 |
<th>기관명</th> |
588 | 588 |
<th>관리장비개수</th> |
589 | 589 |
<th>관리자(명)</th> |
590 |
- <th>보호사(명)</th> |
|
590 |
+ <th>생활보호사(명)</th> |
|
591 | 591 |
<th>돌봄 대상자(명)</th> |
592 | 592 |
<th>주소</th> |
593 | 593 |
<th>대표연락처</th> |
... | ... | @@ -608,7 +608,7 @@ |
608 | 608 |
<td data-label="기관명">{item['government_name']}</td> |
609 | 609 |
<td data-label="관리 장비 개수">{item['equipment_count']}</td> |
610 | 610 |
<td data-label="관리자(명)">{item['government_user_count']}</td> |
611 |
- <td data-label="보호사(명)">{item['agent_user_count']}</td> |
|
611 |
+ <td data-label="생활보호사(명)">{item['agent_user_count']}</td> |
|
612 | 612 |
<td data-label="돌봄 대상자(명)">{item['senior_user_count']}</td> |
613 | 613 |
<td data-label="주소">{item['government_address']}</td> |
614 | 614 |
<td data-label="대표 연락처">{item['government_phonenumber']}</td> |
... | ... | @@ -696,7 +696,7 @@ |
696 | 696 |
<th>구분</th> |
697 | 697 |
<th>관리기관명</th> |
698 | 698 |
<th>기관명</th> |
699 |
- <th>보호사(명)</th> |
|
699 |
+ <th>생활보호사(명)</th> |
|
700 | 700 |
<th>돌봄 대상자(명)</th> |
701 | 701 |
<th>주소</th> |
702 | 702 |
<th>대표연락처</th> |
... | ... | @@ -713,7 +713,7 @@ |
713 | 713 |
<td data-label="구분">{orgTypes[item['agency_type']]}</td> |
714 | 714 |
<td data-label="관리기관명">{item['government_name']}</td> |
715 | 715 |
<td data-label="기관명">{item['agency_name']}</td> |
716 |
- <td data-label="보호사(명)">{item['agent_user_count']}</td> |
|
716 |
+ <td data-label="생활보호사(명)">{item['agent_user_count']}</td> |
|
717 | 717 |
<td data-label="돌봄 대상자(명)">{item['senior_user_count']}</td> |
718 | 718 |
<td data-label="주소">{item['agency_address']}</td> |
719 | 719 |
<td data-label="대표 연락처">{item['agency_phonenumber']}</td> |
--- client/views/pages/senior_management/SeniorSelectOne.jsx
+++ client/views/pages/senior_management/SeniorSelectOne.jsx
... | ... | @@ -308,9 +308,9 @@ |
308 | 308 |
modalGuardianOpen(); |
309 | 309 |
} |
310 | 310 |
|
311 |
- //대상자의 보호사 목록 |
|
311 |
+ //대상자의 생활보호사 목록 |
|
312 | 312 |
const [agent, setAgent] = React.useState({ agentListBySenior: [], agentListCountBySenior: 0 }); |
313 |
- //대상자의 보호사 목록 조회 |
|
313 |
+ //대상자의 생활보호사 목록 조회 |
|
314 | 314 |
const agentSelectListBySenior = () => { |
315 | 315 |
fetch("/user/agentSelectListBySenior.json", { |
316 | 316 |
method: "POST", |
... | ... | @@ -392,7 +392,7 @@ |
392 | 392 |
const seniorDelete = (senior) => { |
393 | 393 |
let insertBtn = confirm("삭제하시겠습니까?"); |
394 | 394 |
if (insertBtn) { |
395 |
- // 보호사 매칭 종료 |
|
395 |
+ // 생활보호사 매칭 종료 |
|
396 | 396 |
let agent_id = ""; |
397 | 397 |
let agent_match_idx = ""; |
398 | 398 |
agent.agentListBySenior.map((item, idx) => { |
... | ... | @@ -683,7 +683,7 @@ |
683 | 683 |
</div> |
684 | 684 |
|
685 | 685 |
|
686 |
- <SubTitle explanation={"대상자의 보호사"} className="margin-bottom" /> |
|
686 |
+ <SubTitle explanation={"대상자의 생활보호사"} className="margin-bottom" /> |
|
687 | 687 |
<div className="margin-bottom5"> |
688 | 688 |
<table className={"senior-user protector-user"}> |
689 | 689 |
<thead> |
... | ... | @@ -711,7 +711,7 @@ |
711 | 711 |
<td data-label="이름">{item['user_name']}</td> |
712 | 712 |
<td data-label="연락처">{item['user_phonenumber']}</td> |
713 | 713 |
<td data-label="이메일">{item['user_email']}</td> |
714 |
- <td data-label="상태">{item['agent_match_state'] ? <span className="green">현재 보호사</span> : <span className="grey">이전 보호사</span>}</td> |
|
714 |
+ <td data-label="상태">{item['agent_match_state'] ? <span className="green">현재 생활보호사</span> : <span className="grey">이전 생활보호사</span>}</td> |
|
715 | 715 |
<td data-label="배정시작일">{item['agent_match_start_date']}</td> |
716 | 716 |
<td data-label="배정종료일">{item['agent_match_end_date']}</td> |
717 | 717 |
<td data-label="관리"> |
--- client/views/pages/setting/AuthorityManagement.jsx
+++ client/views/pages/setting/AuthorityManagement.jsx
... | ... | @@ -7,7 +7,7 @@ |
7 | 7 |
const [checkArr, setCheckArr] = React.useState([]); //check 배열 |
8 | 8 |
const [menuCheckArr, setMenuCheckArr] = React.useState([]); //menu check 배열 |
9 | 9 |
|
10 |
- const authorityList = ["보호자", "보호사", "병원", "지자체", "관리자"]; |
|
10 |
+ const authorityList = ["보호자", "생활보호사", "병원", "지자체", "관리자"]; |
|
11 | 11 |
const menuList = [ |
12 | 12 |
{ |
13 | 13 |
menu: { |
... | ... | @@ -140,7 +140,7 @@ |
140 | 140 |
<td><input type="checkbox" checked="checked"/></td> |
141 | 141 |
</tr> |
142 | 142 |
<tr> |
143 |
- <td>보호사(간호사, 복지사 등)</td> |
|
143 |
+ <td>생활보호사(간호사, 복지사 등)</td> |
|
144 | 144 |
<td><input type="checkbox" checked="checked"/></td> |
145 | 145 |
<td><input type="checkbox" checked="checked"/></td> |
146 | 146 |
<td><input type="checkbox" checked="checked"/></td> |
--- client/views/pages/user_management/AgencyAdminSeniorSelect.jsx
+++ client/views/pages/user_management/AgencyAdminSeniorSelect.jsx
... | ... | @@ -123,20 +123,20 @@ |
123 | 123 |
console.log('agencySeniorSelectList() /user/seniorSelectList.json error : ', error); |
124 | 124 |
}); |
125 | 125 |
} |
126 |
- //보호사 선택 -> 시행기관의 대상자(시니어) 목록 조회 |
|
126 |
+ //생활보호사 선택 -> 시행기관의 대상자(시니어) 목록 조회 |
|
127 | 127 |
const agentChange = (userId) => { |
128 | 128 |
agencySenior.search['agent_id'] = userId; |
129 | 129 |
setAgencySenior({ ...agencySenior }); |
130 | 130 |
agencySeniorSelectList(1); |
131 | 131 |
} |
132 |
- //선택한 보호사의 이름 |
|
132 |
+ //선택한 생활보호사의 이름 |
|
133 | 133 |
const getSearchAgentName = () => { |
134 | 134 |
for (let i = 0; i < agent.userList.length; i++) { |
135 | 135 |
if (agent.userList[i]['user_id'] == agencySenior.search['agent_id']) { |
136 | 136 |
return agent.userList[i]['user_name']; |
137 | 137 |
} |
138 | 138 |
} |
139 |
- return '보호사'; |
|
139 |
+ return '생활보호사'; |
|
140 | 140 |
} |
141 | 141 |
|
142 | 142 |
const [CheckList, setCheckList] = React.useState([]); |
... | ... | @@ -167,8 +167,8 @@ |
167 | 167 |
const [workerId, setWorkerId] = React.useState(""); |
168 | 168 |
// 시니어 - 담당자 매칭 |
169 | 169 |
const MatchSeniorAgency = () => { |
170 |
- if (workerId == '') { |
|
171 |
- alert("보호사를 선택해 주세요."); |
|
170 |
+ if (CommonUtil.isEmpty(workerId) == true) { |
|
171 |
+ alert("생활보호사를 선택해 주세요."); |
|
172 | 172 |
return; |
173 | 173 |
} |
174 | 174 |
var insertBtn = confirm("등록하시겠습니까?"); |
... | ... | @@ -181,7 +181,7 @@ |
181 | 181 |
} |
182 | 182 |
}; |
183 | 183 |
|
184 |
- // 보호사 배정 |
|
184 |
+ // 생활보호사 배정 |
|
185 | 185 |
const agentSeniorInsert = (seniorId) => { |
186 | 186 |
fetch("/user/agentSeniorInsert.json", { |
187 | 187 |
method: "POST", |
... | ... | @@ -241,7 +241,7 @@ |
241 | 241 |
<div> |
242 | 242 |
<div className="flex-align-start userauthoriylist gap5"> |
243 | 243 |
<div className="left"> |
244 |
- <SubTitle explanation={"우리기관 보호사"} /> |
|
244 |
+ <SubTitle explanation={"우리기관 생활보호사"} /> |
|
245 | 245 |
<div style={{ fontSize: '16px', marginTop: '0px' }} className="category"> |
246 | 246 |
<a className="active" onClick={() => { agentChange(null) }}> |
247 | 247 |
{state.loginUser['government_name']} |
... | ... | @@ -291,7 +291,7 @@ |
291 | 291 |
} /> |
292 | 292 |
<div className="btn-wrap flex-end margin-bottom "> |
293 | 293 |
<button className={"btn-small gray-btn"} onClick={modalSeniorInsertOpen}>신규등록</button> |
294 |
- <button className={"btn-small gray-btn"} onClick={() => { openModal() }}>보호사 배정하기</button> |
|
294 |
+ <button className={"btn-small gray-btn"} onClick={() => { openModal() }}>생활보호사 배정하기</button> |
|
295 | 295 |
</div> |
296 | 296 |
</div> |
297 | 297 |
<table className={"protector-user"}> |
... | ... | @@ -307,7 +307,7 @@ |
307 | 307 |
<th>성별</th> |
308 | 308 |
<th>연락처</th> |
309 | 309 |
<th>보호자</th> |
310 |
- <th>보호사</th> |
|
310 |
+ <th>생활보호사</th> |
|
311 | 311 |
<th>대상자관리</th> |
312 | 312 |
</tr> |
313 | 313 |
</thead> |
... | ... | @@ -331,7 +331,7 @@ |
331 | 331 |
: item['guardian_user_names'] |
332 | 332 |
} |
333 | 333 |
</td> |
334 |
- <td data-label="보호사"> |
|
334 |
+ <td data-label="생활보호사"> |
|
335 | 335 |
{item['agent_user_names']} |
336 | 336 |
</td> |
337 | 337 |
<td data-label="대상자관리"> |
... | ... | @@ -485,18 +485,18 @@ |
485 | 485 |
</ul> |
486 | 486 |
</div> |
487 | 487 |
</div> |
488 |
- <Modal open={modalOpen} close={closeModal} header="보호사 배정하기"> |
|
488 |
+ <Modal open={modalOpen} close={closeModal} header="생활보호사 배정하기"> |
|
489 | 489 |
<div className="modal-visit board-wrap"> |
490 | 490 |
<table className="margin-bottom"> |
491 | 491 |
<tbody> |
492 | 492 |
<tr> |
493 |
- <th>담당 보호사</th> |
|
493 |
+ <th>담당 생활보호사</th> |
|
494 | 494 |
<td> |
495 | 495 |
<select onChange={(e) => { |
496 | 496 |
console.log('e.target.value : ', e.target.value); |
497 | 497 |
setWorkerId(e.target.value); |
498 | 498 |
}}> |
499 |
- <option value="">담당 보호사를 선택해주세요.</option> |
|
499 |
+ <option value="">담당 생활보호사를 선택해주세요.</option> |
|
500 | 500 |
{agent.userList.map((user, idx) => { |
501 | 501 |
return ( |
502 | 502 |
<option key={idx} value={user['user_id']}>{user['user_name']}</option> |
--- client/views/pages/user_management/AgencySeniorSelect.jsx
+++ client/views/pages/user_management/AgencySeniorSelect.jsx
... | ... | @@ -89,9 +89,9 @@ |
89 | 89 |
} |
90 | 90 |
|
91 | 91 |
|
92 |
- //보호사(간호사)의 돌봄 대상자(시니어) |
|
92 |
+ //생활보호사(간호사)의 돌봄 대상자(시니어) |
|
93 | 93 |
const [mySenior, setMySenior] = React.useState({ seniorList: [], seniorListCount: 0, search: JSON.parse(JSON.stringify(search)) }); |
94 |
- //보호사(간호사)의 돌봄 대상자(시니어) 목록 조회 |
|
94 |
+ //생활보호사(간호사)의 돌봄 대상자(시니어) 목록 조회 |
|
95 | 95 |
const mySeniorSelectList = (currentPage) => { |
96 | 96 |
mySenior.search.currentPage = CommonUtil.isEmpty(currentPage) ? 1 : currentPage; |
97 | 97 |
|
... | ... | @@ -103,7 +103,7 @@ |
103 | 103 |
body: JSON.stringify(mySenior.search), |
104 | 104 |
}).then((response) => response.json()).then((data) => { |
105 | 105 |
data.search = mySenior.search; |
106 |
- console.log("보호사(간호사)의 돌봄 대상자(시니어) 목록 조회 : ", data); |
|
106 |
+ console.log("생활보호사(간호사)의 돌봄 대상자(시니어) 목록 조회 : ", data); |
|
107 | 107 |
setMySenior(data); |
108 | 108 |
}).catch((error) => { |
109 | 109 |
console.log('seniorSelectList() /user/seniorSelectList.json error : ', error); |
... | ... | @@ -132,25 +132,25 @@ |
132 | 132 |
console.log('agencySeniorSelectList() /user/seniorSelectList.json error : ', error); |
133 | 133 |
}); |
134 | 134 |
} |
135 |
- //보호사 선택 -> 시행기관의 대상자(시니어) 목록 조회 |
|
135 |
+ //생활보호사 선택 -> 시행기관의 대상자(시니어) 목록 조회 |
|
136 | 136 |
const agentChange = (userId) => { |
137 | 137 |
agencySenior.search['agent_id'] = userId; |
138 | 138 |
setAgencySenior({ ...agencySenior }); |
139 | 139 |
agencySeniorSelectList(1); |
140 | 140 |
} |
141 |
- //선택한 보호사의 이름 |
|
141 |
+ //선택한 생활보호사의 이름 |
|
142 | 142 |
const getSearchAgentName = () => { |
143 | 143 |
for (let i = 0; i < agent.userList.length; i++) { |
144 | 144 |
if (agent.userList[i]['user_id'] == agencySenior.search['agent_id']) { |
145 | 145 |
return agent.userList[i]['user_name']; |
146 | 146 |
} |
147 | 147 |
} |
148 |
- return '보호사'; |
|
148 |
+ return '생활보호사'; |
|
149 | 149 |
} |
150 | 150 |
|
151 | 151 |
|
152 | 152 |
|
153 |
- //보호사의 대상자 등록 |
|
153 |
+ //생활보호사의 대상자 등록 |
|
154 | 154 |
const agentSeniorInsert = (senior, agentId) => { |
155 | 155 |
if (confirm(`${senior['user_name']}님을 돌봄 대상자로 추가하시겠습니까?`) == false) { |
156 | 156 |
return; |
... | ... | @@ -193,7 +193,7 @@ |
193 | 193 |
content: ( |
194 | 194 |
<div> |
195 | 195 |
<div className="flex equip-tab"> |
196 |
- <SubTitle explanation={"접속하신 보호사(간호사)분의 돌봄 대상자 목록입니다."} /> |
|
196 |
+ <SubTitle explanation={"접속하신 생활보호사(간호사)분의 돌봄 대상자 목록입니다."} /> |
|
197 | 197 |
<div className="btn-wrap flex-end margin-bottom "> |
198 | 198 |
<button className={"btn-small gray-btn"} onClick={modalSeniorInsertOpen}>신규등록</button> |
199 | 199 |
</div> |
... | ... | @@ -264,7 +264,7 @@ |
264 | 264 |
// <div> |
265 | 265 |
// <div className="flex-align-start userauthoriylist gap5"> |
266 | 266 |
// <div className="left"> |
267 |
- // <SubTitle explanation={"우리기관 보호사"}/> |
|
267 |
+ // <SubTitle explanation={"우리기관 생활보호사"}/> |
|
268 | 268 |
// <div style={{fontSize: '16px', marginTop: '0px'}} className="category"> |
269 | 269 |
// <a className="active" onClick={() => {agentChange(null)}}> |
270 | 270 |
// {state.loginUser['government_name']} |
... | ... | @@ -324,7 +324,7 @@ |
324 | 324 |
// <th>성별</th> |
325 | 325 |
// <th>연락처</th> |
326 | 326 |
// <th>보호자</th> |
327 |
- // <th>보호사</th> |
|
327 |
+ // <th>생활보호사</th> |
|
328 | 328 |
// <th>대상자관리</th> |
329 | 329 |
// </tr> |
330 | 330 |
// </thead> |
... | ... | @@ -343,7 +343,7 @@ |
343 | 343 |
// : item['guardian_user_names'] |
344 | 344 |
// } |
345 | 345 |
// </td> |
346 |
- // <td data-label="보호사"> |
|
346 |
+ // <td data-label="생활보호사"> |
|
347 | 347 |
// {CommonUtil.isEmpty(item['agent_user_names']) |
348 | 348 |
// ? <button className="btn-small gray-btn" onClick={() => agentSeniorInsert(item)}>내 돌봄 대상자로 추가</button> |
349 | 349 |
// : item['agent_user_names'] |
--- client/views/pages/user_management/AgentAdminSelectOne.jsx
+++ client/views/pages/user_management/AgentAdminSelectOne.jsx
... | ... | @@ -56,11 +56,11 @@ |
56 | 56 |
}); |
57 | 57 |
}; |
58 | 58 |
|
59 |
- //보호사의 대상자 목록 |
|
59 |
+ //생활보호사의 대상자 목록 |
|
60 | 60 |
const [seniorByAgent, setSeniorByAgent] = React.useState({seniorListByAgent: [], seniorListCountByAgent: 0}); |
61 |
- //보호사의 선택한 대상자 정보 |
|
61 |
+ //생활보호사의 선택한 대상자 정보 |
|
62 | 62 |
const [senior, setSenior] = React.useState({}); |
63 |
- //보호사의 대상자 목록 조회 |
|
63 |
+ //생활보호사의 대상자 목록 조회 |
|
64 | 64 |
const seniorSelectListByAgent = () => { |
65 | 65 |
fetch("/user/seniorSelectListByAgent.json", { |
66 | 66 |
method: "POST", |
... | ... | @@ -205,7 +205,7 @@ |
205 | 205 |
</div> |
206 | 206 |
</div> |
207 | 207 |
|
208 |
- <SubTitle explanation={"보호사의 보호대상자"} className="margin-bottom display-inline-block" /> |
|
208 |
+ <SubTitle explanation={"생활보호사의 보호대상자"} className="margin-bottom display-inline-block" /> |
|
209 | 209 |
<button className={"btn-small gray-btn display-inline-block float-right"} onClick={() => modalSeniorInsertOpen()}>보호대상자 추가</button> |
210 | 210 |
<div className="margin-bottom5"> |
211 | 211 |
<table className={"agent-user"}> |
--- client/views/pages/user_management/AgentSelectOne.jsx
+++ client/views/pages/user_management/AgentSelectOne.jsx
... | ... | @@ -56,11 +56,11 @@ |
56 | 56 |
}); |
57 | 57 |
}; |
58 | 58 |
|
59 |
- //보호사의 대상자 목록 |
|
59 |
+ //생활보호사의 대상자 목록 |
|
60 | 60 |
const [seniorByAgent, setSeniorByAgent] = React.useState({seniorListByAgent: [], seniorListCountByAgent: 0}); |
61 |
- //보호사의 선택한 대상자 정보 |
|
61 |
+ //생활보호사의 선택한 대상자 정보 |
|
62 | 62 |
const [senior, setSenior] = React.useState({}); |
63 |
- //보호사의 대상자 목록 조회 |
|
63 |
+ //생활보호사의 대상자 목록 조회 |
|
64 | 64 |
const seniorSelectListByAgent = () => { |
65 | 65 |
fetch("/user/seniorSelectListByAgent.json", { |
66 | 66 |
method: "POST", |
... | ... | @@ -205,7 +205,7 @@ |
205 | 205 |
</div> |
206 | 206 |
</div> |
207 | 207 |
|
208 |
- <SubTitle explanation={"보호사의 보호대상자"} className="margin-bottom display-inline-block" /> |
|
208 |
+ <SubTitle explanation={"생활보호사의 보호대상자"} className="margin-bottom display-inline-block" /> |
|
209 | 209 |
<button className={"btn-small gray-btn display-inline-block float-right"} onClick={() => modalSeniorInsertOpen()}>보호대상자 추가</button> |
210 | 210 |
<div className="margin-bottom5"> |
211 | 211 |
<table className={"agent-user"}> |
--- client/views/pages/user_management/UserSelect.jsx
+++ client/views/pages/user_management/UserSelect.jsx
... | ... | @@ -439,7 +439,7 @@ |
439 | 439 |
{/* 탭 제목 */} |
440 | 440 |
<ul className="tab-menu flex-end" > |
441 | 441 |
{/* <li onClick={() => setTabActiveByRoleType('ROLE_SENIOR')} className={tabActiveByRoleType == 'ROLE_SENIOR' ? "active" : null}>대상자(어르신) ({senior.userListCount})</li> */} |
442 |
- <li onClick={() => setTabActiveByRoleType('ROLE_AGENCY')} className={tabActiveByRoleType == 'ROLE_AGENCY' ? "active" : null}>보호사 ({agent.userListCount})</li> |
|
442 |
+ <li onClick={() => setTabActiveByRoleType('ROLE_AGENCY')} className={tabActiveByRoleType == 'ROLE_AGENCY' ? "active" : null}>생활보호사 ({agent.userListCount})</li> |
|
443 | 443 |
{state.loginUser['authority'] == 'ROLE_ADMIN' || state.loginUser['authority'] == 'ROLE_AGENCYADMIN' || state.loginUser['authority'] == 'ROLE_GOVERNMENT' ? |
444 | 444 |
<li onClick={() => setTabActiveByRoleType('ROLE_AGENCYADMIN')} className={tabActiveByRoleType == 'ROLE_AGENCYADMIN' ? "active" : null}>센터 관리자 ({agentAdmin.userListCount})</li> |
445 | 445 |
: null} |
--- 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?