Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/ifish/action/UpdateUserAction.java

src/main/java/com/ifish/action/UpdateUserAction.java

@@ -86,8 +86,8 @@ public class UpdateUserAction {
 
 	@RequestMapping(value = "/bindDevice.do")
 	@ResponseBody
-	public Object bindDevice(@RequestParam String deviceId,@RequestParam Integer userId,@RequestParam String phoneType){
-		AliyunDeviceInfo aliyunDeviceInfo = baseService.getAliyunDeviceInfoByUserId(userId);
+    public Object bindDevice(@RequestParam String deviceId,@RequestParam Integer userId,@RequestParam String phoneType, @RequestParam(required = false) Integer type){
+        AliyunDeviceInfo aliyunDeviceInfo = baseService.getAliyunDeviceInfoByUserId(userId);
 		if (aliyunDeviceInfo == null) {
 			aliyunDeviceInfo = new AliyunDeviceInfo();
 			aliyunDeviceInfo.setAliyunDeviceId(deviceId);
@@ -95,6 +95,11 @@ public class UpdateUserAction {
 			aliyunDeviceInfo.setPhoneType(phoneType);
 			aliyunDeviceInfo.setBindTime(new Date());
 			aliyunDeviceInfo.setLastUpdateTime(new Date());
+			if (type != null) {
+				aliyunDeviceInfo.setType(type);
+			} else {
+				aliyunDeviceInfo.setType(0);
+			}
 		} else {
 			aliyunDeviceInfo.setUserId(userId);
 			aliyunDeviceInfo.setLastUpdateTime(new Date());

src/main/java/com/ifish/entity/AliyunDeviceInfo.java

@@ -24,6 +24,9 @@ public class AliyunDeviceInfo implements Serializable{
     @Column(name = "phone_type")
     private String phoneType;
 
+    @Column(name = "type")
+    private Integer type;
+
     @Column(name="bind_time",columnDefinition="timestamp")
     private Date bindTime;
 
@@ -69,4 +72,12 @@ public class AliyunDeviceInfo implements Serializable{
     public void setLastUpdateTime(Date lastUpdateTime) {
         this.lastUpdateTime = lastUpdateTime;
     }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
 }

src/main/java/com/ifish/enums/ResultEnum.java

@@ -35,7 +35,10 @@ public enum ResultEnum {
     error400("400", "安全校验失败"),
     error401("401", "参数校验失败"),
     error402("402", "参数不存在"),
-    error403("403", "微信授权失败");
+    error403("403", "微信授权失败"),
+    error404("404", "当前用户已注销，如需重新注册请联系客服"),
+
+    ;
 
     private ResultEnum(String key, String value) {
         this.key = key;

src/main/java/com/ifish/helper/UserHelper.java

@@ -109,7 +109,7 @@ public class UserHelper implements UserHelperI {
     @Override
     public Object login(User user) {
         try {
-            User tmpUser = tmpUser = tbl_User_Mapper.getUserByPhoneNumber(user.getPhoneNumber());
+            User tmpUser = tbl_User_Mapper.getUserByPhoneNumber(user.getPhoneNumber());
             //2.如果都为空，则没有此用户，返回未注册信息
             if (tmpUser == null) {
                 //用户不存在

src/main/java/com/ifish/hibernate/HibernateBaseDao.java

@@ -74,6 +74,7 @@ public abstract class HibernateBaseDao<T, ID extends Serializable> {
 	 */
 	public void delete(T t) {
 		getSession().delete(t);
+		getSession().flush();
 	}
 	
 	/**

src/main/java/com/ifish/serviceImpl/InformationServiceImpl.java

@@ -157,9 +157,10 @@ public class InformationServiceImpl implements InformationService{
 					//链接
 					StringBuilder link = new StringBuilder(IfishFilePath.getPath(SubDirectoryEnum.ueditorHtml,info.getLink()));
 					//是否可以评论，可以评论则拼接用户ID
-					if(UeditorTypeEnum.yespinglun.getKey().equals(info.getUeditorType())){
-						link.append("&userId="+pageParam.getUserId());
-					}
+//					if(UeditorTypeEnum.yespinglun.getKey().equals(info.getUeditorType())){
+//						link.append("&userId="+pageParam.getUserId());
+//					}
+				info.setUeditorType(UeditorTypeEnum.nopinglun.getKey());
 					//标题链接
 					dto.setLink(link.toString());
 					//评论数

src/main/java/com/ifish/serviceImpl/UserServiceImpl.java

@@ -743,6 +743,11 @@ public class UserServiceImpl implements UserService {
 		String phoneNumber = registerParam.getPhoneNumber();
 		User user = userDao.findUniqueByProperty(Restrictions.eq("phoneNumber", phoneNumber));
 		if(user!=null){
+			if (user.getStatus() == 1) {
+				System.out.println("delete users : " + JSONObject.toJSONString(user));
+				userDao.delete(user);
+				return register(registerParam);
+			}
 			return new JsonResult<String>(ResultEnum.warn201.getKey());
 		}
 		else{