update

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

@@ -87,7 +87,7 @@ public class UpdateUserAction {
 	@RequestMapping(value = "/bindDevice.do")
 	@ResponseBody
 	public Object bindDevice(@RequestParam String deviceId,@RequestParam Integer userId,@RequestParam String phoneType){
-		AliyunDeviceInfo aliyunDeviceInfo = baseService.getAliyunDeviceInfo(deviceId);
+		AliyunDeviceInfo aliyunDeviceInfo = baseService.getAliyunDeviceInfoByUserId(userId);
 		if (aliyunDeviceInfo == null) {
 			aliyunDeviceInfo = new AliyunDeviceInfo();
 			aliyunDeviceInfo.setAliyunDeviceId(deviceId);

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

@@ -62,7 +62,7 @@ public class UsersAction {
 	 * @return
 	 */
 	@RequestMapping(value={"/v3/deregister.do","deregister.do"},method=RequestMethod.POST)
-	public JsonResult<?> deregister(Integer userId) {
+	public JsonResult<?> deregister(String userId) {
 		return userService.deregister(userId);
 	}
 	

src/main/java/com/ifish/service/AliyunDeviceInfoService.java

@@ -9,6 +9,7 @@ import com.ifish.entity.AliyunDeviceInfo;
  */
 public interface AliyunDeviceInfoService {
     AliyunDeviceInfo getAliyunDeviceInfo(String deviceId);
+    AliyunDeviceInfo getAliyunDeviceInfoByUserId(Integer userId);
 
     void saveOrUpdateAliyunDeviceInfo(AliyunDeviceInfo aliyunDeviceInfo);
 }

src/main/java/com/ifish/service/BaseService.java

@@ -163,6 +163,13 @@ public interface BaseService {
 	 */
 	AliyunDeviceInfo getAliyunDeviceInfo(String deviceId);
 
+	/**
+	 * 根据用户ID查询设备信息
+	 * @param userId
+	 * @return
+	 */
+	AliyunDeviceInfo getAliyunDeviceInfoByUserId(Integer userId);
+
 	/**
 	 * 保存或修改阿里云推送设备信息
 	 * @param aliyunDeviceInfo

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

@@ -87,7 +87,7 @@ public interface UserService {
 	 */
 	public JsonResult<?> register(RegisterParam registerParam);
 
-	JsonResult<?> deregister(Integer userId);
+	JsonResult<?> deregister(String userId);
 
 	/**
 	 * 修改用户信息

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

@@ -3,10 +3,14 @@ package com.ifish.serviceImpl;
 import com.ifish.dao.AliyunDeviceInfoDao;
 import com.ifish.entity.AliyunDeviceInfo;
 import com.ifish.service.AliyunDeviceInfoService;
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.Restrictions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * @author: yan.y
  * @Description:
@@ -25,6 +29,13 @@ public class AliyunDeviceInfoServiceImpl implements AliyunDeviceInfoService {
         return aliyunDeviceInfo;
     }
 
+    @Override
+    public AliyunDeviceInfo getAliyunDeviceInfoByUserId(Integer userId) {
+        Criterion criterion = Restrictions.eq("userId", userId);
+        List<AliyunDeviceInfo> deviceInfos = aliyunDeviceInfoDao.findByProperty(criterion);
+        return deviceInfos.stream().findFirst().get();
+    }
+
     @Override
     public void saveOrUpdateAliyunDeviceInfo(AliyunDeviceInfo aliyunDeviceInfo) {
         this.aliyunDeviceInfoDao.saveOrUpdate(aliyunDeviceInfo);

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

@@ -2050,6 +2050,11 @@ public class BaseServiceImpl implements BaseService {
         return this.aliyunDeviceInfoService.getAliyunDeviceInfo(device);
     }
 
+    @Override
+    public AliyunDeviceInfo getAliyunDeviceInfoByUserId(Integer userId) {
+        return this.aliyunDeviceInfoService.getAliyunDeviceInfoByUserId(userId);
+    }
+
     @Override
     public Object saveOrUpdateAliyunDeviceInfo(AliyunDeviceInfo aliyunDeviceInfo) {
         this.aliyunDeviceInfoService.saveOrUpdateAliyunDeviceInfo(aliyunDeviceInfo);

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

@@ -778,9 +778,9 @@ public class UserServiceImpl implements UserService {
 	}
 
 	@Override
-	public JsonResult<?> deregister(Integer userId) {
+	public JsonResult<?> deregister(String userId) {
 		//用户信息
-		User user = userDao.get(userId);
+		User user = userDao.get(Integer.parseInt(userId));
 		if(user==null){
 			throw new IfishException(ResultEnum.error402);
 		}

src/main/resources/jdbc.properties

@@ -1,4 +1,5 @@
 jdbc.driver=com.mysql.jdbc.Driver
+#jdbc.url=jdbc\:mysql\://120.55.190.56\:3306/myfishdb?characterEncoding\=UTF-8
 jdbc.url=jdbc\:mysql\://localhost\:3306/myfishdb?characterEncoding\=UTF-8
 #jdbc.url=jdbc\:mysql\://139.196.24.156\:3306/myfishdb?characterEncoding\=UTF-8
 jdbc.username=ifish