websocket相关

src/main/java/com/ctrip/fun/golf/api/user/FaceWebSocket.java

@@ -21,25 +21,14 @@ import javax.websocket.server.ServerEndpoint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.context.ContextLoader;
 
+import org.springframework.web.context.ContextLoader;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.ctrip.fun.common.core.util.BeanConverter;
-import com.ctrip.fun.common.core.util.DateUtil;
-import com.ctrip.fun.common.vo.PagedResponseBean;
-import com.ctrip.fun.common.vo.basic.GenderEnum;
-import com.ctrip.fun.common.vo.basic.UserExtFaceQuery;
-import com.ctrip.fun.common.vo.basic.UserExtQuery;
-import com.ctrip.fun.common.vo.user.BaseBean;
 import com.ctrip.fun.common.vo.user.CourseDeviceBean;
 import com.ctrip.fun.common.vo.user.FaceListResult;
 import com.ctrip.fun.common.vo.user.FaceUserRegistBean;
 import com.ctrip.fun.common.vo.user.RegistResult;
-import com.ctrip.fun.common.vo.user.UserExtBean;
-import com.ctrip.fun.common.vo.user.UserExtBeanFace;
 import com.ctrip.fun.common.vo.user.UserFace;
 import com.ctrip.fun.common.vo.user.UserFaceBean;
 import com.ctrip.fun.common.vo.user.UserFaceResultBean;
@@ -109,10 +98,10 @@ public class FaceWebSocket {
 					face.setCreateTime(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
 					face.setDeviceId(username);
 					bean.saveUserFaceDetail(face);
-					result.setMessage("欢迎您 "+userExt.getUserName());
+					result.setMessage("欢迎爱玩会员 "+userExt.getUserName());
 					result.setSuccess(true);
 		        }else{
-		        	result.setMessage("您的会员已过期，过期时间："+new SimpleDateFormat("yyyy-MM-dd").format(userExt.getCommuneAgainTime())+"账户信息为"+userExt.getUid());
+		        	result.setMessage("您的会员已过期，过期时间："+new SimpleDateFormat("yyyy-MM-dd").format(userExt.getCommuneAgainTime())+"请续费");
 		        	result.setSuccess(false);
 		        }
 		        body.setVipGrade(userExt.getVipGrade());

src/main/java/com/ctrip/fun/golf/api/user/UserMController.java

@@ -227,6 +227,23 @@ public class UserMController {
 	    return null;	 
     }
     
+    /**
+     * 新增客户人脸底图
+     * @param token
+     * @param request
+     * @return
+     */
+    @SuppressWarnings("deprecation")
+	@RequestMapping(value = "/v1/users/uploadImage/{token}", method = RequestMethod.POST)
+    @Security
+    @ResponseBody
+    public Object userIsImage(@PathVariable String token) {
+        Response<Object> response = new Response<Object>();
+        String uid = UserContext.getUserId();
+
+	    return null;	 
+    }
+    
     @RequestMapping(value = "/v1/salesperson/payImage/{saleRecordId}", method = RequestMethod.POST)
     @ResponseBody
     public Object payImagePhoto(@PathVariable String saleRecordId, MultipartHttpServletRequest request) {