Merge remote-tracking branch 'origin/master'

src/main/java/com/lovenav/service/UserService.java

@@ -13,4 +13,6 @@ public interface UserService {
 
     public User userLogin(User user);
 
+    public int updatePassword(User user);
+
 }

src/main/java/com/lovenav/service/serviceImpl/UserServiceImpl.java

@@ -5,9 +5,14 @@ import com.lovenav.dao.UserDao;
 import com.lovenav.utils.EmailUtils;
 import com.lovenav.entity.User;
 import com.lovenav.service.UserService;
+import com.lovenav.utils.MD5Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.regex.Pattern;
+
 
 @Service
 public class UserServiceImpl implements UserService {
@@ -20,6 +25,15 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public int UserRegister(User user) {
+
+        user.setRoleId(Byte.valueOf("1"));
+        user.setUserStatus(Byte.valueOf("1"));
+        user.setUserPassword(MD5Utils.md5(user.getUserPassword()));
+        Date date=new Date();
+        user.setUserRegistered(date);
+
+
+
         return  userDao.insert(user);
     }
 
@@ -33,7 +47,39 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public User userLogin(User user) {
-        return null;
+        boolean result;
+        User user1;
+        result= Pattern.matches("^(\\w+([-.][A-Za-z0-9]+)*){3,18}@\\w+([-.][A-Za-z0-9]+)*\\.\\w+([-.][A-Za-z0-9]+)*$", user.getUserLogin());
+        user.setUserPassword(MD5Utils.md5(user.getUserPassword()));
+        if (result == true) {
+            user1= userDao.selectByEmail(user.getUserLogin());
+            if (user1==null){
+                return null;
+            }
+            else if (user1.getUserPassword().equals(user.getUserPassword())){
+                return user1;
+            }else {
+                return null;
+            }
+        }else {
+            user1=userDao.selectByUserLogin(user.getUserLogin());
+
+            if (user1==null ){
+                return null;
+            }
+            else if (user1.getUserPassword().equals(user.getUserPassword())){
+                return user1;
+            }else {
+                return null;
+            }
+
+        }
+    }
+
+    @Override
+    public int updatePassword(User user) {
+        user.setUserPassword(MD5Utils.md5(user.getUserPassword()));
+        return userDao.updateByEmail(user);
     }