Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	target/classes/main/resources/mapper/MouldEquipmentMapper.xml
#	target/classes/main/resources/mapper/MouldMapper.xml

cloud-socket/src/com/js/kbt/controller/WeiXinUserInfoController.java

@@ -23,6 +23,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.js.kbt.mapper.MouldDownPacketMapper;
 import com.js.kbt.mapper.TbMouldEquipmentMapper;
 import com.js.kbt.mapper.TbUserMapper;
+import com.js.kbt.mapper.TimeCalibrationRecordMapper;
 import com.js.kbt.model.MouldDownPacket;
 import com.js.kbt.model.MouldDownPacketExample;
 import com.js.kbt.model.TbMouldEquipment;
@@ -52,15 +53,11 @@ public class WeiXinUserInfoController {
 	private MouldDownPacketMapper mouldDownPacketMapper;
 	@Resource
 	private TbMouldEquipmentMapper tbMouldEquipmentMapper;
-	@Resource
-	private UserHandler userHandler;
-
-//	@Autowired
-//	private WeiXinPlatformService weiXinPlatformService;
+	
 	Logger log = Logger.getLogger(WeiXinUserInfoController.class);	
-
-	@ResponseBody
+	
 	@RequestMapping("/checkAccountStatus")
+	@ResponseBody
 	public void checkAccountStatus(@RequestParam String openid, HttpServletResponse response) throws IOException{
 		HttpRespMsg msg = new HttpRespMsg();
 		TbUserExample example = new TbUserExample();

cloud-socket/src/com/js/kbt/mapper/TimeCalibrationRecordMapper.java

@@ -94,5 +94,5 @@ public interface TimeCalibrationRecordMapper {
      */
     int updateByPrimaryKey(TimeCalibrationRecord record);
 
-	Integer selectCountByToday();
+    int selectCountByToday();
 }

cloud-socket/src/com/js/kbt/socket/UserHandler.java

@@ -467,6 +467,8 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 	}
 
 	public static void main(String[] args) {
+		UserHandler h = new UserHandler();
+		h.timeCalibration();
 		// Date date = new Date();
 		// SimpleDateFormat sdf = new SimpleDateFormat("yy-MM-dd,HH:mm:ss");
 		// String dateStr = sdf.format(date);