Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md

.gitignore

@@ -9,4 +9,4 @@
 *.iml
 *.class
 .checkstyle
-/.ide
+/.idea

README.md

@@ -12,7 +12,9 @@
 
 ### [favorites website →](http://favorites.ren/)
 
+**[github地址](https://github.com/cloudfavorites/favorites-web)**
 
+**[码云地址](https://gitee.com/ityouknow/favorites-web)**
 
 > QQ交流群：565108729
 
@@ -25,7 +27,12 @@
 [云收藏部署方案](https://github.com/cloudfavorites/favorites-web/wiki/%E4%BA%91%E6%94%B6%E8%97%8F%E9%83%A8%E7%BD%B2%E6%96%B9%E6%A1%88)
 
 
-
+<<<<<<< HEAD
 **大家对这个项目有什么问题可以新建[issues](https://github.com/cloudfavorites/favorites-web/issues/new)提问，在提问之前请先查看已经关闭的[issues](https://github.com/cloudfavorites/favorites-web/issues?q=is%3Aissue+is%3Aclosed)**
+=======
+
+**大家对这个项目有什么问题可以新建[issues](https://github.com/cloudfavorites/favorites-web/issues/new)提问，在提问之前请先查看已经关闭的[issues](https://github.com/cloudfavorites/favorites-web/issues?q=is%3Aissue+is%3Aclosed)。特别是请提供一份项目sql这样的问题，我已经回答了1000多次了！**
+>>>>>>> origin/master
+
 
-**特别是请提供一份项目sql这样的问题，我已经回答了300多次了！**
+**目前网站运行在阿里云最低配置的环境下，所以访问比较缓慢，有可以提供免费服务器的小伙伴可以联系我！**

build.gradle

@@ -9,7 +9,7 @@ buildscript {
 }
 
 apply plugin: 'java'
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 apply plugin: 'war'
 apply plugin: 'idea'
 
@@ -40,6 +40,7 @@ dependencies {
     compile 'org.webjars.bower:bootstrap:3.3.6'
     compile("org.webjars:vue:1.0.24")
     compile 'org.webjars.bower:vue-resource:0.7.0'
+    compile group: 'org.webjars', name: 'webjars-locator', version: '0.14'
     compile group: 'org.jsoup', name: 'jsoup', version: '1.9.2'
     compile 'org.springframework.boot:spring-boot-starter-tomcat'
 }
@@ -50,4 +51,4 @@ bootRun {
 
 springBoot {
   mainClass = "com.favorites.Application"
-}
+}

src/main/java/com/favorites/web/UserController.java

@@ -72,7 +72,7 @@ public class UserController extends BaseController {
 	@LoggerManage(description="登陆")
 	public ResponseData login(User user,HttpServletResponse response) {
 		try {
-			User loginUser = userRepository.findByUserNameOrEmail(user.getUserName(), user.getUserName());
+			User loginUser = userRepository.findByUserNameOrEmail(user.getUserName(), user.getEmail());
 			if (loginUser == null ) {
 				return new ResponseData(ExceptionMsg.LoginNameNotExists);
 			}else if(!loginUser.getPassWord().equals(getPwd(user.getPassWord()))){
@@ -405,4 +405,4 @@ public ResponseData uploadBackground(String dataUrl){
 		}
 	}
 
-}
+}