Skip to content

Hyokyung #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
strglass91 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Hyokyung #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c617b38
gg
Aug 31, 2020
087ea61
11:16pm re commit & push
Aug 31, 2020
c1011c8
ffff
Sep 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions 0Mangro_TeamProject-0.01/WebContent/O_member/member_revise.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,22 @@
</head>

<%
//<------------------ 로그인 세션 값 여부 ---------------------->
String id=(String)session.getAttribute("id");

//세션값이 없으면 로그인 페이지로 이동 ./MemberLogin.me
if(id == null){
response.sendRedirect("./MemberLogin.me");
}
// <------------------ 로그인 세션 값 여부 ---------------------->
String id=(String)session.getAttribute("id");

//세션값이 없으면 로그인 페이지로 이동 ./MemberLogin.me
if(id == null){
response.sendRedirect("./MemberLogin.me");
}
// <------------------ 로그인 세션 값 여부 ---------------------->
%>



<body>
<script type="text/javascript">
<!----------------- 회원 정보 수정 필수 입력 -------------------->

// <----------------- 회원 정보 수정 필수 입력 -------------------->
$(function update_chk(){

$("#update_chk").submit(function(){
Expand Down Expand Up @@ -77,14 +79,15 @@

}); // submit() 끝
}); // update_chk() 끝
// <----------------- 회원 정보 수정 필수 입력 -------------------->
</script>

<%
//<------------------ 회원정보 가져오기 ----------------------->
// <------------------ 회원정보 가져오기 ----------------------->
String email = (String)session.getAttribute("id_email");
MemberDAO mdao = new MemberDAO();
String name = mdao.selectMember(email);
// <------------------ 회원정보 가져오기 ----------------------->
%>


Expand Down
10 changes: 6 additions & 4 deletions 0Mangro_TeamProject-0.01/WebContent/O_member/member_sign_in.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@




<!-- dddd -->
<style type="text/css">
input {height: 50px;}
.btn-primary {color:#fff !important;background-color: #000 !important;border-color: #000 !important;cursor: pointer !important;}
Expand All @@ -30,7 +30,7 @@
</head>
<script type="text/javascript">

/* 로그인 아이디, 비밀번호 필수 입력 확인 */
/* ----------------------------------- 로그인 아이디, 비밀번호 필수 입력 확인 ------------------------------- */
$(function loginCheck() {

$("#login").submit(function(){
Expand All @@ -49,9 +49,11 @@
}

}); // submit() 끝
/* ----------------------------------- 로그인 아이디, 비밀번호 필수 입력 확인 ------------------------------- */



/* 이메일 기억하기 : 입력한 이메일을 재작성하지 않고 비밀번호만 재입력하여 로그인 할 수 있게 기능 구현 */
/* ------------ 이메일 기억하기 : 입력한 이메일을 재작성하지 않고 비밀번호만 재입력하여 로그인 할 수 있게 기능 구현 ------------ */
$("#login").ready(function(){

$("#id_email").val(Cookies.get('key'));
Expand All @@ -72,7 +74,7 @@
}); // ready() 끝

}); // loginCheck() 끝

/* --------------------------------------- 이메일 기억하기 --------------------------------------- */
</script>
<body>

Expand Down
8 changes: 2 additions & 6 deletions 0Mangro_TeamProject-0.01/WebContent/O_member/member_sign_up.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<body>
<script type="text/javascript">

<!------- [회원가입 필수 입력란 확인] --------->
// <--------------------------- 회원가입 필수 입력란 확인 ------------------------->
$(function check() {

$("#join").submit(function() {
Expand Down Expand Up @@ -81,12 +81,8 @@
}); // submit() 끝

}); // check() 끝


// ------- [ 네이버 아이디로 로그인 초기화 Script ] ---------
// <--------------------------- 회원가입 필수 입력란 확인 ------------------------->


// --------- [ 네이버 아이디로 로그인 초기화 Script ] ---------

</script>

Expand Down
1 change: 1 addition & 0 deletions 0Mangro_TeamProject-0.01/WebContent/O_mypage/mypage_main.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
</div>
</nav>
</header>

<!------------------------------------------ [ 사이드바 ] --------------------------------------------------------------->
<!-- ============================================================== -->
<!-- Left Sidebar - style you can find in sidebar.scss -->
Expand Down
Binary file modified 0Mangro_TeamProject-0.01/bin/mango/academy/action/AcademyListAction.class
View file
Open in desktop
Binary file not shown.
Binary file modified 0Mangro_TeamProject-0.01/bin/mango/academy/db/AcademyDAO.class
View file
Open in desktop
Binary file not shown.
Binary file modified 0Mangro_TeamProject-0.01/bin/mango/anony_board/action/AnonyBoardFrontController.class
View file
Open in desktop
Binary file not shown.
Binary file modified 0Mangro_TeamProject-0.01/bin/mango/member/db/MemberDAO.class
View file
Open in desktop
Binary file not shown.
2 changes: 0 additions & 2 deletions 0Mangro_TeamProject-0.01/src/mango/member/action/MemberDeleteAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ public ActionForward excute(HttpServletRequest request, HttpServletResponse resp
int check = mdao.deleteMember(mb);

if(check == 1){

HttpSession session = request.getSession();
session.invalidate();
response.setContentType("text/html; charset=UTF-8");
Expand All @@ -40,7 +39,6 @@ public ActionForward excute(HttpServletRequest request, HttpServletResponse resp
return null;

}else if(check == 0){

response.setContentType("text/html; charset=UTF-8");

PrintWriter out = response.getWriter();
Expand Down
4 changes: 0 additions & 4 deletions 0Mangro_TeamProject-0.01/src/mango/member/action/MemberLoginAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public ActionForward excute(HttpServletRequest request, HttpServletResponse resp
System.out.println(check);

if(check == 0){ // 비밀번호 불일치

response.setContentType("text/html; charset=utf-8");

PrintWriter out = response.getWriter();
Expand All @@ -41,7 +40,6 @@ public ActionForward excute(HttpServletRequest request, HttpServletResponse resp
return null;

}else if(check == -1){ // 아이디 불일치

response.setContentType("text/html; charset=utf-8");

PrintWriter out = response.getWriter();
Expand All @@ -53,7 +51,6 @@ public ActionForward excute(HttpServletRequest request, HttpServletResponse resp
return null;

}else if(check == -2){ // 탈퇴한 아이디일 경우

response.setContentType("text/html; charset=UTF-8");

PrintWriter out = response.getWriter();
Expand All @@ -66,7 +63,6 @@ public ActionForward excute(HttpServletRequest request, HttpServletResponse resp
}

HttpSession session = request.getSession();

session.setAttribute("id_email", id_email);

ActionForward forward = new ActionForward();
Expand Down
2 changes: 1 addition & 1 deletion 0Mangro_TeamProject-0.01/src/mango/member/action/MemberUpdateAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public ActionForward excute(HttpServletRequest request, HttpServletResponse resp
// String filename = multi.getFilesystemName("fileName"); // 서버에 실제로 업로드된 파일명
// String originFilename = multi.getOriginalFileName("fileName"); // 업로드한 파일의 원본명

System.out.println(memEmail + " / " + memPwd + " / " + newPw + " / " /* + filename + " / " + originFilename */ );
// System.out.println(memEmail + " / " + memPwd + " / " + newPw + " / " /* + filename + " / " + originFilename */ );

/* --------------------------------------------------------------------------------------------------------- */

Expand Down
11 changes: 0 additions & 11 deletions 0Mangro_TeamProject-0.01/src/mango/member/db/MemberDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ public int loginCheck(MemberBean mb){
check = -1; // SELECT 결과에 아이디 없을 때 (-1)
}

System.out.println(check);

System.out.println("DB 조회 성공 !!");

} catch (Exception e) {
Expand All @@ -111,12 +109,8 @@ public int deleteMember(MemberBean mb){
getConnection();

sql = "SELECT * FROM member WHERE mem_email = ?";

pstmt = con.prepareStatement(sql);

pstmt.setString(1, mb.getMemEmail());
// pstmt.setString(2, mb.getMemPwd());

rs = pstmt.executeQuery();

if(rs.next()){
Expand All @@ -129,9 +123,7 @@ public int deleteMember(MemberBean mb){
+ "WHERE mem_email = ?";

pstmt = con.prepareStatement(sql);

pstmt.setString(1, mb.getMemEmail());

pstmt.executeUpdate();

}else{
Expand Down Expand Up @@ -172,16 +164,13 @@ public String selectMember(String email) {

pstmt = con.prepareStatement(sql);
pstmt.setString(1, email);

rs = pstmt.executeQuery();

if(rs.next()){
name = rs.getString("mem_name");
System.out.println(name);
}

System.out.println(name);

System.out.println("회원 이름 조회 완료 !!");

} catch (Exception e) {
Expand Down