%!s(int64=9) %!d(string=hai) anos · d1145632b8
--- a/gkmb/trunk/build/classes/MyBatis-Configuration.xml
+++ b/gkmb/trunk/build/classes/MyBatis-Configuration.xml
@@ -1,13 +0,0 @@
 
				-<?xml version="1.0" encoding="UTF-8" ?>

			
 
				-<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN"

			
 
				-"http://mybatis.org/dtd/mybatis-3-config.dtd">

			
 
				-

			
 
				-<configuration>

			
 
				-	<settings>

			
 
				-		<setting name="jdbcTypeForNull" value="NULL" />

			
 
				-	</settings>

			
 
				-

			
 
				-	<typeHandlers>

			
 
				-		<package name="com.loygra.mooring.typeHandler" />

			
 
				-	</typeHandlers>

			
 
				-</configuration>
			
--- a/gkmb/trunk/build/classes/com/baidu/ueditor/um/Uploader.class
+++ b/gkmb/trunk/build/classes/com/baidu/ueditor/um/Uploader.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/AgentConnectInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/AgentConnectInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/AgentShipInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/AgentShipInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/AgentSubUser.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/AgentSubUser.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/AlarmInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/AlarmInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/AnchorPointInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/AnchorPointInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/AnchorPositionApplyInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/AnchorPositionApplyInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/AnchorPositionInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/AnchorPositionInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/AnchorageInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/AnchorageInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/ApplyAdjustInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/ApplyAdjustInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/ApplyReleaseInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/ApplyReleaseInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/AuditDepInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/AuditDepInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/ChargeConfigInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/ChargeConfigInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/ConfigInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/ConfigInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/DynamicShip.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/DynamicShip.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/FileInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/FileInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/HarbourInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/HarbourInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/IntegrityInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/IntegrityInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/ManageUser.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/ManageUser.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/NoticeInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/NoticeInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/PilotageInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/PilotageInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/ShipInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/ShipInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/User.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/User.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/UserApplyUnit.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/UserApplyUnit.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/UserMagerUnit.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/UserMagerUnit.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bean/WeatherInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bean/WeatherInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/AISData.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/AISData.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/AISData4SingleShip.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/AISData4SingleShip.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/AdjustAnchorPositionStatistic.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/AdjustAnchorPositionStatistic.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/AgentSubUserParam.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/AgentSubUserParam.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/AgentUserParam.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/AgentUserParam.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/AlarmInfoBO.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/AlarmInfoBO.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/AlarmParam.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/AlarmParam.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/AlarmStatisticInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/AlarmStatisticInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/AnchorPositionApplyAuditParam.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/AnchorPositionApplyAuditParam.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/AnchorPositionApplyInfoBO.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/AnchorPositionApplyInfoBO.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/AnchorPositionApplyParam.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/AnchorPositionApplyParam.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/AnchorPositionInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/AnchorPositionInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/AnchorPositionInfoBO.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/AnchorPositionInfoBO.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/AnchorageInfoBO.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/AnchorageInfoBO.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/ApplyShipRealTime.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/ApplyShipRealTime.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/ApplyUnitAuditList.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/ApplyUnitAuditList.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/FileInfoBO.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/FileInfoBO.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/HarbourALLInfo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/HarbourALLInfo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/HarbourInfoBO.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/HarbourInfoBO.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/IntegrityBO.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/IntegrityBO.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/LonLatDistrict.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/LonLatDistrict.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/ManageUserInfoBO.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/ManageUserInfoBO.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/ManageUserInfoParam.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/ManageUserInfoParam.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/NoticeInfoBO.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/NoticeInfoBO.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/NoticeInfoParam.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/NoticeInfoParam.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/ShipPosition.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/ShipPosition.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/ShipSearch.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/ShipSearch.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/ShipVo.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/ShipVo.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/TestAISData.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/TestAISData.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/bo/UserApplyUnitBO.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/bo/UserApplyUnitBO.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/cache/CacheName.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/cache/CacheName.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/cache/EhcacheUtil.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/cache/EhcacheUtil.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/cache/MooringCache.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/cache/MooringCache.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/cache/PrivilegeCache.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/cache/PrivilegeCache.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/cache/UserCache.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/cache/UserCache.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/cfg/ConfigPro$Previlege$AnchorPosition.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/cfg/ConfigPro$Previlege$AnchorPosition.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/cfg/ConfigPro$Previlege.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/cfg/ConfigPro$Previlege.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/cfg/ConfigPro.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/cfg/ConfigPro.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/cfg/ConfigProUtil.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/cfg/ConfigProUtil.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/CommonUtil.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/CommonUtil.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$Alarm.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$Alarm.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$Credit.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$Credit.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$Entity.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$Entity.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$ImgAddr.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$ImgAddr.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$MailType.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$MailType.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$Operate.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$Operate.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$PILOTAGE_TYPE.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$PILOTAGE_TYPE.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$Parameter.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$Parameter.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$UserStatus.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants$UserStatus.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/Constants.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/KEY.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/KEY.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$ACHORAGE.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$ACHORAGE.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$ACHOR_POSITION.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$ACHOR_POSITION.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$AGENT.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$AGENT.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$AIS.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$AIS.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$ALARM.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$ALARM.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$CHARGE.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$CHARGE.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$COMMON.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$COMMON.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$HARBOUR.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$HARBOUR.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$INTEGRITY.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$INTEGRITY.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$MAIL.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$MAIL.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$NOTICE.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$NOTICE.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$SHIP.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$SHIP.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$USER.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$USER.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$VIEW.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$VIEW.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$WEATHER.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL$WEATHER.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/RequestURL.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/ResponseSC$CONSTANTSSC.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/ResponseSC$CONSTANTSSC.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/ResponseSC$CommonSC.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/ResponseSC$CommonSC.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/ResponseSC$MooringSC.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/ResponseSC$MooringSC.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/ResponseSC$SystemSC.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/ResponseSC$SystemSC.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/ResponseSC$UserSC.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/ResponseSC$UserSC.class
--- a/gkmb/trunk/build/classes/com/loygra/mooring/common/ResponseSC.class
+++ b/gkmb/trunk/build/classes/com/loygra/mooring/common/ResponseSC.class