rename package name

whatsmars-earth/whatsmars-earth-dao/src/main/java/com/whatsmars/earth/dao/AccountDao.java → whatsmars-earth/whatsmars-earth-dao/src/main/java/org/hongxi/whatsmars/earth/dao/AccountDao.java

-package com.whatsmars.earth.dao;
+package org.hongxi.whatsmars.earth.dao;
 
 /**
  * Created by shenhongxi on 2016/4/1.

whatsmars-earth/whatsmars-earth-dao/src/main/java/com/whatsmars/earth/dao/OrganizationDao.java → whatsmars-earth/whatsmars-earth-dao/src/main/java/org/hongxi/whatsmars/earth/dao/OrganizationDao.java

-package com.whatsmars.earth.dao;
+package org.hongxi.whatsmars.earth.dao;
 
-import com.whatsmars.earth.domain.pojo.Organization;
-import com.whatsmars.earth.domain.query.OrganizationQuery;
-import com.whatsmars.earth.domain.query.QueryResult;
+import org.hongxi.whatsmars.earth.domain.pojo.Organization;
+import org.hongxi.whatsmars.earth.domain.query.OrganizationQuery;
+import org.hongxi.whatsmars.earth.domain.query.QueryResult;
 
 /**
  * Created by shenhongxi on 2016/4/6.

whatsmars-earth/whatsmars-earth-dao/src/main/java/com/whatsmars/earth/dao/UserDao.java → whatsmars-earth/whatsmars-earth-dao/src/main/java/org/hongxi/whatsmars/earth/dao/UserDao.java

-package com.whatsmars.earth.dao;
+package org.hongxi.whatsmars.earth.dao;
 
-import com.whatsmars.earth.domain.pojo.User;
+import org.hongxi.whatsmars.earth.domain.pojo.User;
 
 /**
  * Created by javahongxi on 2017/12/24.

whatsmars-earth/whatsmars-earth-dao/src/main/java/com/whatsmars/earth/dao/impl/AccountDaoImpl.java → whatsmars-earth/whatsmars-earth-dao/src/main/java/org/hongxi/whatsmars/earth/dao/impl/AccountDaoImpl.java

-package com.whatsmars.earth.dao.impl;
+package org.hongxi.whatsmars.earth.dao.impl;
 
-import com.whatsmars.earth.dao.AccountDao;
+import org.hongxi.whatsmars.earth.dao.AccountDao;
 
 /**
  * Created by shenhongxi on 2016/4/1.

whatsmars-earth/whatsmars-earth-dao/src/main/java/com/whatsmars/earth/dao/impl/BaseDao.java → whatsmars-earth/whatsmars-earth-dao/src/main/java/org/hongxi/whatsmars/earth/dao/impl/BaseDao.java

-package com.whatsmars.earth.dao.impl;
+package org.hongxi.whatsmars.earth.dao.impl;
 
 import org.apache.ibatis.session.SqlSession;
 

whatsmars-earth/whatsmars-earth-dao/src/main/java/com/whatsmars/earth/dao/impl/OrganizationDaoImpl.java → whatsmars-earth/whatsmars-earth-dao/src/main/java/org/hongxi/whatsmars/earth/dao/impl/OrganizationDaoImpl.java

-package com.whatsmars.earth.dao.impl;
+package org.hongxi.whatsmars.earth.dao.impl;
 
-import com.whatsmars.earth.dao.OrganizationDao;
-import com.whatsmars.earth.domain.pojo.Organization;
-import com.whatsmars.earth.domain.query.OrganizationQuery;
-import com.whatsmars.earth.domain.query.QueryResult;
+import org.hongxi.whatsmars.earth.dao.OrganizationDao;
+import org.hongxi.whatsmars.earth.domain.pojo.Organization;
+import org.hongxi.whatsmars.earth.domain.query.OrganizationQuery;
+import org.hongxi.whatsmars.earth.domain.query.QueryResult;
 
 import java.util.Collections;
 import java.util.List;

whatsmars-earth/whatsmars-earth-dao/src/main/java/com/whatsmars/earth/dao/impl/UserDaoImpl.java → whatsmars-earth/whatsmars-earth-dao/src/main/java/org/hongxi/whatsmars/earth/dao/impl/UserDaoImpl.java

-package com.whatsmars.earth.dao.impl;
+package org.hongxi.whatsmars.earth.dao.impl;
 
-import com.whatsmars.earth.dao.UserDao;
-import com.whatsmars.earth.domain.pojo.User;
+import org.hongxi.whatsmars.earth.dao.UserDao;
+import org.hongxi.whatsmars.earth.domain.pojo.User;
 
 /**
  * Created by javahongxi on 2017/12/24.

whatsmars-earth/whatsmars-earth-dao/src/main/resources/sqlmap-config.xml

@@ -8,8 +8,8 @@
 	</settings>
 	<typeAliases>
 
-		<typeAlias type="com.whatsmars.earth.domain.pojo.Organization" alias="Organization"/>
-		<typeAlias type="com.whatsmars.earth.domain.pojo.User" alias="User"/>
+		<typeAlias type="org.hongxi.whatsmars.earth.domain.pojo.Organization" alias="Organization"/>
+		<typeAlias type="org.hongxi.whatsmars.earth.domain.pojo.User" alias="User"/>
 
     </typeAliases>
 	<mappers>

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/constants/Constants.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/constants/Constants.java

-package com.whatsmars.earth.domain.constants;
+package org.hongxi.whatsmars.earth.domain.constants;
 
 
 public class Constants {

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/enums/AdminFlowTypeEnum.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/enums/AdminFlowTypeEnum.java

-package com.whatsmars.earth.domain.enums;
+package org.hongxi.whatsmars.earth.domain.enums;
 
 /**
  * Created by jenny on 6/11/15.

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/enums/FeeEnum.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/enums/FeeEnum.java

-package com.whatsmars.earth.domain.enums;
+package org.hongxi.whatsmars.earth.domain.enums;
 
 /**
  * Created by chenguang on 2015/4/24 0024.

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/enums/GenderEnum.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/enums/GenderEnum.java

-package com.whatsmars.earth.domain.enums;
+package org.hongxi.whatsmars.earth.domain.enums;
 
 /**
  * Created by jenny on 4/22/15.

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/enums/OrganizationLevelEnum.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/enums/OrganizationLevelEnum.java

-package com.whatsmars.earth.domain.enums;
+package org.hongxi.whatsmars.earth.domain.enums;
 
 /**
  * Created by shenhongxi on 15/6/29.

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/enums/OrganizationStatusEnum.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/enums/OrganizationStatusEnum.java

-package com.whatsmars.earth.domain.enums;
+package org.hongxi.whatsmars.earth.domain.enums;
 
 /**
  * Created by liuguanqing on 15/4/7.

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/enums/UserTypeEnum.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/enums/UserTypeEnum.java

-package com.whatsmars.earth.domain.enums;
+package org.hongxi.whatsmars.earth.domain.enums;
 
 /**
  * Created by liuguanqing on 15/4/3.

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/misc/LoginContext.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/misc/LoginContext.java

-package com.whatsmars.earth.domain.misc;
+package org.hongxi.whatsmars.earth.domain.misc;
 
 
-import com.whatsmars.earth.domain.pojo.User;
+import org.hongxi.whatsmars.earth.domain.pojo.User;
 
 /**
  * Author: qing

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/misc/LoginContextHolder.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/misc/LoginContextHolder.java

-package com.whatsmars.earth.domain.misc;
+package org.hongxi.whatsmars.earth.domain.misc;
 
 
-import com.whatsmars.earth.domain.pojo.User;
+import org.hongxi.whatsmars.earth.domain.pojo.User;
 
 /**
  * Author: qing

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/misc/SystemConfig.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/misc/SystemConfig.java

-package com.whatsmars.earth.domain.misc;
+package org.hongxi.whatsmars.earth.domain.misc;
 
 /**
  * Author: qing

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/permission/Permission.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/permission/Permission.java

-package com.whatsmars.earth.domain.permission;
+package org.hongxi.whatsmars.earth.domain.permission;
 
-import com.whatsmars.earth.domain.enums.UserTypeEnum;
+import org.hongxi.whatsmars.earth.domain.enums.UserTypeEnum;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/pojo/AccountFlow.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/pojo/AccountFlow.java

-package com.whatsmars.earth.domain.pojo;
+package org.hongxi.whatsmars.earth.domain.pojo;
 
 import java.io.Serializable;
 import java.util.Date;

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/pojo/Organization.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/pojo/Organization.java

-package com.whatsmars.earth.domain.pojo;
+package org.hongxi.whatsmars.earth.domain.pojo;
 
 import java.io.Serializable;
 import java.util.Date;

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/pojo/User.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/pojo/User.java

-package com.whatsmars.earth.domain.pojo;
+package org.hongxi.whatsmars.earth.domain.pojo;
 
 import java.io.Serializable;
 import java.util.Date;

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/query/AccountFlowQuery.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/query/AccountFlowQuery.java

-package com.whatsmars.earth.domain.query;
+package org.hongxi.whatsmars.earth.domain.query;
 
 import java.util.Date;
 import java.util.Map;

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/query/BaseQuery.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/query/BaseQuery.java

-package com.whatsmars.earth.domain.query;
+package org.hongxi.whatsmars.earth.domain.query;
 
 import java.io.Serializable;
 import java.util.HashMap;

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/query/OrganizationQuery.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/query/OrganizationQuery.java

-package com.whatsmars.earth.domain.query;
+package org.hongxi.whatsmars.earth.domain.query;
 
 import java.util.Map;
 

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/query/QueryResult.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/query/QueryResult.java

-package com.whatsmars.earth.domain.query;
+package org.hongxi.whatsmars.earth.domain.query;
 
 import java.io.Serializable;
 import java.util.*;

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/util/ArithUtils.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/util/ArithUtils.java

-package com.whatsmars.earth.domain.util;
+package org.hongxi.whatsmars.earth.domain.util;
 
 import java.math.BigDecimal;
 

whatsmars-earth/whatsmars-earth-domain/src/main/java/com/whatsmars/earth/domain/util/CalculatorUtils.java → whatsmars-earth/whatsmars-earth-domain/src/main/java/org/hongxi/whatsmars/earth/domain/util/CalculatorUtils.java

-package com.whatsmars.earth.domain.util;
+package org.hongxi.whatsmars.earth.domain.util;
 
-import com.whatsmars.earth.domain.enums.FeeEnum;
+import org.hongxi.whatsmars.earth.domain.enums.FeeEnum;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

whatsmars-earth/whatsmars-earth-service/src/main/java/com/whatsmars/earth/service/AccountService.java → whatsmars-earth/whatsmars-earth-service/src/main/java/org/hongxi/whatsmars/earth/service/AccountService.java

-package com.whatsmars.earth.service;
+package org.hongxi.whatsmars.earth.service;
 
 import org.hongxi.whatsmars.common.pojo.Result;
 

whatsmars-earth/whatsmars-earth-service/src/main/java/com/whatsmars/earth/service/OrganizationService.java → whatsmars-earth/whatsmars-earth-service/src/main/java/org/hongxi/whatsmars/earth/service/OrganizationService.java

-package com.whatsmars.earth.service;
+package org.hongxi.whatsmars.earth.service;
 
 import org.hongxi.whatsmars.common.pojo.Result;
-import com.whatsmars.earth.domain.query.OrganizationQuery;
+import org.hongxi.whatsmars.earth.domain.query.OrganizationQuery;
 
 /**
  * Created by shenhongxi on 15/4/13.

whatsmars-earth/whatsmars-earth-service/src/main/java/com/whatsmars/earth/service/UserService.java → whatsmars-earth/whatsmars-earth-service/src/main/java/org/hongxi/whatsmars/earth/service/UserService.java

-package com.whatsmars.earth.service;
+package org.hongxi.whatsmars.earth.service;
 
-import com.whatsmars.earth.domain.pojo.User;
+import org.hongxi.whatsmars.earth.domain.pojo.User;
 
 /**
  * Created by javahongxi on 2017/12/24.

whatsmars-earth/whatsmars-earth-service/src/main/java/com/whatsmars/earth/service/impl/AccountServiceImpl.java → whatsmars-earth/whatsmars-earth-service/src/main/java/org/hongxi/whatsmars/earth/service/impl/AccountServiceImpl.java

-package com.whatsmars.earth.service.impl;
+package org.hongxi.whatsmars.earth.service.impl;
 
 import org.hongxi.whatsmars.common.pojo.Result;
-import com.whatsmars.earth.dao.AccountDao;
-import com.whatsmars.earth.service.AccountService;
+import org.hongxi.whatsmars.earth.dao.AccountDao;
+import org.hongxi.whatsmars.earth.service.AccountService;
 import org.springframework.stereotype.Service;
 
 /**

whatsmars-earth/whatsmars-earth-service/src/main/java/com/whatsmars/earth/service/impl/OrganizationServiceImpl.java → whatsmars-earth/whatsmars-earth-service/src/main/java/org/hongxi/whatsmars/earth/service/impl/OrganizationServiceImpl.java

-package com.whatsmars.earth.service.impl;
+package org.hongxi.whatsmars.earth.service.impl;
 
 import org.hongxi.whatsmars.common.pojo.Result;
 import org.hongxi.whatsmars.common.pojo.ResultCode;
-import com.whatsmars.earth.dao.OrganizationDao;
-import com.whatsmars.earth.service.OrganizationService;
-import com.whatsmars.earth.domain.pojo.Organization;
-import com.whatsmars.earth.domain.query.OrganizationQuery;
-import com.whatsmars.earth.domain.query.QueryResult;
+import org.hongxi.whatsmars.earth.dao.OrganizationDao;
+import org.hongxi.whatsmars.earth.service.OrganizationService;
+import org.hongxi.whatsmars.earth.domain.pojo.Organization;
+import org.hongxi.whatsmars.earth.domain.query.OrganizationQuery;
+import org.hongxi.whatsmars.earth.domain.query.QueryResult;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;

whatsmars-earth/whatsmars-earth-service/src/main/java/com/whatsmars/earth/service/impl/UserServiceImpl.java → whatsmars-earth/whatsmars-earth-service/src/main/java/org/hongxi/whatsmars/earth/service/impl/UserServiceImpl.java

-package com.whatsmars.earth.service.impl;
+package org.hongxi.whatsmars.earth.service.impl;
 
-import com.whatsmars.earth.dao.UserDao;
-import com.whatsmars.earth.domain.pojo.User;
-import com.whatsmars.earth.service.UserService;
+import org.hongxi.whatsmars.earth.dao.UserDao;
+import org.hongxi.whatsmars.earth.domain.pojo.User;
+import org.hongxi.whatsmars.earth.service.UserService;
 import org.springframework.stereotype.Service;
 
 /**

whatsmars-earth/whatsmars-earth-support-web/src/main/java/com/whatsmars/earth/support/web/ExceptionHandler.java → whatsmars-earth/whatsmars-earth-support-web/src/main/java/org/hongxi/whatsmars/earth/support/web/ExceptionHandler.java

-package com.whatsmars.earth.support.web;
+package org.hongxi.whatsmars.earth.support.web;
 
 import org.springframework.web.servlet.HandlerExceptionResolver;
 import org.springframework.web.servlet.ModelAndView;

whatsmars-earth/whatsmars-earth-support-web/src/main/java/com/whatsmars/earth/support/web/controller/IndexController.java → whatsmars-earth/whatsmars-earth-support-web/src/main/java/org/hongxi/whatsmars/earth/support/web/controller/IndexController.java

-package com.whatsmars.earth.support.web.controller;
+package org.hongxi.whatsmars.earth.support.web.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

whatsmars-earth/whatsmars-earth-support-web/src/main/java/com/whatsmars/earth/support/web/listener/TestListener.java → whatsmars-earth/whatsmars-earth-support-web/src/main/java/org/hongxi/whatsmars/earth/support/web/listener/TestListener.java

-package com.whatsmars.earth.support.web.listener;
+package org.hongxi.whatsmars.earth.support.web.listener;
 
 import net.sf.json.JSONObject;
 import org.apache.activemq.ActiveMQConnectionFactory;

whatsmars-earth/whatsmars-earth-support-web/src/main/resources/spring-activemq.xml

@@ -14,7 +14,7 @@
         <constructor-arg index="0" value="${whatsmars.activemq.queue.withdraw}"></constructor-arg>
     </bean>
 
-    <bean id="withdrawQueueListener" class="com.whatsmars.earth.support.web.listener.TestListener"/>
+    <bean id="withdrawQueueListener" class="org.hongxi.whatsmars.earth.support.web.listener.TestListener"/>
     <bean class="org.springframework.jms.listener.DefaultMessageListenerContainer">
         <property name="connectionFactory" ref="connectionFactory"></property>
         <property name="destination" ref="withdrawQueueDestination"></property>

whatsmars-earth/whatsmars-earth-support-web/src/main/resources/spring-quartz.xml

@@ -30,7 +30,7 @@
         <property name="targetMethod" value="execute"/>
         <property name="concurrent" value="false"/>
     </bean>
-    <bean id="lenderWithdrawJob" class="com.whatsmars.earth.support.web.service.job.TestJob" />
+    <bean id="lenderWithdrawJob" class="org.hongxi.whatsmars.earth.support.web.service.job.TestJob" />
 
 
 </beans>
\ No newline at end of file

whatsmars-earth/whatsmars-earth-support-web/src/main/resources/spring-service.xml

@@ -8,7 +8,7 @@
                         http://www.springframework.org/schema/context/spring-context-3.2.xsd"
 	default-autowire="byName">
 
-    <context:component-scan base-package="com.whatsmars.earth.support.web.service"/>
+    <context:component-scan base-package="org.hongxi.whatsmars.earth.support.web.service"/>
 
     <bean id="mongodbProperties" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
         <property name="locations">

whatsmars-earth/whatsmars-earth-support-web/src/main/resources/spring-velocity.xml

@@ -25,7 +25,7 @@
         </mvc:message-converters>
     </mvc:annotation-driven>
 
-    <context:component-scan base-package="com.itlong.whatsmars.earth.support.web.controller"/>
+    <context:component-scan base-package="org.hongxi.whatsmars.earth.support.web.controller"/>
 
     <bean id="velocityConfig" class="org.springframework.web.servlet.view.velocity.VelocityConfigurer">
         <property name="resourceLoaderPath" value="/WEB-INF/vm"/>
@@ -35,7 +35,7 @@
     <bean id="handlerMapping" class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping">
     </bean>
 
-    <bean id="exceptionResolver" class="com.whatsmars.earth.support.web.ExceptionHandler"/>
+    <bean id="exceptionResolver" class="org.hongxi.whatsmars.earth.support.web.ExceptionHandler"/>
 
     <bean id="viewResolver" class="org.springframework.web.servlet.view.velocity.VelocityLayoutViewResolver">
         <property name="suffix" value=".vm"/>

whatsmars-earth/whatsmars-earth-web/src/main/java/com/whatsmars/earth/web/ExceptionHandler.java → whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/ExceptionHandler.java

-package com.whatsmars.earth.web;
+package org.hongxi.whatsmars.earth.web;
 
 import org.springframework.web.servlet.HandlerExceptionResolver;
 import org.springframework.web.servlet.ModelAndView;

whatsmars-earth/whatsmars-earth-web/src/main/java/com/whatsmars/earth/web/controller/BaseController.java → whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/controller/BaseController.java

-package com.whatsmars.earth.web.controller;
+package org.hongxi.whatsmars.earth.web.controller;
 
 import org.hongxi.whatsmars.common.util.DESUtils;
-import com.whatsmars.earth.domain.constants.Constants;
-import com.whatsmars.earth.domain.misc.SystemConfig;
+import org.hongxi.whatsmars.earth.domain.constants.Constants;
+import org.hongxi.whatsmars.earth.domain.misc.SystemConfig;
 import org.apache.commons.lang.RandomStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 

whatsmars-earth/whatsmars-earth-web/src/main/java/com/whatsmars/earth/web/controller/EarthController.java → whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/controller/EarthController.java

-package com.whatsmars.earth.web.controller;
+package org.hongxi.whatsmars.earth.web.controller;
 
-import com.whatsmars.earth.domain.enums.OrganizationLevelEnum;
-import com.whatsmars.earth.domain.enums.OrganizationStatusEnum;
-import com.whatsmars.earth.domain.enums.UserTypeEnum;
-import com.whatsmars.earth.service.OrganizationService;
+import org.hongxi.whatsmars.earth.domain.enums.OrganizationLevelEnum;
+import org.hongxi.whatsmars.earth.domain.enums.OrganizationStatusEnum;
+import org.hongxi.whatsmars.earth.domain.enums.UserTypeEnum;
+import org.hongxi.whatsmars.earth.service.OrganizationService;
 import org.hongxi.whatsmars.common.pojo.Result;
-import com.whatsmars.earth.domain.permission.Permission;
-import com.whatsmars.earth.domain.query.OrganizationQuery;
+import org.hongxi.whatsmars.earth.domain.permission.Permission;
+import org.hongxi.whatsmars.earth.domain.query.OrganizationQuery;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

whatsmars-earth/whatsmars-earth-web/src/main/java/com/whatsmars/earth/web/controller/IndexController.java → whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/controller/IndexController.java

-package com.whatsmars.earth.web.controller;
+package org.hongxi.whatsmars.earth.web.controller;
 
-import com.whatsmars.earth.domain.misc.LoginContextHolder;
+import org.hongxi.whatsmars.earth.domain.misc.LoginContextHolder;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

whatsmars-earth/whatsmars-earth-web/src/main/java/com/whatsmars/earth/web/controller/MarsController.java → whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/controller/MarsController.java

-package com.whatsmars.earth.web.controller;
+package org.hongxi.whatsmars.earth.web.controller;
 
 import org.hongxi.whatsmars.common.pojo.Result;
 import org.hongxi.whatsmars.common.util.ResultHelper;
-import com.whatsmars.earth.service.AccountService;
+import org.hongxi.whatsmars.earth.service.AccountService;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

whatsmars-earth/whatsmars-earth-web/src/main/java/com/whatsmars/earth/web/controller/NewController.java → whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/controller/NewController.java

-package com.whatsmars.earth.web.controller;
+package org.hongxi.whatsmars.earth.web.controller;
 
-import com.whatsmars.earth.service.UserService;
+import org.hongxi.whatsmars.earth.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -8,9 +8,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.whatsmars.earth.domain.pojo.User;
-
-import java.util.Date;
+import org.hongxi.whatsmars.earth.domain.pojo.User;
 
 /**
  * Created by javahongxi on 2017/10/22.

whatsmars-earth/whatsmars-earth-web/src/main/java/com/whatsmars/earth/web/converter/StringToDateConverter.java → whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/converter/StringToDateConverter.java

-package com.whatsmars.earth.web.converter;
+package org.hongxi.whatsmars.earth.web.converter;
 
 import org.hongxi.whatsmars.common.util.DateUtils;
 import org.apache.commons.lang.StringUtils;

whatsmars-earth/whatsmars-earth-web/src/main/java/com/whatsmars/earth/web/interceptor/LoginInterceptor.java → whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/interceptor/LoginInterceptor.java

-package com.whatsmars.earth.web.interceptor;
+package org.hongxi.whatsmars.earth.web.interceptor;
 
 import org.hongxi.whatsmars.common.util.DESUtils;
-import com.whatsmars.earth.domain.misc.LoginContext;
-import com.whatsmars.earth.domain.misc.LoginContextHolder;
-import com.whatsmars.earth.domain.misc.SystemConfig;
-import com.whatsmars.earth.domain.pojo.User;
+import org.hongxi.whatsmars.earth.domain.misc.LoginContext;
+import org.hongxi.whatsmars.earth.domain.misc.LoginContextHolder;
+import org.hongxi.whatsmars.earth.domain.misc.SystemConfig;
+import org.hongxi.whatsmars.earth.domain.pojo.User;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;

whatsmars-earth/whatsmars-earth-web/src/main/java/com/whatsmars/earth/web/interceptor/PermissionInterceptor.java → whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/interceptor/PermissionInterceptor.java

-package com.whatsmars.earth.web.interceptor;
+package org.hongxi.whatsmars.earth.web.interceptor;
 
-import com.whatsmars.earth.domain.enums.UserTypeEnum;
-import com.whatsmars.earth.domain.misc.LoginContextHolder;
-import com.whatsmars.earth.domain.permission.Permission;
-import com.whatsmars.earth.domain.pojo.User;
+import org.hongxi.whatsmars.earth.domain.enums.UserTypeEnum;
+import org.hongxi.whatsmars.earth.domain.misc.LoginContextHolder;
+import org.hongxi.whatsmars.earth.domain.permission.Permission;
+import org.hongxi.whatsmars.earth.domain.pojo.User;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;

whatsmars-earth/whatsmars-earth-web/src/main/java/com/whatsmars/earth/web/interceptor/SecurityInterceptor.java → whatsmars-earth/whatsmars-earth-web/src/main/java/org/hongxi/whatsmars/earth/web/interceptor/SecurityInterceptor.java

-package com.whatsmars.earth.web.interceptor;
+package org.hongxi.whatsmars.earth.web.interceptor;
 
-import com.whatsmars.earth.domain.misc.LoginContext;
-import com.whatsmars.earth.domain.misc.LoginContextHolder;
+import org.hongxi.whatsmars.earth.domain.misc.LoginContext;
+import org.hongxi.whatsmars.earth.domain.misc.LoginContextHolder;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 

whatsmars-earth/whatsmars-earth-web/src/main/resources/spring-dao.xml

@@ -5,7 +5,7 @@
 	                    http://www.springframework.org/schema/beans/spring-beans-3.2.xsd"
 	default-autowire="byName">
 
-	<bean id="accountDao" class="com.whatsmars.earth.dao.impl.AccountDaoImpl" />
-	<bean id="organizationDao" class="com.whatsmars.earth.dao.impl.OrganizationDaoImpl" />
-	<bean id="userDao" class="com.whatsmars.earth.dao.impl.UserDaoImpl" />
+	<bean id="accountDao" class="org.hongxi.whatsmars.earth.dao.impl.AccountDaoImpl" />
+	<bean id="organizationDao" class="org.hongxi.whatsmars.earth.dao.impl.OrganizationDaoImpl" />
+	<bean id="userDao" class="org.hongxi.whatsmars.earth.dao.impl.UserDaoImpl" />
 </beans>
\ No newline at end of file

whatsmars-earth/whatsmars-earth-web/src/main/resources/spring-service.xml

@@ -8,7 +8,7 @@
                         http://www.springframework.org/schema/context/spring-context-3.2.xsd"
 	default-autowire="byName">
 
-    <context:component-scan base-package="com.whatsmars.earth.service"/>
+    <context:component-scan base-package="org.hongxi.whatsmars.earth.service"/>
 
     <!--<bean id="systemConfig" class="SystemConfig">
         <property name="cookieSecurityKey" value="${whatsmars.lender.cookie.security.key}"/>

whatsmars-earth/whatsmars-earth-web/src/main/resources/spring-velocity.xml

@@ -12,7 +12,7 @@
                            http://www.springframework.org/schema/context/spring-context-3.2.xsd"
        default-autowire="byName">
 
-    <context:component-scan base-package="com.whatsmars.earth.web"/>
+    <context:component-scan base-package="org.hongxi.whatsmars.earth.web"/>
 
     <mvc:annotation-driven>
         <mvc:message-converters>
@@ -55,7 +55,7 @@
     <bean id="handlerMapping" class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping">
     </bean>
 
-    <bean id="exceptionResolver" class="com.whatsmars.earth.web.ExceptionHandler"/>
+    <bean id="exceptionResolver" class="org.hongxi.whatsmars.earth.web.ExceptionHandler"/>
 
     <bean id="viewResolver" class="org.springframework.web.servlet.view.velocity.VelocityLayoutViewResolver">
         <property name="suffix" value=".vm"/>
@@ -76,12 +76,12 @@
     <mvc:interceptors>
         <mvc:interceptor>
             <mvc:mapping path="/**" />
-            <bean class="com.whatsmars.earth.web.interceptor.LoginInterceptor" />
+            <bean class="org.hongxi.whatsmars.earth.web.interceptor.LoginInterceptor" />
         </mvc:interceptor>
         <mvc:interceptor>
             <mvc:mapping path="/account/**" />
             <mvc:exclude-mapping path="/lender/recharge_callback.jhtml"/>
-            <bean class="com.whatsmars.earth.web.interceptor.SecurityInterceptor" />
+            <bean class="org.hongxi.whatsmars.earth.web.interceptor.SecurityInterceptor" />
         </mvc:interceptor>
 
     </mvc:interceptors>

whatsmars-earth/whatsmars-earth-web/src/main/webapp/WEB-INF/velocity-tools.xml

@@ -16,7 +16,7 @@
     </tool>
     <tool>
         <key>moneyUtils</key>
-        <class>com.whatsmars.earth.domain.util.CalculatorUtils</class>
+        <class>org.hongxi.whatsmars.earth.domain.util.CalculatorUtils</class>
     </tool>
     <tool>
         <key>numberFormatUtils</key>