test pull request

.classpath

@@ -28,10 +28,6 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.gitignore

@@ -1,2 +1,5 @@
 pom.properties
+
 *.class
+
+MANIFEST

.settings/org.eclipse.core.resources.prefs

@@ -1,7 +1,2 @@
 eclipse.preferences.version=1
-encoding//src/main/webapp/WEB-INF/views/user/authError.jsp=UTF-8
-encoding//src/main/webapp/WEB-INF/views/user/authSuccess.jsp=UTF-8
-encoding//src/main/webapp/WEB-INF/views/user/base.jsp=UTF-8
-encoding//src/main/webapp/WEB-INF/views/user/joinSuccess.jsp=UTF-8
-encoding//src/main/webapp/WEB-INF/views/user/login.jsp=UTF-8
-encoding//src/main/webapp/WEB-INF/views/user/register.jsp=UTF-8
+encoding//src/main/webapp/WEB-INF/views/user/deleteForm.jsp=UTF-8

.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8

.settings/org.eclipse.wst.common.component

@@ -4,7 +4,6 @@
 		<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
 		<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
 		<property name="java-output-path" value="target/classes"/>
         <property name="context-root" value="controller"/>
 	</wb-module>

src/main/java/com/ustyle/controller/ItemController.java

@@ -0,0 +1,203 @@
+//package com.ustyle.controller;
+//
+//import java.util.Random;
+//import java.util.UUID;
+//
+//import javax.inject.Inject;
+//import javax.mail.internet.InternetAddress;
+//import javax.mail.internet.MimeMessage;
+//import javax.mail.internet.MimeMessage.RecipientType;
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpSession;
+//import javax.validation.Valid;
+//
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.mail.javamail.JavaMailSenderImpl;
+//import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+//import org.springframework.stereotype.Controller;
+//import org.springframework.validation.BindingResult;
+//import org.springframework.web.bind.annotation.ModelAttribute;
+//import org.springframework.web.bind.annotation.PathVariable;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestMethod;
+//import org.springframework.web.bind.annotation.ResponseBody;
+//import org.springframework.web.servlet.ModelAndView;
+//
+//import com.ustyle.domain.User;
+//import com.ustyle.service.UserService;
+//import com.ustyle.utils.UserEntryValidator;
+//
+//@Controller
+//public class ItemController {
+//
+//	private static final Logger logger = LoggerFactory.getLogger(ItemController.class);
+//
+//	@Inject
+//	private JavaMailSenderImpl javaMailSenderImpl;
+//
+//	@Inject
+//	private UserService service;
+//
+//	@Inject
+//	private UserEntryValidator userEntryValidator;
+//
+//	@Inject
+//	BCryptPasswordEncoder passwordEncoder;
+//
+//	/**
+//	 * Simply selects the home view to render by returning its name.
+//	 */
+//
+//	@RequestMapping(value = "login.do", method = RequestMethod.GET)
+//	public String loginForm() {
+//		return "user/login/LOGIN";
+//	}
+//
+//	@RequestMapping(value = "login.do", method = RequestMethod.POST)
+//	public String login(HttpServletRequest request, User user) throws Exception {
+//
+//		try {
+//			User resultUser = service.userLogin(user);
+//			logger.info("{}", resultUser);
+//
+//			String rawPassword = user.getPassword();
+//			String encodedPassword = resultUser.getPassword();
+//
+//			if (resultUser == null || !(passwordEncoder.matches(rawPassword, encodedPassword))) {
+//				return "user/loginError/No Match PW";
+//			}
+//
+//			HttpSession session = request.getSession();
+//
+//			session.setAttribute("USER", resultUser);
+//			// session.setAttribute("session_realname",
+//			// resultUser.getRealname());
+//			session.setAttribute("session_username", resultUser.getUsername());
+//			session.setAttribute("session_point", resultUser.getPoint());
+//			// session.setAttribute("TOKEN_SAVE_CHECK", "TRUE");
+//
+//			return "user/loginSuccess/LOGIN SUCCESS";
+//		} catch (NullPointerException e) {
+//			return "user/loginError/LOGIN ERROR";
+//		}
+//	}
+//
+//	@RequestMapping("/logout.do")
+//	public ModelAndView logout(HttpServletRequest request) {
+//
+//		ModelAndView mav = new ModelAndView();
+//		HttpSession session = request.getSession(false);
+//		if (session != null) {
+//			session.invalidate();
+//		}
+//		mav.addObject("user", new User());
+//		mav.setViewName("redirect:/login.do");
+//
+//		return mav;
+//	}
+//
+//	@RequestMapping(value = "register.do", method = RequestMethod.GET)
+//	public String registerForm() {
+//		return "user/register/Register";
+//	}
+//
+//	@RequestMapping(value = "register.do", method = RequestMethod.POST)
+//	public ModelAndView register(@ModelAttribute @Valid User user, BindingResult bindingResult, HttpSession session)
+//			throws Exception {
+//
+//		logger.info(user.toString());
+//		userEntryValidator.validate(user, bindingResult);
+//
+//		String encryptPassword = passwordEncoder.encode(user.getPassword());
+//		user.setPassword(encryptPassword);
+//
+//		ModelAndView mav = new ModelAndView("user/joinSuccess/JoinSuccess");
+//
+//		if (bindingResult.hasErrors()) {
+//			mav.getModel().putAll(bindingResult.getModel());
+//			mav.setViewName("user/register/Register");
+//			return mav;
+//		}
+//
+//		String joinCode = getUuid();
+//		user.setAuth(joinCode);
+//		sendMail(user.getUsername(), user.getEmail(), joinCode);
+//
+//		service.insert(user);
+//		session.setAttribute("USER", user);
+//		mav.addObject(user);
+//
+//		return mav;
+//	}
+//
+//	private void sendMail(String username, String email, String joinCode) throws Exception {
+//
+//		MimeMessage mimeMessage = javaMailSenderImpl.createMimeMessage();
+//
+//		mimeMessage.setFrom(new InternetAddress("[email protected]"));
+//		mimeMessage.addRecipient(RecipientType.TO, new InternetAddress(email));
+//
+//		String subject = "uStyle - 회원가입 인증요청메일 입니다.";
+//		mimeMessage.setSubject(subject);
+//
+//		StringBuilder sb = new StringBuilder();
+//		// String uri = "http://localhost:8080/uStyle/";
+//		String uri = "http://localhost:8080/";
+//		sb.append("<a href='" + uri + "'>");
+//		sb.append("<img src='https://mark.trademarkia.com/logo-images/symeli-inc/ustyle-85007854.jpg'></a>");
+//		sb.append("<h1>Welcome uStyle</h1>");
+//		sb.append("저희 uStyle에 가입해 주셔서 감사드립니다.<br>");
+//		sb.append("인증을 거친후 저희 사이트를 정상적으로 이용하실 수 있습니다.<br>");
+//		sb.append("<hr><br>");
+//		sb.append("<a href='" + uri + "auth/" + username + "/" + joinCode + "'>");
+//		sb.append("링크를 클릭하시면 인증됩니다.</a>");
+//		mimeMessage.setText(sb.toString(), "UTF-8", "html");
+//
+//		javaMailSenderImpl.send(mimeMessage);
+//	}
+//
+//	@RequestMapping(value = "/auth/{username}/{auth}")
+//	public ModelAndView authOk(@PathVariable String username, @PathVariable String auth) throws Exception {
+//
+//		ModelAndView mav = new ModelAndView();
+//		User user = new User();
+//		user.setAuth(auth);
+//		user.setUsername(username);
+//
+//		boolean isUserAuthOk = service.userAuthOk(user);
+//
+//		if (isUserAuthOk) {
+//			service.userAuthInitialize(username);
+//			mav.setViewName("redirect:/authSuccess.do");
+//		} else {
+//			mav.setViewName("redirect:/authError.do");
+//		}
+//
+//		return mav;
+//	}
+//
+//	@RequestMapping("/authSuccess.do")
+//	public String authSuccess() {
+//		return "user/authSuccess/인증 성공";
+//	}
+//
+//	@RequestMapping("/authError.do")
+//	public String authError() {
+//		return "user/authError/인증 실패";
+//	}
+//
+//	@RequestMapping(value = "duplicationCheck.do", method = RequestMethod.POST)
+//	@ResponseBody
+//	public int userExist(@RequestBody String username) throws Exception {
+//
+//		logger.info(username);
+//		int isUserExist = service.userExist(username);
+//		return isUserExist;
+//	}
+//	
+//	private String getUuid(){
+//		return UUID.randomUUID().toString().replaceAll("-", "");
+//	}
+//}