change project path
ut modify
修复请求参数、响应结果中文乱码问题
the same as last
ut modify
undone
undon change
d
f
Merge branch 'feature' into dev

Conflicts:
	cop-argus-mobi/src/main/java/com/cop/mobi/account/service/AccountService.java
	cop-argus-mobi/src/main/java/com/cop/mobi/rest/action/AccountAction.java
	cop-argus-mobi/src/main/java/com/cop/mobi/rest/core/CharacterEncodingFilter.java
	cop-argus-mobi/src/main/resources/config/spring/appcontext-mobi-db.xml
	cop-argus-mobi/src/main/webapp/WEB-INF/web.xml
	cop-argus-mobi/src/test/java/com/cop/mobile/test/BaseTest.java
	cop-argus-mobi/src/test/java/com/cop/mobile/test/account/AccountDaoTest.java
	cop-argus-mobi/src/test/java/com/cop/mobile/test/car/MyCarServiceTest.java
删除旧的log4j配置
删除历史代码
Merge branch 'dev'

Conflicts:
	cop-argus-mobi/src/main/java/com/cop/mobi/account/service/AccountService.java
	cop-argus-mobi/src/main/java/com/cop/mobi/account/service/impl/AccountServiceImpl.java
	cop-argus-mobi/src/main/java/com/cop/mobi/car/entity/DriveRoute.java
	cop-argus-mobi/src/main/java/com/cop/mobi/car/entity/DriveStatus.java
	cop-argus-mobi/src/main/java/com/cop/mobi/common/AbstractService.java
	cop-argus-mobi/src/main/java/com/cop/mobi/common/DataFormatter.java
	cop-argus-mobi/src/main/java/com/cop/mobi/common/GZipUtil.java
	cop-argus-mobi/src/main/java/com/cop/mobi/common/Result.java
	cop-argus-mobi/src/main/java/com/cop/mobi/common/crypt/AESEncrypter.java
	cop-argus-mobi/src/main/java/com/cop/mobi/rest/action/AccountAction.java
	cop-argus-mobi/src/main/java/com/cop/mobi/rest/action/MyCarAction.java
	cop-argus-mobi/src/main/java/com/cop/mobi/rest/core/AbstractAction.java
	cop-argus-mobi/src/main/java/com/cop/mobi/rest/core/CharacterEncodingFilter.java
	cop-argus-mobi/src/main/java/com/cop/mobi/rest/core/SpringApplicationContext.java
	cop-argus-mobi/src/main/resources/config/spring/appcontext-mobi-bean.xml
	cop-argus-mobi/src/main/resources/config/spring/appcontext-mobi-dao.xml
	cop-argus-mobi/src/main/resources/config/spring/appcontext-mobi-db.xml
	cop-argus-mobi/src/main/webapp/WEB-INF/web.xml
	cop-argus-mobi/src/test/java/com/cop/mobile/test/BaseTest.java
	cop-argus-mobi/src/test/java/com/cop/mobile/test/account/AccountDaoTest.java
	cop-argus-mobi/src/test/java/com/cop/mobile/test/account/AccountServiceTest.java
	cop-argus-mobi/src/test/java/com/cop/mobile/test/car/MyCarServiceTest.java