소스충돌 동기화
This commit is contained in:
parent
2e7a4f2b8f
commit
b549d08233
@ -65,7 +65,6 @@ import nlib.cmm.service.NlibProperty;
|
|||||||
import nlib.cmm.session.SessionConfig;
|
import nlib.cmm.session.SessionConfig;
|
||||||
import nlib.cmm.snslogin.GoogleOAuthResponse;
|
import nlib.cmm.snslogin.GoogleOAuthResponse;
|
||||||
import nlib.cmm.snslogin.KakaoController;
|
import nlib.cmm.snslogin.KakaoController;
|
||||||
import nlib.cmm.snslogin.NaverLoginBO;
|
|
||||||
import nlib.info.service.InformService;
|
import nlib.info.service.InformService;
|
||||||
import nlib.mail.EmailSender;
|
import nlib.mail.EmailSender;
|
||||||
import nlib.mail.service.EmailVO;
|
import nlib.mail.service.EmailVO;
|
||||||
@ -129,15 +128,6 @@ public class MemberController {
|
|||||||
@Resource(name = "egovEnvPasswordEncoderService")
|
@Resource(name = "egovEnvPasswordEncoderService")
|
||||||
EgovPasswordEncoder egovPasswordEncoder;
|
EgovPasswordEncoder egovPasswordEncoder;
|
||||||
|
|
||||||
/* NaverLoginBO */
|
|
||||||
private NaverLoginBO naverLoginBO;
|
|
||||||
private String apiResult = null;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private void setNaverLoginBO(NaverLoginBO naverLoginBO) {
|
|
||||||
this.naverLoginBO = naverLoginBO;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private EmailSender emailSender;
|
private EmailSender emailSender;
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user