Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

tooth-wechat-web/src/main/java/com/iamberry/wechat/utils/SendMessageUtil.java

@@ -1,4 +1,4 @@
-package com.iamberry.wechat.utils;
+package com.iamberry.wechat.tools;
 
 import java.util.HashMap;
 

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminAgentToothHandler.java

@@ -18,7 +18,7 @@ import com.iamberry.wechat.face.order.CodeService;
 import com.iamberry.wechat.face.porduct.ProductColorService;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.tools.SendMessageUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminLoginHandler.java

@@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.tools.SendMessageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminOrderHandlers.java

@@ -26,7 +26,7 @@ import com.iamberry.wechat.face.relationship.WdRelationService;
 import com.iamberry.wechat.handles.mq.MQServiceProxy;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResultInfo;
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.tools.SendMessageUtil;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminProbationOrderHandler.java

@@ -10,7 +10,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.tools.SendMessageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/ProbationOrderHandler.java

@@ -7,7 +7,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.tools.SendMessageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/giftCard/CardHandler.java

@@ -11,7 +11,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.tools.SendMessageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -12,7 +12,7 @@ import com.iamberry.wechat.face.agentInfo.AgentPurchaseOrderService;
 import com.iamberry.wechat.face.integral.UseIntegralService;
 import com.iamberry.wechat.tools.HttpClient431Util;
 import com.iamberry.wechat.tools.NameUtils;
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.tools.SendMessageUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/order/orderListener/OrderCloseListener.java

@@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.tools.SendMessageUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/order/orderListener/OrderListener.java

@@ -2,7 +2,7 @@ package com.iamberry.wechat.handles.order.orderListener;
 
 import java.util.List;
 
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.tools.SendMessageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/pay/RequestWechatPayHandler.java

@@ -16,7 +16,7 @@ import com.iamberry.wechat.core.entity.agentInfo.AgentTooth;
 import com.iamberry.wechat.face.agentInfo.AgentInfoService;
 import com.iamberry.wechat.face.agentInfo.AgentPurchaseOrderService;
 import com.iamberry.wechat.tools.*;
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.tools.SendMessageUtil;
 import net.sf.json.JSONArray;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/pay/ResponseWechatPayHandler.java

@@ -42,7 +42,7 @@ import com.iamberry.wechat.face.order.ProbationShopOrderService;
 import com.iamberry.wechat.face.qrcode.TemporaryQrcodeService;
 import com.iamberry.wechat.handles.mq.MQServiceProxy;
 import com.iamberry.wechat.tools.*;
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.tools.SendMessageUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.jdom.Document;
 import org.jdom.Element;

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/probation/ProbationHandler.java

@@ -5,7 +5,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.iamberry.wechat.utils.SendMessageUtil;
+import com.iamberry.wechat.tools.SendMessageUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;