整理微信项目

wechat-common-core/src/main/java/com/iamberry/cms/core/dto/MilkPowderInfoDto.java

@@ -1,54 +0,0 @@
-package com.iamberry.cms.core.dto;
-
-import java.io.Serializable;
-
-import com.iamberry.wechat.core.entity.PageBean;
-
-public class MilkPowderInfoDto  implements Serializable{
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 4854607722861776978L;
-	private String powderNumber;				// 奶粉编号
-	private String barCode;						// 条形码
-	private String brand;						// 品牌
-	private String status;						//状态			approved(已认证)	not_approved(未认证)	电话号码为用户上传
-	private PageBean page = new PageBean();						//分页用
-	
-	public String getPowderNumber() {
-		return powderNumber;
-	}
-	public void setPowderNumber(String powderNumber) {
-		this.powderNumber = powderNumber;
-	}
-	public String getBarCode() {
-		return barCode;
-	}
-	public void setBarCode(String barCode) {
-		this.barCode = barCode;
-	}
-	public String getBrand() {
-		return brand;
-	}
-	public void setBrand(String brand) {
-		this.brand = brand;
-	}
-	public String getStatus() {
-		return status;
-	}
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	public PageBean getPage() {
-		return page;
-	}
-	public void setPage(PageBean page) {
-		this.page = page;
-	}
-	@Override
-	public String toString() {
-		return "MilkPowderInfoDto [powderNumber=" + powderNumber + ", brand="
-				+ brand + ", status=" + status + ", page=" + page + "]";
-	}
-}

wechat-common-core/src/main/java/com/iamberry/cms/core/entity/Machine.java

@@ -2,8 +2,6 @@ package com.iamberry.cms.core.entity;
 
 import java.util.Date;
 
-import com.iamberry.wechat.core.entity.PageBean;
-
 /**
  * 冲奶机实体类
  * @author 刘志伟
@@ -26,14 +24,6 @@ public class Machine implements java.io.Serializable {
 	private Date createdOn;			//创建时间	/ 修改时间
 	private String extOpenId;		//openid
 	private String userName;			//用户名称
-	private PageBean page = new PageBean();	//分页
-	
-	public PageBean getPage() {
-		return page;
-	}
-	public void setPage(PageBean page) {
-		this.page = page;
-	}
 	public String getUserName() {
 		return userName;
 	}

wechat-common-core/src/main/java/com/iamberry/cms/core/entity/MilkMakingRecord.java

@@ -1,161 +0,0 @@
-package com.iamberry.cms.core.entity;
-
-import java.util.Date;
-
-
-
-import com.iamberry.wechat.core.entity.Page;
-import com.iamberry.wechat.core.entity.PaperBean;
-
-/**
- * @author Sikandar
- *
- */
-
-public class MilkMakingRecord implements java.io.Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -2673681146930650920L;
-	private Long id;							//id
-	private Integer volume;				//冲奶量
-	private String controller;				//冲奶操作单位
-	private Integer stars;					//评分等级
-	private String comments;			//吐槽
-	private String brand;					//品牌
-	private Long powderInfo;			//比例
-	private String machineName;		//机器名
-	private String machine;				//冲奶机
-	private Long user;						//用户id
-	private Date timestamp;				//冲奶时间
-	private Page page;
-	private String username;
-	public MilkMakingRecord() {
-	}
-
-	public MilkMakingRecord(Long id, Integer volume, String controller, Integer stars, String comments, String brand, Long powderInfo,
-			String machineName, String machine, Long user, Date timestamp) {
-		super();
-		this.id = id;
-		this.volume = volume;
-		this.controller = controller;
-		this.stars = stars;
-		this.comments = comments;
-		this.brand = brand;
-		this.powderInfo = powderInfo;
-		this.machineName = machineName;
-		this.machine = machine;
-		this.user = user;
-		this.timestamp = timestamp;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Integer getVolume() {
-		return volume;
-	}
-
-	public void setVolume(Integer volume) {
-		this.volume = volume;
-	}
-
-	public String getController() {
-		return controller;
-	}
-
-	public void setController(String controller) {
-		this.controller = controller;
-	}
-
-	public Integer getStars() {
-		return stars;
-	}
-
-	public void setStars(Integer stars) {
-		this.stars = stars;
-	}
-
-	public String getComments() {
-		return comments;
-	}
-
-	public void setComments(String comments) {
-		this.comments = comments;
-	}
-
-	public String getBrand() {
-		return brand;
-	}
-
-	public void setBrand(String brand) {
-		this.brand = brand;
-	}
-
-	
-	public String getMachine() {
-		return machine;
-	}
-
-	public void setMachine(String machine) {
-		this.machine = machine;
-	}
-
-	public Long getUser() {
-		return user;
-	}
-
-	public void setUser(Long user) {
-		this.user = user;
-	}
-
-	
-
-	public Page getPage() {
-		return page;
-	}
-
-	public void setPage(Page page) {
-		this.page = page;
-	}
-
-	public String getUsername() {
-		return username;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	public Long getPowderInfo() {
-		return powderInfo;
-	}
-
-	public void setPowderInfo(Long powderInfo) {
-		this.powderInfo = powderInfo;
-	}
-
-	public String getMachineName() {
-		return machineName;
-	}
-
-	public void setMachineName(String machineName) {
-		this.machineName = machineName;
-	}
-
-	public Date getTimestamp() {
-		return timestamp;
-	}
-
-	public void setTimestamp(Date timestamp) {
-		this.timestamp = timestamp;
-	}
-	
-
-}

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/PageBean.java

@@ -0,0 +1,119 @@
+package com.iamberry.wechat.core.entity;
+
+import java.util.List;
+
+
+/**
+ * @Description 用于分页，存储分页信息的
+ * @author 欧阳明
+ * @date 2014-4-19
+ */
+public class PageBean implements java.io.Serializable{
+
+	private static final long serialVersionUID = 8970731867434157200L;
+	private int count;      //记录总数
+	private int pageSize;   //每一页的记录数
+	private int pageNumber;  //页码
+	private int pageCount;   //总页数
+	private int recordBegin ; //查询的开始记录数
+	private Object params;
+	
+	private List<Object> lists;
+	private Object condition;
+	
+	public PageBean(){
+		
+	}
+	
+	public PageBean(int count, int pageSize, int recordBegin){
+		this.count=count;
+		this.pageSize=pageSize;
+		this.recordBegin=recordBegin;
+	}
+	
+	public void init(int count,int pageSize,int pageNumber){
+		this.count=count;
+		this.pageSize=pageSize;
+		this.pageNumber=pageNumber;
+		initRecordBegin();
+	}
+	
+	public int getCount() {
+		return count;
+	}
+	public void setCount(int count) {
+		this.count = count;
+	}
+	public int getPageSize() {
+		if(pageSize==0) return 6;
+		return pageSize;
+	}
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+	public int getPageNumber() {
+		if(this.pageNumber==0)
+			this.pageNumber=1;
+		return pageNumber;
+	}
+	public void setPageNumber(int pageNumber) {
+		this.pageNumber = pageNumber;
+	}
+	public int getPageCount() {
+		if(pageSize>0 && count>0 ){
+			this.pageCount=(int) Math.ceil((double)count/pageSize);
+		}else{
+			this.pageCount=0;
+		}
+		return pageCount;
+	}
+	public void setPageCount(int pageCount) {
+		this.pageCount = pageCount;
+	}
+	public int getRecordBegin() {
+		return recordBegin;
+	}
+	public void setRecordBegin(int recordBegin) {
+		this.recordBegin = recordBegin;
+	}
+	/**
+	 * @decription 初始化分页查询的开始记录数
+	 */
+	public void initRecordBegin(){
+		if(pageNumber==1) this.recordBegin = 0;
+		if(pageNumber>1){
+			this.recordBegin=this.getPageSize()*(this.pageNumber-1);
+		}
+	}
+	
+	//获取下一页内容设置
+	public void setTurnToNextPage(){
+		pageNumber=pageNumber+1;
+		initRecordBegin();
+	}
+
+	public List<Object> getLists() {
+		return lists;
+	}
+
+	public void setLists(List<Object> lists) {
+		this.lists = lists;
+	}
+
+	public Object getCondition() {
+		return condition;
+	}
+
+	public void setCondition(Object condition) {
+		this.condition = condition;
+	}
+
+	public Object getParams() {
+		return params;
+	}
+
+	public void setParams(Object params) {
+		this.params = params;
+	}
+
+}

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/PaperBean.java

@@ -1,9 +1,8 @@
 package com.iamberry.wechat.core.entity;
+
 import java.util.Date;
+
 public class PaperBean implements java.io.Serializable{
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -4384087643092452530L;
 	/*检索到多少行*/
 	private Integer maxNum;

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/member/Member.java

@@ -1,8 +1,6 @@
 package com.iamberry.wechat.core.entity.member;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.iamberry.wechat.core.entity.Page;
-import com.iamberry.wechat.core.entity.PageBean;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -14,9 +12,6 @@ import java.util.Date;
  * @createDate: 2016年4月18日
  */
 public class Member implements Serializable {
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -1480503773318576718L;
 	public static long getSerialversionuid() {
 		return serialVersionUID;
@@ -58,8 +53,6 @@ public class Member implements Serializable {
 	private Integer templateId;				//返利模板id
 	private Integer userDealers;			//代理商层级id
 	private Integer userIsBought;			//用户是否已经购买过		1：未购买(默认)	2：已购买
-	private Page page;						//分页
-	private PageBean pageBean;						//分页
 	private String userEmail;				//邮箱
 	private String numberBarcode;			//条形码
 	private String phoneCode;				//手机验证码
@@ -113,10 +106,7 @@ public class Member implements Serializable {
 		this.userEmail = userEmail;
 	}
 
-	public Page getPage() {
-		return page;
-	}
-	
+
 	public Integer getUserIncome() {
 		return userIncome;
 	}
@@ -125,10 +115,6 @@ public class Member implements Serializable {
 		this.userIncome = userIncome;
 	}
 
-	public void setPage(Page page) {
-		this.page = page;
-	}
-
 	public Member() {
 		super();
 	}
@@ -303,14 +289,6 @@ public class Member implements Serializable {
 		this.totalConsume = totalConsume;
 	}
 
-	public PageBean getPageBean() {
-		return pageBean;
-	}
-
-	public void setPageBean(PageBean pageBean) {
-		this.pageBean = pageBean;
-	}
-
 	public String[] getIds() {
 		return ids;
 	}
@@ -343,22 +321,4 @@ public class Member implements Serializable {
 		this.userIsAc = userIsAc;
 	}
 
-	@Override
-	public String toString() {
-		return "Member [userId=" + userId + ", userOpenid=" + userOpenid
-				+ ", userHead=" + userHead + ", userNickname=" + userNickname
-				+ ", userAddr=" + userAddr + ", userSex=" + userSex
-				+ ", userAccountNum=" + userAccountNum + ", userBirthDate="
-				+ userBirthDate + ", userCreateDate=" + userCreateDate
-				+ ", userIdentity=" + userIdentity + ", userIsFlag="
-				+ userIsFlag + ", userName=" + userName + ", userPwd="
-				+ userPwd + ", userTel=" + userTel + ", userQrcode="
-				+ userQrcode + ", userResType=" + userResType + ", userStatus="
-				+ userStatus + ", userSubDate=" + userSubDate
-				+ ", userSurplusIntegral=" + userSurplusIntegral
-				+ ", userUseIntegral=" + userUseIntegral + ", userIncome="
-				+ userIncome + ", templateId=" + templateId + ", userDealers="
-				+ userDealers + ", userIsBought=" + userIsBought + ", page="
-				+ page + "]";
-	}
 }

wechat-common-core/src/main/java/com/iamberry/wechat/tools/SendMessageUtil.java

@@ -1,97 +1,24 @@
 package com.iamberry.wechat.tools;
 
-import java.util.HashMap;
-
 import org.springframework.stereotype.Component;
 
-import com.iamberry.wechat.tools.NameUtils;
-import com.iamberry.wechat.tools.ResultInfo;
-import com.iamberry.wechat.tools.WeixinUtil;
-
 @Component
 public class SendMessageUtil {
 		
-		//快递公司列表
-		public static HashMap<String, String> hashmap = new HashMap<String, String>();
-		//正式环境
-		{
-			hashmap.put("sto", "申通快递");
-			hashmap.put("yto", "圆通快递");
-			hashmap.put("sf", "顺丰快递");
-			hashmap.put("longbanwuliu", "龙邦快递");
-			hashmap.put("ems", "邮政EMS");
-			hashmap.put("zto", "中通快递");
-			hashmap.put("zjs", "宅急送");
-			hashmap.put("yunda", "韵达快递");
-			hashmap.put("cces", "cces快递");
-			hashmap.put("pick", "上门提货");
-			hashmap.put("htky", "汇通快递");
-			hashmap.put("ttkdex", "天天快递");
-			hashmap.put("stars", "邮政EMS");
-			hashmap.put("jd", "星晨急便");
-			hashmap.put("01", "其他");
-			hashmap.put("02", "上门送货");
-		}
-		
 		/**
 		 * 发送模板通知给用户
 		 * @param date data 日期
 		 * @param openId 接受的用户id
 		 * @param url  点击打开的url
-		 * @param type 发送类型 1，收益成功通知 2，发货提醒通知 3、收入提醒通知,4、订单未支付通知 5、试用进度提醒
+		 * @param type
 		 * @return
 		 */
 		public boolean sendTemplateMessageToOpenid(String date,String openId, String url,Integer type) {
 			boolean result = false;
 			switch (type) {
-			case 4:  //4、订单未支付通知
+			case 1:
 				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.Order_template_id, date, url);
 				break;
-			case 8:  //8、订单支付成功
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.probation_pay_success, date, url);
-				break;
-			case 9:  //9、订单关闭成功
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.probation_shut_down, date, url);
-				break;
-			case 11:  //11、服务进度
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.update_tooth_hint, date, url);
-				break;
-			case 12:  //12、用户申请退款提醒
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.order_apply_refund, date, url);
-				break;
-			case 13:  //13、用户 申请退货 提醒
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.order_apply_return, date, url);
-				break;
-			case 14:  //14、用户 申请换货 提醒
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.order_apply_barter, date, url);
-				break;
-			case 15:  //15、发货后 提醒
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.order_send_success, date, url);
-				break;
-			case 16:  //16、退款申请驳回
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.refund_to_dismiss, date, url);
-				break;
-			case 17:  //17、退款申请通知
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.refund_application_notice, date, url);
-				break;
-			case 18:  //18、购买失败
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.refund_application_notice, date, url);
-				break;
-			case 19:  //19、首次注册推送信息
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.registered_template, date, url);
-				break;
-			case 20:  //20、生日赠送积分推送
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.birthday_template, date, url);
-				break;
-			case 21:  //21参与成功
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.participate_in_success, date, url);
-				break;
-			case 22:  //积分变更
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.point_change, date, url);
-				break;
-			case 23:  //生日赠送
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.birthday_gift, date, url);
-				break;
 			default:
 				break;
 			}
@@ -99,24 +26,6 @@ public class SendMessageUtil {
 			return  result;
 		}
 
-		//基本样式：
-		//{"topcolor":"#173177","data":{"first":{"color":"#173177","value":"biaosti"},"keyword1":{"color":"#173177","value":"biaosti"},"keyword2":{"color":"#173177","value":"biaosti"},"keyword3":{"color":"#173177","value":"biaosti"},"keyword4":{"color":"#173177","value":"biaosti"},"remark":{"color":"#173177","value":"xx"}},"template_id":"EAHie4LJAWr82FfNiClPCr9zA4OEiiqvB2wINfUaT_k","touser":"oZ9pv02WMRQgyDVRY1a_daYecwHI","url":"https://s.iamberry.com/soodo/wechat/index.html"}
-
-		/*public static void main(String[] args) {
-//			String date = "{'first':{'color':'#173177', 'value':'尊敬的客户您好~您的订单已发货~'}, 'order_id':{'color':'#173177','value':'1009145345B11792L'}, 'package_id':{'color':'#173177','value':'yuantong:34234234'}, 'remark':{'color':'#173177', 'value':'点击进入商城查看-->>'}}";
-			String date = "{'name':{'color':'#173177','value':'上朵柔羽呵护刷头 （冰川蓝）'}, 'remark':{'color':'#173177','value':'您在soodo上朵购买的刷头未填写收货地址，为了尽快为您发货，麻烦您提供一下您的收货地址。(请您尽快在公众号联系客服人员)'}}";
-			String openId = "oZ9pv0_3_d3o7n7mye9R0WLZB8QA";
-			String appId = "wxdb090f0af89e0be3";// 应用ID
-			String appSecret = "518114a120274f625530750c1803921b";// 应用密钥
-
-			WeixinUtil.sendTemplateMessage(appId, appSecret, openId, "gnk9JaOkAaumN1qNUjxH5IHTjundAj_-O9_G531FpH4", date, "https://s.iamberry.com/soodo/wechat/index.html");
-			System.out.println("发送成功");
-
-//			SendMessageUtil sendMessageUtil = new SendMessageUtil();
-//			sendMessageUtil.failedPurchase("上朵柔羽呵护刷头 （冰川蓝）",
-//					"您在soodo上朵购买的刷头未填写收货地址，为了尽快为您发货，麻烦您提供一下您的收货地址。(请您尽快在公众号联系客服人员)","oZ9pv02WMRQgyDVRY1a_daYecwHI","https://s.iamberry.com/soodo/wechat/index.html");
-		}*/
-
 		public static void main(String[] args) {
 	//		{{first.DATA}}用户名：{{keyword1.DATA}}	活动主题：{{keyword2.DATA}}	活动时间：{{keyword3.DATA}}	活动地点：{{keyword4.DATA}}	{{remark.DATA}}
 			String date = "{'first':{'color':'#173177','value':'biaosti'},'keyword1':{'color':'#173177','value':'biaosti'},'keyword2':{'color':'#173177','value':'biaosti'},'keyword3':{'color':'#173177','value':'biaosti'},'keyword4':{'color':'#173177','value':'biaosti'}, 'remark':{'color':'#1C86EE','value':'xx'}}";
@@ -140,7 +49,6 @@ public class SendMessageUtil {
 //		System.out.println("发送成功");
 //	}
 		
-
 		/**
 		 * 试用订单支付成功
 		 * @param first  标题
@@ -158,268 +66,4 @@ public class SendMessageUtil {
 					.replaceFirst("remarkValue",remark);
 			sendTemplateMessageToOpenid(temp, openId, url,8);
 		}
-		/**
-		 * 试用订单关闭成功
-		 * @param first  标题
-		 * @param keyword1	支付金额
-		 * @param keyword2	商品信息
-		 * @param remark	全部内容
-		 * @param openId	用户openid
-		 * @param url	地址
-		 */
-		public void probationShutDown(String first,String transid,String fee,String pay_time,String remark,String openId,String url){
-			String temp = ResultInfo.PROBATIONSHUTDOWN;
-			temp = temp.replaceFirst("firstValueIamberry", first)
-					.replaceFirst("transidValue",transid)
-					.replaceFirst("feeValue",fee)
-					.replaceFirst("pay_timeValue",pay_time)
-					.replaceFirst("remarkValue",remark);
-			sendTemplateMessageToOpenid(temp, openId, url,9);
-		}
-		
-
-	/**
-	 * 服务进度
-	 * @param first
-	 * @param keyword1
-	 * @param keyword2
-	 * @param remark
-	 * @param openId
-	 * @param url
-	 */
-	public void serviceProgress(String first,String keyword1,String keyword2,String remark,String openId,String url){
-		String temp = ResultInfo.UPDATETOOTHHINT;
-		temp = temp.replaceFirst("firstValueIamberry", first)
-				.replaceFirst("keyword1Value",keyword1)
-				.replaceFirst("keyword2Value",keyword2)
-				.replaceFirst("remarkValue",remark);
-		sendTemplateMessageToOpenid(temp, openId, url,11);
-	}
-
-	/**
-	 * 换货提醒信息
-	 * @param first
-	 * @param keyword1
-	 * @param keyword2
-	 * @param remark
-	 * @param openId
-	 * @param url
-	 */
-	public void orderApplyBarter(String first,String keyword1,String keyword2,String remark,String openId,String url){
-		String temp = ResultInfo.APPLYBARTER;
-		temp = temp.replaceFirst("firstValueIamberry", first)
-				.replaceFirst("keyword1Value",keyword1)
-				.replaceFirst("keyword2Value",keyword2)
-				.replaceFirst("colorValue","#1C86EE")
-				.replaceFirst("remarkValue",remark);
-		sendTemplateMessageToOpenid(temp, openId, url,14);
-	}
-
-	/**
-	 * 退款提醒信息
-	 * @param first
-	 * @param keyword1
-	 * @param keyword2
-	 * @param remark
-	 * @param openId
-	 * @param url
-	 */
-	public void orderApplyRefund(String first,String keyword1,String keyword2,String keyword3,String remark,String openId,String url){
-		String temp = ResultInfo.APPLYREFUND;
-		temp = temp.replaceFirst("firstValueIamberry", first)
-				.replaceFirst("keyword1Value",keyword1)
-				.replaceFirst("keyword2Value",keyword2)
-				.replaceFirst("keyword3Value",keyword3)
-				.replaceFirst("colorValue","#1C86EE")
-				.replaceFirst("remarkValue",remark);
-		sendTemplateMessageToOpenid(temp, openId, url,12);
-	}
-
-	/**
-	 * 退货提醒信息
-	 * @param first
-	 * @param keyword1
-	 * @param keyword2
-	 * @param remark
-	 * @param openId
-	 * @param url
-	 */
-	public void orderApplyReturn(String first,String keyword1,String keyword2,String keyword3,String keyword4,String remark,String openId,String url){
-		String temp = ResultInfo.APPLYRETURN;
-		temp = temp.replaceFirst("firstValueIamberry", first)
-				.replaceFirst("keyword1Value",keyword1)
-				.replaceFirst("keyword2Value",keyword2)
-				.replaceFirst("keyword3Value",keyword3)
-				.replaceFirst("keyword4Value",keyword4)
-				.replaceFirst("colorValue","#1C86EE")
-				.replaceFirst("remarkValue",remark);
-		sendTemplateMessageToOpenid(temp, openId, url,13);
-	}
-
-	/**
-	 * 发货提醒信息
-	 * @param first
-	 * @param keyword1
-	 * @param keyword2
-	 * @param remark
-	 * @param openId
-	 * @param url
-	 */
-	public void orderSendSuccess(String first,String keyword1,String keyword2,String keyword3,String keyword4,String remark,String openId,String url){
-		String temp = ResultInfo.SENDSUCCESS;
-		temp = temp.replaceFirst("firstValueIamberry", first)
-				.replaceFirst("keyword1Value",keyword1)
-				.replaceFirst("keyword2Value",keyword2)
-				.replaceFirst("keyword3Value",keyword3)
-				.replaceFirst("keyword4Value",keyword4)
-				.replaceFirst("colorValue","#1C86EE")
-				.replaceFirst("remarkValue",remark);
-		sendTemplateMessageToOpenid(temp, openId, url,15);
-	}
-
-	/**
-	 * 退款申请驳回
-	 * @param first
-	 * @param keyword1 退款金额
-	 * @param keyword2 商品详情
-	 * @param keyword3 订单编号
-	 * @param remark
-	 * @param openId
-	 * @param url
-	 */
-	public void refundToDismiss(String first,String keyword1,String keyword2,String keyword3,String remark,String openId,String url){
-		String temp = ResultInfo.REFUNDSPPLICATIONREJECTED;
-		temp = temp.replaceFirst("firstValueIamberry", first)
-				.replaceFirst("keyword1Value",keyword1)
-				.replaceFirst("keyword2Value",keyword2)
-				.replaceFirst("keyword3Value",keyword3)
-				.replaceFirst("colorValue","#1C86EE")
-				.replaceFirst("remarkValue",remark);
-		sendTemplateMessageToOpenid(temp, openId, url,16);
-	}
-
-	/**
-	 * 退款申请通知
-	 * @param first
-	 * @param keyword1
-	 * @param keyword2
-	 * @param remark
-	 * @param openId
-	 * @param url
-	 */
-	public void refundApplicationNotice(String first,String keyword1,String keyword2,String keyword3,String remark,String openId,String url){
-		String temp = ResultInfo.REFUNDAPPLICATIONNOTICE;
-		temp = temp.replaceFirst("firstValueIamberry", first)
-				.replaceFirst("keyword1Value",keyword1)
-				.replaceFirst("keyword2Value",keyword2)
-				.replaceFirst("keyword3Value",keyword3)
-				.replaceFirst("colorValue","#1C86EE")
-				.replaceFirst("remarkValue",remark);
-		sendTemplateMessageToOpenid(temp, openId, url,17);
-	}
-
-
-	/**
-	 * 购买失败
-	 * @param first
-	 * @param remark
-	 * @param openId
-	 * @param url
-	 */
-	public void failedPurchase(String first,String remark,String openId,String url){
-		String temp = ResultInfo.REFUNDAPPLICATIONNOTICE;
-		temp = temp.replaceFirst("nameValueIamberry", first)
-				.replaceFirst("colorValue","#1C86EE")
-				.replaceFirst("remarkValue",remark);
-		sendTemplateMessageToOpenid(temp, openId, url,18);
-	}
-
-	/**
-	 * 首次注册推送信息
-	 * @param first
-	 * @param remark
-	 * @param openId
-	 * @param url
-	 */
-	public void registeredTemplate(String first,String keyword1,String keyword2,String keyword3,String remark,String openId,String url){
-		String temp = ResultInfo.REGISTEREDTEMPLATE;
-		temp = temp.replaceFirst("firstValueIamberry", first)
-				.replaceFirst("keyword1Value",keyword1)
-				.replaceFirst("keyword2Value",keyword2)
-				.replaceFirst("keyword3Value",keyword3)
-				.replaceFirst("colorValue","#1C86EE")
-				.replaceFirst("remarkValue",remark);
-		sendTemplateMessageToOpenid(temp, openId, url,19);
-	}
-
-	/**
-	 * 生日赠送积分推送
-	 * @param first
-	 * @param remark
-	 * @param openId
-	 * @param url
-	 */
-	public void birthdayTemplate(String first,String keyword1,String keyword2,String keyword3,String remark,String openId,String url){
-		String temp = ResultInfo.BIRTHDAYTEMPLATE;
-		temp = temp.replaceFirst("nameValueIamberry", first)
-				.replaceFirst("colorValue","#1C86EE")
-				.replaceFirst("remarkValue",remark);
-		sendTemplateMessageToOpenid(temp, openId, url,20);
-	}
-
-	/**
-	 * 618活动  参与成功
-	 * @param first
-	 * @param remark
-	 * @param openId
-	 * @param url
-	 */
-	public void participateInSuccess(String first,String keyword1,String keyword2,String keyword3,String keyword4,String remark,String openId,String url){
-		String temp = ResultInfo.PARTICIPATEINSUCCESS;
-		temp = temp.replaceFirst("firstValueIamberry", first)
-				.replaceFirst("keyword1Value",keyword1)
-				.replaceFirst("keyword2Value",keyword2)
-				.replaceFirst("keyword3Value",keyword3)
-				.replaceFirst("keyword4Value",keyword4)
-				.replaceFirst("colorValue","#1C86EE")
-				.replaceFirst("remarkValue",remark);
-		sendTemplateMessageToOpenid(temp, openId, url,21);
-	}
-
-	/**
-	 * 积分变更
-	 * @param first
-	 * @param remark
-	 * @param openId
-	 * @param url
-	 */
-	public void pointChange(String first,String keyword1,String keyword2,String remark,String openId,String url){
-		String temp = ResultInfo.POINTCHANGE;
-		temp = temp.replaceFirst("firstValueIamberry", first)
-				.replaceFirst("keyword1Value",keyword1)
-				.replaceFirst("keyword2Value",keyword2)
-				.replaceFirst("colorValue","#1C86EE")
-				.replaceFirst("remarkValue",remark);
-		sendTemplateMessageToOpenid(temp, openId, url,22);
-	}
-
-	/**
-	 * 积分变更
-	 * @param first
-	 * @param remark
-	 * @param openId
-	 * @param url
-	 */
-	public void birthdayGift(String first,String keyword1,String keyword2,String keyword3,String keyword4,String remark,String openId,String url){
-		String temp = ResultInfo.BIRTHDAYGIFT;
-		temp = temp.replaceFirst("firstValueIamberry", first)
-				.replaceFirst("keyword1Value",keyword1)
-				.replaceFirst("keyword2Value",keyword2)
-				.replaceFirst("keyword3Value",keyword3)
-				.replaceFirst("keyword4Value",keyword4)
-				.replaceFirst("colorValue","#1C86EE")
-				.replaceFirst("remarkValue",remark);
-		sendTemplateMessageToOpenid(temp, openId, url,23);
-	}
-
 }

wechat-common-tool/src/main/java/com/iamberry/app/config/ImberryConfig.java

@@ -1,38 +0,0 @@
-package com.iamberry.app.config;
-
-import java.io.InputStream;
-import java.util.Properties;
-
-public class ImberryConfig {
-
-	public static String SMS_USERNAME = "";
-	public static String SMS_PASSWORD = "";
-	public static String SMS_TEXT = "";
-	public static String SMS_URL = "";
-	public static String SINA_IP_URL = "";
-	public static String MASTERSECRET="";
-	public static String APPKEY="";
-	public static String CDN_URL="";
-	public static String BASE_URL=""; //头像前缀
-
-	static {
-		Properties pro = new Properties();
-		InputStream in = ImberryConfig.class.getClassLoader().getResourceAsStream("iamberry-app-service-config.properties");
-		try {
-			pro.load(in);
-			SMS_USERNAME = pro.getProperty("SMS_USERNAME");
-			SMS_PASSWORD = pro.getProperty("SMS_PASSWORD");
-			SMS_TEXT = pro.getProperty("SMS_TEXT");
-			SMS_URL = pro.getProperty("SMS_URL");
-			SINA_IP_URL = pro.getProperty("SINA_IP_URL");
-			MASTERSECRET=pro.getProperty("master_secret");
-			APPKEY=pro.getProperty("appkey");
-			CDN_URL=pro.getProperty("cdnUrl");
-			BASE_URL=pro.getProperty("base_url");
-			System.out.println("这里需要打印"+BASE_URL);
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-}

wechat-common-tool/src/main/java/com/iamberry/wechat/tools/ImageUtils.java

@@ -1,348 +0,0 @@
-package com.iamberry.wechat.tools;
-
-import com.mortennobel.imagescaling.ResampleFilters;
-import com.mortennobel.imagescaling.ResampleOp;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.geom.AffineTransform;
-import java.awt.image.AffineTransformOp;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-
-/**
- * 图片工具类， 图片水印，文字水印，缩放，补白等 <br>
- * 注意： 如果上传了图片，一定要使用此类对图片进行水印，防止恶意图片,或者对图片进行缩放
- * @author 何秀刚
- */
-public final class ImageUtils {
-    
-    private ImageUtils(){}
-    /**
-	 * 添加图片水印, 后期可以将图片水印居于右下角
-	 * @param targetImg 目标图片路径，如：C://myPictrue//1.jpg
-	 * @param waterImg  水印图片路径，如：C://myPictrue//logo.png
-	 * @param x 水印图片距离目标图片左侧的偏移量，如果x<0, 则在正中间
-	 * @param y 水印图片距离目标图片上侧的偏移量，如果y<0, 则在正中间
-	 * @param alpha 透明度(0.0 -- 1.0, 0.0为完全透明，1.0为完全不透明)
-	*/
-    public final static void pressImage(String targetImg, String waterImg, int x, int y, float alpha) {
-            try {
-                File file = new File(targetImg);
-                Image image = ImageIO.read(file);
-                int width = image.getWidth(null);
-                int height = image.getHeight(null);
-                BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-                Graphics2D g = bufferedImage.createGraphics();
-                g.drawImage(image, 0, 0, width, height, null);
-            
-                Image waterImage = ImageIO.read(new File(waterImg));    // 水印文件
-                int width_1 = waterImage.getWidth(null);
-                int height_1 = waterImage.getHeight(null);
-                g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
-                
-                int widthDiff = width - width_1;
-                int heightDiff = height - height_1;
-                if(x < 0){
-                    x = widthDiff / 2;
-                }else if(x > widthDiff){
-                    x = widthDiff;
-                }
-                if(y < 0){
-                    y = heightDiff / 2;
-                }else if(y > heightDiff){
-                    y = heightDiff;
-                }
-                g.drawImage(waterImage, x, y, width_1, height_1, null); // 水印文件结束
-                g.dispose();
-                ImageIO.write(bufferedImage, NameUtils.getConfig("PICTRUE_FORMATE_JPG"), file);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-    }
-
-    /**
-     * 添加文字水印
-     * @param targetImg 目标图片路径，如：C://myPictrue//1.jpg
-     * @param pressText 水印文字， 如：中国证券网
-     * @param x 水印文字距离目标图片左侧的偏移量，如果x<0, 则在正中间
-     * @param y 水印文字距离目标图片上侧的偏移量，如果y<0, 则在正中间
-     */
-    public static void press(String targetImg, String srcImg, String pressText, int x, int y, int imgx, int imgy) {
-        try {
-        	
-        	String fontName = "宋体";
-        	int fontStyle = Font.BOLD;
-        	int fontSize = 25;
-        	Color color = Color.RED;
-        	float alpha = 1;
-        	
-        	/**
-        	 * 水印文字
-        	 */
-            File file = new File(targetImg);
-            Image image = ImageIO.read(file);
-            int width = image.getWidth(null);
-            int height = image.getHeight(null);
-            BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-            Graphics2D g = bufferedImage.createGraphics();
-            g.drawImage(image, 0, 0, width, height, null);
-            g.setFont(new Font(fontName, fontStyle, fontSize));
-            g.setColor(color);
-            g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
-            
-            int width_1 = fontSize * getLength(pressText);
-            int height_1 = fontSize;
-            int widthDiff = width - width_1;
-            int heightDiff = height - height_1;
-            if(x < 0){
-                x = widthDiff / 2;
-            }else if(x > widthDiff){
-                x = widthDiff;
-            }
-            if(y < 0){
-                y = heightDiff / 2;
-            }else if(y > heightDiff){
-                y = heightDiff;
-            }
-            g.drawString(pressText, x, y + height_1);
-
-            /**
-             * 水印图片
-             */
-            Image tarImage = ImageIO.read(new File(srcImg));
-            g.drawImage(tarImage, imgx, imgy, tarImage.getWidth(null), tarImage.getHeight(null), null); // 水印文件结束
-            
-            g.dispose();
-            ImageIO.write(bufferedImage, targetImg.substring(targetImg.lastIndexOf(".") + 1), file);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 生成海报
-     */
-    public static void pressPost(String targetImg,
-                                 String srcImg1, int imgx1, int imgy1,
-                                 String srcImg2, int imgx2, int imgy2,
-                                 String pressText, int x, int y,Color colorName,int sizeNum
-        ) throws Exception{
-            String fontName = "微软雅黑";
-            int fontStyle = Font.PLAIN;
-            int fontSize = sizeNum;
-            Color color = colorName;
-            float alpha = 1;
-
-            /**
-             * 水印文字
-             */
-            File file = new File(targetImg);
-            Image image = ImageIO.read(file);
-            int width = image.getWidth(null);
-            int height = image.getHeight(null);
-            BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-            Graphics2D g = bufferedImage.createGraphics();
-            g.drawImage(image, 0, 0, width, height, null);
-            g.setFont(new Font(fontName, fontStyle, fontSize));
-            g.setColor(color);
-            g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
-
-            int width_1 = fontSize * getLength(pressText);
-            int height_1 = fontSize;
-            int widthDiff = width - width_1;
-            int heightDiff = height - height_1;
-            if(x < 0){
-                x = widthDiff / 2;
-            }else if(x > widthDiff){
-                x = widthDiff;
-            }
-            if(y < 0){
-                y = heightDiff / 2;
-            }else if(y > heightDiff){
-                y = heightDiff;
-            }
-            g.drawString(pressText, x, y + height_1);
-
-//        Graphics2D g2d = (Graphics2D) g;
-//        g2d.setFont(new Font("宋体", Font.BOLD, 30));
-//        FontMetrics fm = g2d.getFontMetrics();
-//        String str = "文本居中";
-//        int stringWidth = fm.stringWidth(str);
-//        int stringAscent = fm.getAscent();
-//        int stringDescent = fm.getDescent ();
-//        int x = this.getWidth() / 2 - stringWidth / 2;
-//        int y = this.getHeight() / 2 + (stringAscent - stringDescent) / 2;
-//        g2d.drawString(str, x, y);
-
-            Image tarImage = ImageIO.read(new File(srcImg1));
-            g.drawImage(tarImage, imgx1, imgy1, tarImage.getWidth(null), tarImage.getHeight(null), null); // 水印文件结束
-
-            Image tarImage2 = ImageIO.read(new File(srcImg2));
-            g.drawImage(tarImage2, imgx2, imgy2, tarImage2.getWidth(null), tarImage2.getHeight(null), null); // 水印文件结束
-
-            g.dispose();
-            ImageIO.write(bufferedImage, targetImg.substring(targetImg.lastIndexOf(".") + 1), file);
-    }
-
-
-    /**
-     * 添加文字水印
-     * @param targetImg 目标图片路径，如：C://myPictrue//1.jpg
-     * @param pressText 水印文字， 如：中国证券网
-     * @param x 水印文字距离目标图片左侧的偏移量，如果x<0, 则在正中间
-     * @param y 水印文字距离目标图片上侧的偏移量，如果y<0, 则在正中间
-     */
-    public static void pressText(String targetImg, String pressText, int x, int y,Color colorName,int sizeNum) {
-        try {
-            String fontName = "宋体";
-            int fontStyle = Font.BOLD;
-            int fontSize = sizeNum;
-            Color color = colorName;
-            float alpha = 1;
-            /**
-             * 水印文字
-             */
-            File file = new File(targetImg);
-            Image image = ImageIO.read(file);
-            int width = image.getWidth(null);
-            int height = image.getHeight(null);
-            BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-            Graphics2D g = bufferedImage.createGraphics();
-            g.drawImage(image, 0, 0, width, height, null);
-            g.setFont(new Font(fontName, fontStyle, fontSize));
-            g.setColor(color);
-            g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
-
-            int width_1 = fontSize * getLength(pressText);
-            int height_1 = fontSize;
-            int widthDiff = width - width_1;
-            int heightDiff = height - height_1;
-            if(x < 0){
-                x = widthDiff / 2;
-            }else if(x > widthDiff){
-                x = widthDiff;
-            }
-            if(y < 0){
-                y = heightDiff / 2;
-            }else if(y > heightDiff){
-                y = heightDiff;
-            }
-            g.drawString(pressText, x, y + height_1);
-
-            g.dispose();
-            ImageIO.write(bufferedImage, targetImg.substring(targetImg.lastIndexOf(".") + 1), file);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-    
-    /**
-     * 获取字符长度，一个汉字作为 1 个字符, 一个英文字母作为 0.5 个字符
-     * @param text
-     * @return 字符长度，如：text="中国",返回 2；text="test",返回 2；text="中国ABC",返回 4.
-     */
-    public static int getLength(String text) {
-        int textLength = text.length();
-        int length = textLength;
-        for (int i = 0; i < textLength; i++) {
-            if (String.valueOf(text.charAt(i)).getBytes().length > 1) {
-                length++;
-            }
-        }
-        return (length % 2 == 0) ? length / 2 : length / 2 + 1;
-    }
-
-    /**
-     * 图片缩放
-     * @param filePath 图片路径
-     * @param height 高度
-     * @param width 宽度
-     * @param bb 比例不对时是否需要补白
-     */
-    public static void resize(String filePath, int height, int width, boolean bb) {
-        try {
-            double ratio = 0; //缩放比例    
-            File f = new File(filePath);   
-            BufferedImage bi = ImageIO.read(f);   
-            Image itemp = bi.getScaledInstance(width, height, BufferedImage.SCALE_SMOOTH);   
-            //计算比例   
-            if ((bi.getHeight() > height) || (bi.getWidth() > width)) {   
-                if (bi.getHeight() > bi.getWidth()) {   
-                    ratio = (new Integer(height)).doubleValue() / bi.getHeight();   
-                } else {   
-                    ratio = (new Integer(width)).doubleValue() / bi.getWidth();   
-                }   
-                AffineTransformOp op = new AffineTransformOp(AffineTransform.getScaleInstance(ratio, ratio), null);   
-                itemp = op.filter(bi, null);   
-            }   
-            if (bb) {   
-                BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);   
-                Graphics2D g = image.createGraphics();   
-                g.setColor(Color.white);   
-                g.fillRect(0, 0, width, height);   
-                if (width == itemp.getWidth(null))   
-                    g.drawImage(itemp, 0, (height - itemp.getHeight(null)) / 2, itemp.getWidth(null), itemp.getHeight(null), Color.white, null);   
-                else  
-                    g.drawImage(itemp, (width - itemp.getWidth(null)) / 2, 0, itemp.getWidth(null), itemp.getHeight(null), Color.white, null);   
-                g.dispose();   
-                itemp = image;   
-            }
-            ImageIO.write((BufferedImage) itemp, "jpg", f);   
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-    
-    /**
-     * 修改图片大小类, 默认修改为0.6, 凡是设计上传文件的地方，必须使用！
-     * @param srcFilePath 图片资源位置
-     * @return
-     */
-    public static boolean reSize(String srcFilePath) {
-    	try {
-    		File file = new File(srcFilePath );
-			BufferedImage sourceImage = ImageIO.read(file);
-            int newwidth = (int) (sourceImage.getWidth() * 0.99);
-            double newheight = (int) sourceImage.getHeight() * 0.99;
-            ResampleOp resizeOp = new ResampleOp(newwidth, (int) newheight);
-            resizeOp.setFilter(ResampleFilters.getTriangleFilter());
-            BufferedImage resizedImage = resizeOp.filter(sourceImage, null);
-            ImageIO.write(resizedImage, srcFilePath.substring(srcFilePath.lastIndexOf(".") + 1), file);
-            return true;
-        } catch (Exception e) {
-        	return false;
-        }
-    }
-    public static boolean reSize(String srcFilePath, double width, double height) {
-    	try {
-    		File file = new File(srcFilePath );
-			BufferedImage sourceImage = ImageIO.read(file);
-            int newwidth = (int) (sourceImage.getWidth() * width);
-            double newheight = (int) sourceImage.getHeight() * height;
-            ResampleOp resizeOp = new ResampleOp(newwidth, (int) newheight);
-            resizeOp.setFilter(ResampleFilters.getTriangleFilter());
-            BufferedImage resizedImage = resizeOp.filter(sourceImage, null);
-            ImageIO.write(resizedImage, srcFilePath.substring(srcFilePath.lastIndexOf(".") + 1), file);
-            return true;
-        } catch (Exception e) {
-        	return false;
-        }
-    }
-
-
-
-
-    public static void main(String[] args) throws IOException {
-    	long l = System.currentTimeMillis();
-//    	reSize("D://abcdefgj1.jpg", 0.5, 0.5);
-//    	pressImage("D://Test.jpg", "D://test111.jpg", 350, 500, 1);
-    	// 设置水印
-    	press("D://Test.jpg", "D://test111.jpg", "深圳爱贝源科技有限公司", 350, 100, 350, 500);
-    	System.out.println(System.currentTimeMillis() - l);
-        // resize("C://pic//4.jpg", 1000, 500, true);
-    }
-
-
-}

wechat-common-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -6,59 +6,11 @@ package com.iamberry.wechat.tools;
  * @date 2016-4-19
  */
 public class ResultInfo {
-
-	public  static String SUCCESSCODE="200";
-	public  static String ERRORCODE="500";
-	
-	public static String getMoneyconditionGT = "提现金额必须大于";
-	public static String getMoneyconditionLT = ",小于";
-	
-	public static int getMoneyLimitDown=10000;
-	public static int getMoneyLimitTop=1000000000;
-	
-	public  static String getMoneyLimitError="";
-	public  static String getMoneyCountError="";
-
-	public  static String loginOutError = "";
-	public  static String paramFormatError = "";
-	public  static String withdrawCountOutError = "";
-	public  static String cartEmptyError = "";
-	public  static String cartNoStatusError = "商品已下架";
-	public  static String cartNoNumError = "商品已售空";
-	public  static String userMoneyOutError = "";
-	public  static String userNoDrpError = "";
-	
-	public  static String repeatNameError="";
-	public  static String lostMemberInfo="";
-
 	public  static String barCodePrefix="MACHINE_QR_CODE";
 	public  static String barCodeActivity="ACTIVITY_OPENID";
 	public  static String barCodeMainChannelId="main_channel_id_";
 	public  static String barCode="qrscene_";
-	/**
-	 * 初始化代理商信息openid成功前缀
-	 */
-	public  static String initPorxySuccessPrifix = "";										//	初始化代理商信息openid成功前缀
-	 /**
-	 * 初始化代理商信息成功后缀
-	 */
-	public  static String initPorxySuccessSuffix = "";										// 初始化代理商信息哦瓶内的成功后缀
-	/**
-	 * 激活码错误
-	 */
-	public  static String initPorxyErrorByCodeError = "";									// 激活码错误
-	/**
-	 * 已经激活
-	 */
-	public  static String initPorxyErrorByUseInit = "";										// 已经激活
-	/**
-	 * 多次绑定
-	 */
-	public  static String initPorxyErrorByUseBuild = "";									// 多次绑定
-	/**
-	 * 激活码错误
-	 */
-	public  static String initPorxyErrorByCodeWrong = "";									// 激活码错误
+
 	/**
 	 * 关注时默认回复文字内容 
 	 */
@@ -75,307 +27,13 @@ public class ResultInfo {
 	 * 异常时回复信息
 	 */
 	public  static String tryCatchDefaultResponseText = "";									
-	/**
-	 * 定时任务返利模板
-	 */
-	public static String rebateOrderText = "";												
-	/**
-	 * 下载二维码图片保存路径
-	 */
-	public static String QRCODE_IMAGE = "/common/qrcode_images";
 
-	public static String QRCODE_PLACE_IMAGE = "/common/qrcode_place_images";
-	
-	/**
-	 * 订单发货的界面
-	 */
-	public static String PAGE_SHIPMENT = "";
-	/**
-	 * 收益退回的界面
-	 */
-	public static String TUIHUI_SHIPMENT = "";
-	/**
-	 * 订单即将过期提醒
-	 */
-	public static String ORDER_GUOQI = "";
-	/**
-	 * 试用订单详情
-	 */
-	public static String TRY_ORDER_DETAIL = "";
-	/**
-	 * 租赁订单详情
-	 */
-	public static String RENT_ORDER_DETAIL = "";
-	/**
-	 * 订单详情
-	 */
-	public static String ORDER_DETAIL = "https://s.iamberry.com/soodo/wechat/order-details.html?orderId=";
-	/*配置首页*/
-	public static String INDEX_DETAIL = "https://s.iamberry.com/soodo/wechat/my-center.html";
-	/*积分列表*/
-	public static String INDEX_INTERGRAL = "https://mp.weixin.qq.com/s/5UWkQY2_ju9jxCt2rqK6wA";
-	/*优惠券列表*/
-	public static String INDEX_COUPON = "https://s.iamberry.com/soodo/wechat/coupon_list.html";
-	/**
-	 * <礼品卡>推荐人推送消息 跳转页面
-	 */
-	public static String AGENT_REFERRER_MACHINE_PAGE = "";
-	/**
-	 * 返现到账通知 		模版id 	TM00211 
-	 */
-	public static String rewards_template_id="";	//返现到账通知 		模版id 	TM00211
-	/**
-	 * 账户变更提醒 		模版id	TM00370
-	 */
-	public static String Income_template_id="";		//账户变更提醒 		模版id	TM00370
-	/**
-	 * 订单包裹跟踪通知 	模版id	TM00665
-	 */
-	public static String Shipment_template_id="";	//订单包裹跟踪通知 	模版id	TM00665 
 	/**
 	 * 订单未支付通知
 	 */
 	public static String Order_template_id="";		//订单未支付通知	 	模版id	TM00184
-	/**
-	 * 试用进度提醒
-	 */
-	public static String trial_progress_remind = "";	//试用进度提醒	 	模版id	TM00184
-	/**
-	 * 试用申请通知
-	 */
-	public static String probation_apply_notice="";	//试用申请通知	 	模版id	TM00184
-	/**
-	 * 试用申请成功通知
-	 */
-	public static String probation_apply_success="";	//试用申请成功通知	 	模版id	TM00184
-	/**
-	 * 订单支付成功
-	 */
-	public static String probation_pay_success="";	//订单支付成功	 	模版id	TM00184
-
-	/**
-	 * 首次注册推送信息
-	 */
-	public static String registered_template="";	//购买失败	 	模版id
-
-	/**
-	 * 生日赠送积分推送
-	 */
-	public static String birthday_template="";	//购买失败	 	模版id
-
-	/**
-	 * 购买失败
-	 */
-	public static String failed_purchase="";	//购买失败	 	模版id
-
-	/**
-	 * 618活动  参与成功
-	 */
-	public static String participate_in_success="";	//参与成功  模版id
-
-	/**
-	 * 618活动  助力成功
-	 */
-	public static String helping_success="";	//助力成功  模版id
-
-	/**
-	 *	积分变更
-	 */
-	public static String point_change="";	//积分变更  模版id
-
-	/**
-	 *生日赠送
-	 */
-	public static String birthday_gift="";	//生日赠送  模版id
-
-	/**
-	 * 订单关闭通知	 	模版id	TM00984
-	 */
-	public static String probation_shut_down="";
-	/**
-	 * 	付费代理商支付后推送推荐人通知  	模版id	
-	 */
-	public static String prize_receive_push="";
-
-	/**
-	 * 更换刷头提示信息 模板id
-	 */
-	public static String update_tooth_hint="";
-
-	/**
-	 * 用户申请退款提醒
-	 */
-	public static String order_apply_refund="";
-
-	/**
-	 * 用户 申请退货 提醒
-	 */
-	public static String order_apply_return="";
-
-	/**
-	 * 用户 申请换货 提醒
-	 */
-	public static String order_apply_barter="";
-
-	/**
-	 * 发货后 提醒
-	 */
-	public static String order_send_success="";
-
-	/**
-	 * 退款申请驳回
-	 */
-	public static String refund_to_dismiss="";
-
-	/**
-	 * 退款申请通知
-	 */
-	public static String refund_application_notice="";
-
-	/**
-	 * 返现到账通知消息模版
-	 */
-	public static String REWARDSREMINDTEMP =  "{'first':{'color':'#173177','value':'firstValueIamberry'}, order:{'color':'#173177','value':'orderValueIamberry'}, 'money':{'color':'#173177', 'value':'moneyValueIamberry'}, 'remark':{'color':'#173177','value':'remarkValueIamberry'}}";
-	
-	/** 	 包裹通知 	*/
-	public static String ORDERPACKAGETEMP = "{'first':{'color':'#173177', 'value':'firstValueOrder'}, 'order_id':{'color':'#173177','value':'orderIdValueOrder'}, 'package_id':{'color':'#173177','value':'orderValuePackageId'}, 'remark':{'color':'#173177', 'value':'orderRemarkValue'}}";
-	
-	/**  账户变更通知 	 */
-	public static String INCOMEREMINDTEMP = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'account':{'color':'#173177','value':'accountValueIamberry'}, 'time':{'color':'#173177', 'value':'timeValueIamberry'}, 'type':{'color':'#173177','value':'typeValueIamberry'},'remark':{'color':'#173177','value':'remarkValueIamberry'}}";
-	
-	/**  订单未支付（5分钟）通知 	*/
-	public static String ORDERWEIZHIFU = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'ordertape':{'color':'#173177','value':'ordertapeValue'}, 'ordeID':{'color':'#173177', 'value':'ordeIDVALUE'},'remark':{'color':'#173177','value':'remarkValueIamberry'}}";
-	
-	/** 	 试用进度提醒 	*/
-	public static String PROBATIONPUSH = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'keyword3':{'color':'#173177','value':'keyword3Value'},'keyword4':{'color':'#173177','value':'keyword4Value'},'remark':{'color':'#FF0000','value':'remarkValue'}}";
-	
-	/** 	 试用申请通知 	 */
-	public static String PROBATIONAPPLYNOTICE = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'#173177','value':'remarkValue'}}";
-
-	/** 	试用申请成功通知 	 */
-	public static String PROBATIONAPPLYSUCCESS = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'keyword3':{'color':'#173177','value':'keyword3Value'},'keyword4':{'color':'#173177','value':'keyword4Value'},'keyword5':{'color':'#173177','value':'keyword5Value'},'remark':{'color':'#173177','value':'remarkValue'}}";
-
-	/**		 试用订单支付成功   订单支付成功	 */
-	public static String PROBATIONPAYSUCCESS = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'orderMoneySum':{'color':'#173177','value':'orderMoneySumValue'}, 'orderProductName':{'color':'#173177', 'value':'orderProductNameValue'},'Remark':{'color':'#173177','value':'remarkValue'}}";
-
-	/** 	试用订单关闭通知		*/
-	public static String PROBATIONSHUTDOWN = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'transid':{'color':'#173177','value':'transidValue'}, 'fee':{'color':'#173177', 'value':'feeValue'}, 'pay_time':{'color':'#173177','value':'pay_timeValue'},'remark':{'color':'#173177','value':'remarkValue'}}";
-	
-	/** 	奖品领取通知 	*/
-	public static String PRIZERECEIVEPUSH = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'keyword3':{'color':'#173177','value':'keyword3Value'},'keyword4':{'color':'#173177','value':'keyword4Value'},'keyword5':{'color':'#173177','value':'keyword5Value'},'remark':{'color':'#FF0000','value':'remarkValue'}}";
-
-	/**  更换刷头提示信息  */
-	public static String UPDATETOOTHHINT= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'#173177','value':'remarkValue'}}";
-
-	/**  用户申请退款提醒 */
-	public static String APPLYREFUND= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'}, 'keyword3':{'color':'#173177', 'value':'keyword3Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
-
-	/**  用户 申请退货 提醒 */
-	public static String APPLYRETURN= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'}, 'keyword3':{'color':'#173177', 'value':'keyword3Value'}, 'keyword4':{'color':'#173177', 'value':'keyword4Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
-
-	/**  用户 申请换货 提醒 */
-	public static String APPLYBARTER= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
-
-	/**  发货后 提醒 */
-	public static String SENDSUCCESS= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'}, 'keyword3':{'color':'#173177', 'value':'keyword3Value'}, 'keyword4':{'color':'#173177', 'value':'keyword4Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
-
-	/**  退款申请驳回 */
-	public static String REFUNDSPPLICATIONREJECTED= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'orderProductPrice':{'color':'#173177','value':'keyword1Value'}, 'orderProductName':{'color':'#173177', 'value':'keyword2Value'}, 'orderName':{'color':'#173177', 'value':'keyword3Value'}, 'remark':{'color':'colorValue','value':'remarkValue'}}";
-
-	/** 退款申请通知 **/
-	public static String REFUNDAPPLICATIONNOTICE= "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'orderProductPrice':{'color':'#173177','value':'keyword1Value'}, 'orderProductName':{'color':'#173177', 'value':'keyword2Value'}, 'orderName':{'color':'#173177', 'value':'keyword3Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
-
-	/** 首次注册推送信息 **/
-	public static String REGISTEREDTEMPLATE = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'}, 'keyword3':{'color':'#173177', 'value':'keyword3Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
-
-	/** 生日赠送积分推送 **/
-	public static String BIRTHDAYTEMPLATE = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'remark':{'color':'#173177','value':'remarkValue'}}";
-
-	/** 618活动  参与成功 **/
-	public static String PARTICIPATEINSUCCESS =  "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'}, 'keyword3':{'color':'#173177', 'value':'keyword3Value'},  'keyword4':{'color':'#173177', 'value':'keyword4Value'}, 'remark':{'color':'colorValue','value':'remarkValue'}}";
-
-	/**  618活动  助力成功 **/
-	public static String HELPINGSUCCESS =  "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
-
-	/**  积分变更 **/
-	public static String POINTCHANGE =  "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
 
-	/**  生日赠送 **/
-	public static String BIRTHDAYGIFT =  "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'}, 'keyword3':{'color':'#173177','value':'keyword3Value'}, 'keyword4':{'color':'#173177', 'value':'keyword4Value'},'remark':{'color':'colorValue','value':'remarkValue'}}";
-
-	/**
-	 * 微信模板消息提示语
-	 */
-	public static final String REWARDSWILLMESSAGE = "尊敬的客户您好~您有新的返现即将入账~";
-	public static final String REWARDSHASMESSAGE  = "您有新的返现已入账~";
-	public static final String SHIPMENTMESSAGE  = "您的订单已发货~";
-	public static final String INTOSHOP = ""; //点击进入商城查看-->>
-	public static final String INCOMEAGREEMESSAGE = "您的提现已审核通过~已入账~";
-	public static final String INCOMEREJECTMESSAGE = "您的提现申请被拒绝~已经返回您的金额~";
-	public static final String NEXTUSERTUIHUOMESSAGE = "您的下线已退货~";
-	public static final String ORDERGUOQI = "您有订单未支付~";
-	public static final String ADDPROBATIONORDER = "您的下线有试用订单生成~";
-
-	public static final String REGISTERED = "小朵特意为您准备了礼物（线上口腔专家咨询），点击查看详情";
-	public static final String REGISTERED_TITLE = "欢迎您，小朵等您很久了哦";
-
-	public static final String PAYSUCCESS = "尊敬的用户，您好，您已成功支付";
-	public static final String PAYSUCCESSFOOT = "感谢您的支持，祝您使用愉快!";
-	public static final String sendRemark1 = "如有问题请致电400-678-1860或直接在微信留言，soodo上朵将第一时间为您服务！（点击查看订单详情）";
-	
-	//购物车活动
-	public static String ISSHOW="是";											//是否需要在页面显示
-	public static String CARTDESC="京东众筹价¥399，快快点我前往！";											//活动描述
-	public static String CART_URL="http://z.jd.com/project/details/53631.html?from=jr_search&type=0";											//跳转路径
-
-	//购物值
-	public static String NO_ENOUGH_FOR_PAY="账户余额不足";
-	public static String COUPON_OUTOFDATE="优惠券过期";
-	public static String COUPON_INVALID="优惠券无效";
-	public static String COUPON_CONSUME_NO_ENOUGH="消费额度不足,优惠券无法使用";
-	public static String COUPON_NO_MEMBER="非会员需要购买电动牙刷刷头才能使用该优惠券";
-	public static String COUPON_YOUHUI="优惠套装无法使用优惠券";
-	public static String COUPON_NO_TOOTH="该现金券需要订单中有电动牙刷才能使用";
-	public static String COUPON_NO_TOOTH_AMOUNT="不满足优惠条件";
-
-	public static String COUPONITEMSTATUS_NORMAL = "normal";
-	public static String COUPONITEMSTATUS_PASSED = "passed";
-	
-	//分享语
-	public static String shareOne="这个产品，作为新手爸爸，还是很喜欢的，真心觉得很方便，就这几天的使用给点建议，如果APP数据报表再直观点，这个产品就完美了，希望官方能改进，这么牛的产品还是值得推荐和分享的。";
-	public static String shareTwo="养娃不易啊！这产品应该早点出来，之前给宝宝冲奶都是跟老公猜拳决定的，谁输谁去，现在他都抢着冲奶，父爱泛滥了，哈哈，这个冲奶机真的好用哦，关键还不贵，强烈推荐！";
-	public static String shareThree="工作忙的很，宝宝一直是老人带，看到冲奶机时她还不让买呢，作为儿女，就是想给她减轻点负担，结果她用后连连夸赞，说用冲奶机给娃冲奶确实方便，还好我没省这点钱，话说回来，我们这么辛苦赚钱是为了啥，不就是为了给家人更好的生活吗？几百块就能解决大问题，多值啊！";
-	
-	/**
-	 * 开始试用的消息提示信息
-	 */
-	public static String PROBATION_FIRST_MSG = "感谢您参加美国Watero净饮水一体机试用计划，您的水机已派送上门，试用开始，有效期21天";
-	public static String PROBATION_END_MSG = "您享有21天免费试用，期待您体验满意！在签收日起7天内完成付款，加赠1年滤芯套餐（7个价值1098元）；8-14天内付款，赠送24泡的养生茶饮（2盒价值158元）；15-21天内付款，赠送Tritain材质时尚杯（1个，价值50元）";
-	
-	public static String PROBATION_FIRST = "感谢您试用美国Watero。";
-	public static String PROBATION_REMARK = "您的试用流程已结束，感谢您的试用。";
-	public static String PROBATION_START_FIRST = "感谢您申请试用美国Watero净饮水一体机";
-	public static String PROBATION_END_FIRST = "您的订单正在安排配送员派送中，请继续留意关注申请详情，谢谢。";
-
-
-	public static String HELP_FRIENDS = "亲爱的朵粉会员，您的朋友【USER】已献出一份支持，还差一点啦，继续加油哟~";
-	public static String HELP_SUCCESS = "USER，恭喜你已获得10名好友支持，快解锁福利";
-	public static String HELP_NAME = "【福利】 会员送送送！";
-	public static String HELP_REM_1 = "点击查看活动助力详情";
-	public static String HELP_REM_2 = "立即点击，领取您的免费刷头。";
-	public static String help_url;
-
-	public static String ACTIVITY_SUCCESS = "尊敬的soodo会员，您已成功报名该活动。";
-	public static String ACTIVITY_DATE = "2018-06-13至2018-06-21";
-	public static String SOODO_NAME = "soodo上朵公众号";
-	public static String ACTIVITY_REM = "请查看官方公众号活动页面";
-	public static String ACTIVITY_USER_REM = "点击查看我的活动信息。";
-
-
-	/**
-	 * 获取RST系统产品信息接口地址
-	 */
-	public static String GET_MACHINE_INFO = "";
-	public static String GET_TOOTH_INFO = "";
+	/**	测试 */
+	public static String PROBATIONPAYSUCCESS = "{}";
 
 }

wechat-common-tool/src/main/java/com/iamberry/wechat/tools/TextFilterUtil.java

@@ -1,161 +0,0 @@
-package com.iamberry.wechat.tools;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.stereotype.Component;
-
-
-@Component("textFilterUtil")
-public class TextFilterUtil {
-
-	//默认编码格式
-	  private static final String ENCODING = "utf-8";
-	  //敏感词库的路径
-	  private static final InputStream in = TextFilterUtil.class.getClassLoader().getResourceAsStream("keyWords.txt");
-	 /* private static final InputStream in2 =new FileInputStream(new File("D:/sensitive/keyWords.txt"));
-	  InputStreamReader lw=new InputStreamReader("D:/sensitive/keyWords.txt",ENCODING);*/
-	 /*try{
-		 InputStream in2 = new FileInputStream("D:\\demo.txt");//读取文件的数据。
-	 }catch(Exception ex){
-		 
-	 }*/
-	  
-	  //脏字库
-	  private static Set<Character> sensitiveCharSet = null;
-	  //敏感词库
-	  private static Set<String> sensitiveWordSet = null;
-	  /**
-	   * 初始化敏感词库
-	   */
-	  private static void init() {
-	    //初始化容器
-	    sensitiveCharSet = new HashSet<>();
-	    sensitiveWordSet = new HashSet<>();
-	    //读取文件 创建敏感词库
-	    readSensitiveWords();
-	  }
-	  /**
-	   * 读取本地的敏感词文件
-	   *
-	   * @return
-	   */
-	  public static void readSensitiveWords() {
-		  if(sensitiveWordSet!=null){
-			  return;
-		  }
-	    BufferedReader reader = null;
-	    sensitiveWordSet=new HashSet();
-	    sensitiveCharSet=new HashSet();
-	    try {
-	      //reader = new BufferedReader(new InputStreamReader(new FileInputStream("E:\\KeyWords.txt"), "utf-8"));
-	      reader = new BufferedReader(new InputStreamReader(in, "utf-8"));
-	      String line;
-	      while ((line = reader.readLine()) != null) {
-	        String word = line.trim();
-	       // System.out.println("nn:"+word);
-	        String[] aa = word.split("\\|");
-	        if(aa.length>0){
-	        	 for(String st:aa){
-	 	        	sensitiveWordSet.add(st);
-	 	        }
-	        }
-	        for (Character c : word.toCharArray()) {
-	        	if(c.equals("|")){
-	        		continue;
-	        	}
-	          sensitiveCharSet.add(c);
-	        }
-	      }
-	    } catch (UnsupportedEncodingException e) {
-	      System.out.println("敏感词库文件转码失败!");
-	    } catch (FileNotFoundException e) {
-	    	System.out.println("敏感词库文件不存在!");
-	    } catch (IOException e) {
-	    	System.out.println("敏感词库文件读取失败!");
-	    } finally {
-	      if (reader != null) {
-	        try {
-	          reader.close();
-	        } catch (IOException e) {
-	          e.printStackTrace();
-	        }
-	        reader = null;
-	      }
-	    }
-	    return;
-	  }
-	  /**
-	   * 检查敏感词
-	   *
-	   * @return
-	   */
-	  public static List<String> checkSensitiveWord(String text) {
-	    if (sensitiveWordSet == null || sensitiveCharSet == null) {
-	      init();
-	    }
-	    List<String> sensitiveWords = new ArrayList<>();
-	    for (int i = 0; i < text.length(); i++) {
-	      Character word = text.charAt(i);
-	      if (!sensitiveCharSet.contains(word)) {
-	        continue;
-	      }
-	      int j = i;
-	      while (j < text.length()) {
-	        if (!sensitiveCharSet.contains(word)) {
-	          break;
-	        }
-	        String key = text.substring(i, j + 1);
-	        if (sensitiveWordSet.contains(key)) {
-	          sensitiveWords.add(key);
-	        }
-	        j++;
-	      }
-	    }
-	    return sensitiveWords;
-	  }
-	
-	  /**
-	   * 替换敏感词为**
-	   *
-	   * @return
-	   */
-	  public static String checkAndReplaceSensitiveWord(String text) {
-	    if (sensitiveWordSet == null || sensitiveCharSet == null) {
-	      init();
-	    }
-
-	    for (int i = 0; i < text.length(); i++) {
-	      Character word = text.charAt(i);
-	      if (!sensitiveCharSet.contains(word)) {
-	        continue;
-	      }
-	      int j = i;
-	      while (j < text.length()) {
-	        if (!sensitiveCharSet.contains(word)) {
-	          break;
-	        }
-	        String key = text.substring(i, j + 1);
-	        if (sensitiveWordSet.contains(key)) {
-	          text=text.replace(key, "**");
-	        }
-	        j++;
-	      }
-	    }
-	    return text;
-	  }
-}
-
-
-

wechat-common-tool/src/main/java/com/iamberry/wechat/tools/loadResultUtil.java

@@ -13,85 +13,20 @@ public class loadResultUtil {
 	public loadResultUtil(){
 		logger.info("loadResultInfo启动");
 		load();
-//		test();
 	}
 	public static void load() {
 		logger.info("loadResultInfo.load启动");
 		Properties prop = new Properties();
 		try {
 			prop.load(Thread.currentThread().getContextClassLoader().getResourceAsStream(loadResultUtil.fileName));
-			ResultInfo.SUCCESSCODE=prop.getProperty("SUCCESSCODE");
-			ResultInfo.ERRORCODE=prop.getProperty("ERRORCODE");
-			//购物车活动字段
-			ResultInfo.ISSHOW=prop.getProperty("ISSHOW");
-			ResultInfo.CARTDESC=prop.getProperty("CARTDESC");
-			ResultInfo.CART_URL=prop.getProperty("CART_URL");
-			
-			ResultInfo.getMoneyLimitDown=Integer.parseInt(prop.getProperty("getMoneyLimitDown"));
-			ResultInfo.getMoneyLimitTop=Integer.parseInt(prop.getProperty("getMoneyLimitTop"));
-			ResultInfo.getMoneyLimitError=prop.getProperty("getMoneyLimitError");
-			ResultInfo.getMoneyCountError=prop.getProperty("getMoneyCountError");
 
-			ResultInfo.loginOutError = prop.getProperty("loginOutError");
-			ResultInfo.paramFormatError = prop.getProperty("paramFormatError");
-			ResultInfo.withdrawCountOutError =prop.getProperty("withdrawCountOutError");
-			ResultInfo.cartEmptyError = prop.getProperty("cartEmptyError");
-			ResultInfo.userMoneyOutError = prop.getProperty("userMoneyOutError");
-			ResultInfo.userNoDrpError = prop.getProperty("userNoDrpError");
-			
-			ResultInfo.repeatNameError=prop.getProperty("repeatNameError");
-			ResultInfo.lostMemberInfo=prop.getProperty("lostMemberInfo");
-			
-			ResultInfo.initPorxySuccessPrifix=prop.getProperty("initPorxySuccessPrifix");
-			ResultInfo.initPorxySuccessSuffix=prop.getProperty("initPorxySuccessSuffix");
-			ResultInfo.initPorxyErrorByCodeError=prop.getProperty("initPorxyErrorByCodeError");
-			ResultInfo.initPorxyErrorByUseInit=prop.getProperty("initPorxyErrorByUseInit");
-			ResultInfo.initPorxyErrorByUseBuild=prop.getProperty("initPorxyErrorByUseBuild");
-			ResultInfo.initPorxyErrorByCodeWrong=prop.getProperty("initPorxyErrorByCodeWrong");
 			ResultInfo.subDefaultResponseText=prop.getProperty("subDefaultResponseText");
 			ResultInfo.messageDefaultResponseText=prop.getProperty("messageDefaultResponseText");
 			ResultInfo.messageIsNullResponseText=prop.getProperty("messageIsNullResponseText");
 			ResultInfo.tryCatchDefaultResponseText=prop.getProperty("tryCatchDefaultResponseText");
-			ResultInfo.rebateOrderText=prop.getProperty("rebateOrderText");
-			
-			ResultInfo.PAGE_SHIPMENT = prop.getProperty("PAGE_SHIPMENT"); 			// 订单发货的界面
-			ResultInfo.TUIHUI_SHIPMENT = prop.getProperty("TUIHUI_SHIPMENT"); 		//收益退回的界面
-			ResultInfo.ORDER_GUOQI = prop.getProperty("ORDER_GUOQI"); 				//订单即将过期提醒
-			ResultInfo.TRY_ORDER_DETAIL = prop.getProperty("TRY_ORDER_DETAIL");		//试用订单详情
-			ResultInfo.RENT_ORDER_DETAIL = prop.getProperty("RENT_ORDER_DETAIL");		//租赁订单详情
-			ResultInfo.AGENT_REFERRER_MACHINE_PAGE = prop.getProperty("AGENT_REFERRER_MACHINE_PAGE");		//推荐人点击模板消息跳转链接
+
 			//消息的模板id
-			ResultInfo.rewards_template_id = prop.getProperty("rewards_template_id");		//返现到账通知 		模版id 	TM00211
-			ResultInfo.Income_template_id = prop.getProperty("Income_template_id");			//账户变更提醒 		模版id	TM00370
-			ResultInfo.Shipment_template_id = prop.getProperty("Shipment_template_id");		//订单包裹跟踪通知 	模版id	TM00665
 			ResultInfo.Order_template_id = prop.getProperty("Order_template_id");			//订单未支付通知 	模版id	TM00184
-			
-			ResultInfo.trial_progress_remind = prop.getProperty("trial_progress_remind");	//试用进度提醒
-			ResultInfo.probation_apply_notice = prop.getProperty("probation_apply_notice");	//试用申请通知
-			ResultInfo.probation_apply_success = prop.getProperty("probation_apply_success");//试用申请成功通知
-			ResultInfo.probation_pay_success = prop.getProperty("probation_pay_success");	//订单支付成功
-			ResultInfo.probation_shut_down = prop.getProperty("probation_shut_down");		//订单关闭通知	 	模版id	TM00984
-			ResultInfo.prize_receive_push = prop.getProperty("prize_receive_push");			//付费代理商支付后推送推荐人通知  	模版id
-			ResultInfo.update_tooth_hint = prop.getProperty("update_tooth_hint");			//订单支付成功
-			ResultInfo.order_apply_refund = prop.getProperty("order_apply_refund");			//用户申请退款提醒
-			ResultInfo.order_apply_return = prop.getProperty("order_apply_return");			//用户 申请退货 提醒
-			ResultInfo.order_apply_barter = prop.getProperty("order_apply_barter");			//用户 申请换货 提醒
-			ResultInfo.order_send_success = prop.getProperty("order_send_success");			//发货后 提醒
-			ResultInfo.refund_to_dismiss = prop.getProperty("refund_to_dismiss");			//退款申请驳回
-			ResultInfo.refund_application_notice = prop.getProperty("refund_application_notice");			//退款申请通知
-
-			ResultInfo.registered_template = prop.getProperty("registered_template");	//首次注册推送信息
-			ResultInfo.birthday_template = prop.getProperty("birthday_template");			//生日赠送积分推送
-
-			ResultInfo.participate_in_success = prop.getProperty("participate_in_success");			// 618活动  参与成功
-			ResultInfo.helping_success = prop.getProperty("helping_success");			//618活动  助力成功
-			ResultInfo.help_url = prop.getProperty("ACTIVITY_URL");			//618活动  助力成功
-
-			ResultInfo.point_change = prop.getProperty("point_change");			//618活动  助力成功
-			ResultInfo.birthday_gift = prop.getProperty("birthday_gift");			//618活动  助力成功
-
-			ResultInfo.GET_MACHINE_INFO = prop.getProperty("GET_MACHINE_INFO");			//产品-RST
-			ResultInfo.GET_TOOTH_INFO = prop.getProperty("GET_TOOTH_INFO");			//产品-RST
 		} catch (IOException e) {
 			new RuntimeException(e.getMessage());
 		}

wechat-wechat-interface/src/main/java/com/iamberry/wechat/face/member/MemberService.java

@@ -1,6 +1,5 @@
 package com.iamberry.wechat.face.member;
 
-import com.iamberry.wechat.core.entity.Page;
 import com.iamberry.wechat.core.entity.member.Member;
 import com.iamberry.wechat.core.entity.page.PageRequest;
 import com.iamberry.wechat.core.entity.page.PagedResult;

wechat-wechat-service/src/main/java/com/iamberry/wechat/service/ImberryConfig.java

@@ -1,82 +0,0 @@
-package com.iamberry.wechat.service;
-
-import java.io.InputStream;
-import java.util.Properties;
-
-public class ImberryConfig {
-
-//	public static String SMS_USERNAME = "";
-//	public static String SMS_PASSWORD = "";
-//	public static String SMS_TEXT = "";
-//	public static String SMS_URL = "";
-	public static String SINA_IP_URL = "";
-	public static String MASTERSECRET="";
-	public static String APPKEY="";
-	public static String CDN_URL="";
-	public static String BASE_URL=""; //头像前缀
-	/**		云片请求地址	*/
-	public static String INTER_SMS_URL=""; 
-	/**		短信验证码模板		*/	
-	public static String INTER_SMS_TEXT=""; 
-	/**   租赁类型1短信模板      */
-	public static String INTER_SMS_RENT_TYPE1_TEXT="";
-	/**   租赁类型1短信模板      */
-	public static String INTER_SMS_RENT_TYPE2_TEXT="";
-	/**   租赁类型1短信模板      */
-	public static String INTER_SMS_RENT_TYPE3_TEXT="";
-	/**		云片key	*/
-	public static String INTER_SMS_KEY=""; 
-	/**		发送给收货人的试用进度提醒	7天		*/
-	public static String PROBATION_SUCCESS_FIRST_TEXT = "";
-	/**		发送给收货人的试用进度提醒	14天		*/
-	public static String PROBATION_SUCCESS_SECOND_TEXT = "";
-	/**		发送给收货人的试用进度提醒	21天		*/
-	public static String PROBATION_SUCCESS_THIRD_TEXT = "";
-	/**       租赁支付成功后发送给收货人租赁信息      */
-	public static String LEASE_ORDER_SUCCESS_TEXT = "";
-
-	/**手动推送发货信息**/
-	public static String INFORM_SHIPPING = "";
-
-	public static String ORDER_UPDATE_STATUS_TEXT = "";
-	/**发送待处理订单信息**/
-	public static String PENDING_ORDER_REMINDER = "";
-
-	/*给手机发送验证码*/
-	public static String SEND_VERIFICATION_PHONE = "";
-
-	static {
-		Properties pro = new Properties();
-		InputStream in = ImberryConfig.class.getClassLoader().getResourceAsStream("iamberry-app-service-config.properties");
-		try {
-			pro.load(in);
-//			SMS_USERNAME = pro.getProperty("SMS_USERNAME");
-//			SMS_PASSWORD = pro.getProperty("SMS_PASSWORD");
-//			SMS_TEXT = pro.getProperty("SMS_TEXT");
-//			SMS_URL = pro.getProperty("SMS_URL");
-			SINA_IP_URL = pro.getProperty("SINA_IP_URL");
-			MASTERSECRET=pro.getProperty("master_secret");
-			APPKEY=pro.getProperty("appkey");
-			CDN_URL=pro.getProperty("cdnUrl");
-			BASE_URL=pro.getProperty("base_url");
-			INTER_SMS_URL=pro.getProperty("INTER_SMS_URL");
-			INTER_SMS_TEXT=pro.getProperty("INTER_SMS_TEXT");
-			INTER_SMS_RENT_TYPE1_TEXT=pro.getProperty("INTER_SMS_RENT_TYPE1_TEXT");
-			INTER_SMS_RENT_TYPE2_TEXT=pro.getProperty("INTER_SMS_RENT_TYPE2_TEXT");
-			INTER_SMS_RENT_TYPE3_TEXT=pro.getProperty("INTER_SMS_RENT_TYPE3_TEXT");
-			INTER_SMS_KEY=pro.getProperty("INTER_SMS_KEY");
-			PROBATION_SUCCESS_FIRST_TEXT = pro.getProperty("PROBATION_SUCCESS_FIRST_TEXT");
-			PROBATION_SUCCESS_SECOND_TEXT = pro.getProperty("PROBATION_SUCCESS_SECOND_TEXT");
-			PROBATION_SUCCESS_THIRD_TEXT = pro.getProperty("PROBATION_SUCCESS_THIRD_TEXT");
-			LEASE_ORDER_SUCCESS_TEXT = pro.getProperty("LEASE_ORDER_SUCCESS_TEXT");
-			INFORM_SHIPPING = pro.getProperty("INFORM_SHIPPING");
-			ORDER_UPDATE_STATUS_TEXT = pro.getProperty("ORDER_UPDATE_STATUS_TEXT");
-			PENDING_ORDER_REMINDER = pro.getProperty("PENDING_ORDER_REMINDER");
-
-			SEND_VERIFICATION_PHONE = pro.getProperty("SEND_VERIFICATION_PHONE");
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-}

wechat-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/MemberMapper.java

@@ -1,6 +1,5 @@
 package com.iamberry.wechat.service.mapper;
 
-import com.iamberry.wechat.core.entity.Page;
 import com.iamberry.wechat.core.entity.member.Member;
 
 import java.util.List;
@@ -30,13 +29,7 @@ public interface MemberMapper {
 	 * @return
 	 */
 	Integer getCount();
-	/**
-	 * 分页显示用户信息
-	 * @param page
-	 * @return
-	 */
-	List<Member> getMemberByPage(Page page);
-	
+
 	/**
 	 * 修改用可用积分
 	 * @param member
@@ -60,67 +53,6 @@ public interface MemberMapper {
 	 */
 	public Integer updateUserUseIntegral(Member member);
 	
-	/**
-	 * 分页查询微代理下线会员信息
-	 * @param page
-	 * @return
-	 */
-	public List<Member> selectUserIntegralByWechatProxyId(Page page);
-	Member selectUserIdentityAndQrcodeByOpenId(String openid);
-	List<Member> getMemberByFuzzy();
-	
-	/**
-	 * 根据用户openid，获取用户来源、用户身份
-	 * @param openid
-	 * @return
-	 */
-	public Member selectUserResAndIdSByOpenId(String openid);
-	
-	/**
-	 * 根据 openid 修改用户可用金额
-	 * 2016年5月4日
-	 * @param member
-	 * @return
-	 */
-	public Integer updateUserIncomeByOpenId(Member member);
-	
-	/**
-	 * 根据用户openid，修改用户绑定状态
-	 * @param openId
-	 * @return
-	 */
-	public Integer updateUserFlagByOpenId(String openId);
-	
-	/**
-	 * 根据userid获取当前用户的“下线人数”和“已购买人数”
-	 * 2016年5月11日
-	 * @return
-	 */
-	public List<Integer> selectDownCountByUserId(Integer userId);
-	
-	/**
-	 * 根据openid 修改用户的是否购买
-	 * 2016年11月2日
-	 * mzx
-	 * @return
-	 */
-	public Integer updateIsBaughtByOpenid(Member member);
-
-
-	/**
-	 *个人分销员
-	 *根据placeInfo查询个人用户的个数
-	 *@paramplaceInfo
-	 *@return
-	 */
-	Integer getOrdinaryNumber(Member member);
-
-
-	/**
-	 *后台-Drp分销管理主界面-->获取个人分销员的下线列表
-	 */
-	List<Member> getOrdinary(Member member);
-
 
 	/**
 	 * 获取个人信息
@@ -129,14 +61,6 @@ public interface MemberMapper {
 	Member getMyMemberInfo(String userOpenid);
 
 	/**
-	 * 根据 openid 修改用户待入账积分
-	 * 2018年1月10日17:18:39
-	 * @param member
-	 * @return
-	 */
-	Integer updateUserStayIntegralByOpenId(Member member);
-
-	/**
 	 * 修改个人信息
 	 * @param member
 	 * @return
@@ -144,19 +68,6 @@ public interface MemberMapper {
 	Integer updateMyMember(Member member);
 
 	/**
-	 * 获取所有的注册人数
-	 * @return
-	 */
-	Integer getRegisteredNumber();
-
-	/**
-	 * 获取当天生日的人。送生日福利
-	 * @param member
-	 * @return
-	 */
-	List<Member> getBirthday(Member member);
-
-	/**
 	 * 修改数据
 	 * @param  member
 	 * @return Integer

wechat-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/WithdrawMapper.java

@@ -1,74 +0,0 @@
-package com.iamberry.wechat.service.mapper;
-
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.Page;
-import com.iamberry.wechat.core.entity.member.Withdraw;
-
-
-public interface WithdrawMapper {
-	
-	
-	/**
-	 * 查询总条数，和总金额
-	 * @return
-	 */
-	List<Withdraw> selectWithDrawAllSumMoney(Page page);
-	
-	
-	/**
-	 * 根据用户条件查找
-	 * @return
-	 */
-	List<Withdraw> selectWithDraw(Page page);
-	/**
-	 * 获取所有记录数量 
-	 * @return
-	 */
-	Integer getCount();
-	/**
-	 * 更新一条提现记录
-	 * @param withdraw
-	 */
-	void updateWithdraw(Withdraw withdraw);
-	
-	/**
-	 * 添加一条申请记录
-	 * @param withdraw
-	 * @return
-	 */
-	public Integer insertApplyLogs(Withdraw withdraw);
-	
-	/**
-	 * 分页查询提现记录
-	 * @param page
-	 * @return
-	 */
-	public List<Withdraw> selectLogsByOpenid(Page page);
-	
-	/**
-	 * 分页的总数据
-	 */
-	public Integer selectLogsCountByOpenid(Page page);
-	
-	/**
-	 * 根据ID，查询提现记录
-	 * @param id
-	 * @return
-	 */
-	public Withdraw selectWithdrawLogsById(Integer id);
-	
-	/**
-	 * 修改提现记录
-	 * @param withdraw
-	 * @return
-	 */
-	public Integer updateWithdrawStatusById(Withdraw withdraw);
-	
-	/**
-	 * 根据用户openid，获取当月申请提现记录次数
-	 * @param withdraw
-	 * @return
-	 */
-	public int selectUseLogsCount(Withdraw withdraw);
-}

wechat-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/withdrawMapper.xml

@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- 命名，每一个映射对象不一样 namespace:必须与对应的接口全类名一致 -->
-<mapper namespace="com.iamberry.wechat.service.mapper.WithdrawMapper">
- 	<resultMap type="Withdraw" id="withdraws">
-		<id column="withdrawals_logs_id" property="withdrawalsLogsId" />
-		<result column="withdrawals_openid" property="withdrawalsOpenid" />
-		<result column="withdrawals_logs_integral_num" property="withdrawalsLogsIntegralNum" />
-		<result column="withdrawals_logs_amount" property="withdrawalsLogsAmount" />
-		<result column="withdrawals_logs_date" property="withdrawalsLogsDate" />
-		<result column="withdrawals_username" property="withdrawalsUsername" />
-		<result column="withdrawals_tel" property="withdrawalsTel" />
-		<result column="withdrawals_status" property="withdrawalsStatus" />
-		<result column="withdrawals_remark" property="withdrawalsRemark" />
-	</resultMap> 
-	<sql id="allField">
-		withdrawals_logs_id withdrawalsLogsId,
-		withdrawals_openid withdrawalsOpenid,
-		withdrawals_logs_integral_num withdrawalsLogsIntegralNum,
-		withdrawals_logs_amount withdrawalsLogsAmount,
-		withdrawals_logs_date withdrawalsLogsDate,
-		withdrawals_username withdrawalsUsername,
-		withdrawals_tel withdrawalsTel,
-		withdrawals_status withdrawalsStatus,
-		withdrawals_remark withdrawalsRemark,
-		WITHDRAWALS_CARD_NO WITHDRAWALSCARDNO,
-		WITHDRAWALS_BANK_NAME WITHDRAWALSBANKNAME
-	</sql>
-	<select id="getCount" resultType="int">
-		select count(withdrawals_logs_id) 
-		from 
-		tb_iamberry_user_integral_withdrawals_logs
-	</select>
-	<!-- 用户提现修改 -->
-	<update id="updateWithdraw" parameterType="Withdraw">
-		update tb_iamberry_user_integral_withdrawals_logs
-		<set>
-			<if test="withdrawals_openid!=null">
-				withdrawals_openid = #{withdrawalsOpenid}
-			</if>
-			<if test="withdrawals_logs_integral_num!=null">
-				withdrawals_logs_integral_num = #{withdrawalsLogsIntegralNum}
-			</if>
-			<if test="withdrawals_logs_amount!=null">
-				withdrawals_logs_amount = #{withdrawalsLogsAmount}
-			</if>
-			<if test="withdrawals_logs_date!=null">
-				withdrawals_logs_date = #{withdrawalsLogsDate}
-			</if>
-			<if test="withdrawals_username!=null">
-				withdrawals_username = #{withdrawalsUsername}
-			</if>
-			<if test="withdrawals_tel!=null">
-				withdrawals_tel = #{withdrawalsTel}
-			</if>
-			<if test="withdrawals_status!=null">
-				withdrawals_status = #{withdrawalsStatus}
-			</if>
-		</set>
-		where withdrawals_logs_id = #{withdrawalsLogsId}
-	</update>
-	
-	<!-- 添加一条申请记录 -->
-	<insert id="insertApplyLogs" parameterType="Withdraw"
-		useGeneratedKeys="true" keyProperty="withdrawalsLogsId">
-		INSERT INTO 
-		 	TB_IAMBERRY_USER_INTEGRAL_WITHDRAWALS_LOGS
-		 		(
-			 		WITHDRAWALS_OPENID, WITHDRAWALS_LOGS_INTEGRAL_NUM,
-			 		WITHDRAWALS_LOGS_AMOUNT, WITHDRAWALS_LOGS_DATE, WITHDRAWALS_USERNAME,
-			 		WITHDRAWALS_TEL, WITHDRAWALS_STATUS,WITHDRAWALS_CARD_NO,
-			 		WITHDRAWALS_BANK_NAME
-				)
-		 VALUES 
-		  	( 
-			  #{withdrawalsOpenid},  
-			  #{withdrawalsLogsIntegralNum},
-			  #{withdrawalsLogsAmount}, 
-			  #{withdrawalsLogsDate},
-			  #{withdrawalsUsername},
-			  #{withdrawalsTel},
-			  #{withdrawalsStatus},
-			  #{withdrawalsCardNo},
-			  #{withdrawalsBankName}
-		  	)
-	</insert>
-	
-	<!-- 分页查询用户提现记录 -->
-	<select id="selectLogsByOpenid" parameterType="Page" resultType="Withdraw">
-		SELECT 
-			<include refid="allField"/>
-		FROM
-			TB_IAMBERRY_USER_INTEGRAL_WITHDRAWALS_LOGS
-		<if test="params.openid != null">
-		WHERE
-			WITHDRAWALS_OPENID = #{params.openid}
-		</if>
-		ORDER BY
-			WITHDRAWALS_LOGS_DATE DESC
-		LIMIT #{pageNo}, #{pageSize}
-	</select>
-	
-	<!-- 根据ID，查询提现记录 -->
-	<select id="selectWithdrawLogsById" parameterType="Integer" resultType="Withdraw">
-		SELECT 
-			<include refid="allField"/>
-		FROM
-			TB_IAMBERRY_USER_INTEGRAL_WITHDRAWALS_LOGS
-		WHERE
-			WITHDRAWALS_LOGS_ID = #{logsid}
-	</select>
-	
-	<!-- 条件总数 -->
-	<select id="selectLogsCountByOpenid" parameterType="Page" resultType="Integer">
-		SELECT 
-			COUNT(WITHDRAWALS_LOGS_ID)
-		FROM
-			TB_IAMBERRY_USER_INTEGRAL_WITHDRAWALS_LOGS
-		<if test="params.openid != null">
-		WHERE
-			WITHDRAWALS_OPENID = #{params.openid}
-		</if>
-	</select>
-	
-	<!-- 当前用户，已提现次数 -->
-	<select id="selectUseLogsCount" parameterType="Withdraw" resultType="Integer">
-		SELECT 
-			COUNT(WITHDRAWALS_LOGS_ID)
-		FROM
-			TB_IAMBERRY_USER_INTEGRAL_WITHDRAWALS_LOGS
-		WHERE
-			WITHDRAWALS_LOGS_DATE >= #{withdrawalsLogsDate} AND WITHDRAWALS_OPENID = #{withdrawalsOpenid}
-	</select>
-	
-	
-	
-	<select id="selectWithDrawAllSumMoney" parameterType="Page" resultType="Withdraw">
-		SELECT
-			withdrawals_status withdrawalsStatus,count(1)  withdrawalsLogsIntegralNum,IFNULL(sum(withdrawals_logs_amount),0)  sumMoney
-		FROM 
-			TB_IAMBERRY_USER_INTEGRAL_WITHDRAWALS_LOGS 
-		where 1=1
-			<if test="params.userInput!=null and params.userInput!=''">
-				 AND withdrawals_username LIKE CONCAT('%',#{params.userInput},'%')  
- 				 OR withdrawals_tel LIKE  CONCAT('%',#{params.userInput},'%')
-			</if>
-			<if test="params.beginDate!=null and params.beginDate!='' and params.endDate!=null and params.endDate!=''">
-				 AND DATE(withdrawals_logs_date) BETWEEN #{params.beginDate} AND #{params.endDate}
-			</if>
-				 group by  withdrawals_status 
-				
-	</select>
-	
-	
-	<select id="selectWithDraw" parameterType="Page" resultType="Withdraw">
-		SELECT
-			<include refid="allField" />
-		FROM 
-			TB_IAMBERRY_USER_INTEGRAL_WITHDRAWALS_LOGS 
-		where 1=1
-			<if test="params.userInput!=null and params.userInput!=''">
-				 AND withdrawals_username LIKE CONCAT('%',#{params.userInput},'%')  
- 				 OR withdrawals_tel LIKE  CONCAT('%',#{params.userInput},'%')
-			</if>
-			<if test="params.beginDate!=null and params.beginDate!='' and params.endDate!=null and params.endDate!=''">
-				 AND DATE(withdrawals_logs_date) BETWEEN #{params.beginDate} AND #{params.endDate}
-			</if>
-			<if test="params.status!=null and params.status!=''">
-				 AND withdrawals_status != #{params.status}
-			</if>
-			
-			
-		ORDER BY withdrawals_logs_date DESC 
-		<if test="pageNo>=0 and pageSize>0 ">
-		LIMIT 
-			${pageNo},${pageSize}
-		</if>	
-	</select>
-	<!-- 修改订单信息 -->
-	<update id="updateWithdrawStatusById" parameterType="Withdraw">
-		UPDATE 
-			TB_IAMBERRY_USER_INTEGRAL_WITHDRAWALS_LOGS 
-		SET 
-			WITHDRAWALS_STATUS = #{withdrawalsStatus},
-			withdrawals_remark = #{withdrawalsRemark}
-		WHERE
-			WITHDRAWALS_LOGS_ID = #{withdrawalsLogsId}
-	</update>
-</mapper>

wechat-wechat-service/src/main/java/com/iamberry/wechat/service/wechat/WeChatServiceImpl.java

@@ -11,7 +11,6 @@ import com.iamberry.wechat.service.MessageUtil;
 import com.iamberry.wechat.tools.*;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -118,18 +117,14 @@ public class WeChatServiceImpl implements WeChatService {
 							"<MsgType><![CDATA[transfer_customer_service]]></MsgType></xml>";
 				}
 
-				// 激活码为“CODE”开头 则为代理商绑定
-				if (content.startsWith(NameUtils.getConfig("PLACE_CODE_PREFIX"))) {
-					content = StringUtils.trim(content);
-					respContent = bulidPlace(content, fromUserName);
+				// 激活码为“CODE”开头 二维码在此处理
+
+				// 文本类型的消息处理
+				Status status = messageHandler(content, requestMap, fromUserName, toUserName, createTime+"");
+				if (status.isFlag()) {
+					return respContent = status.getCountext();
 				} else {
-					// 文本类型的消息处理
-					Status status = messageHandler(content, requestMap, fromUserName, toUserName, createTime+"");
-					if (status.isFlag()) {
-						return respContent = status.getCountext();
-					} else {
-						respContent = status.getCountext();
-					}
+					respContent = status.getCountext();
 				}
 			} else if(msgType.equals(MessageUtil.REQ_MESSAGE_TYPE_IMAGE)){
 				// 图片消息
@@ -383,18 +378,6 @@ public class WeChatServiceImpl implements WeChatService {
 	}
 
 	/**
-	 * 绑定代理商信息（激活 微信openid绑定商户）
-	 * @param content
-	 * @param fromUserName
-	 * @return
-	 */
-	public String bulidPlace(String content, String fromUserName) {
-		// 判断此代理商信息
-		String ruleStr = content;
-		return ResultInfo.initPorxySuccessPrifix + ruleStr + ResultInfo.initPorxySuccessSuffix;
-	}
-
-	/**
 	 * 已关注用户扫描二维码事件
 	 * @param requestMap
 	 * @param fromUserName

wechat-wechat-web/src/main/java/com/iamberry/wechat/handles/wechat/event/WeChatHandler.java

@@ -7,15 +7,12 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.iamberry.wechat.tools.ImageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.iamberry.wechat.face.wechat.WeChatService;
-import com.iamberry.wechat.tools.NameUtils;
-import com.iamberry.wechat.tools.SignUtil;
 
 /**
  * description ： 微信交互handler

wechat-wechat-web/src/main/resources/iamberry-app-service-config.properties

@@ -1,29 +0,0 @@
-#SMS_USERNAME=aibeiyuan
-#SMS_PASSWORD=aibeiyuan632
-#SMS_TEXT=\u3010\u6BD4\u6BD4\u840C\u3011\u60A8\u7684\u9A8C\u8BC1\u7801\u662F\uFF1A{0}\uFF0C\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1z
-#SMS_URL=http://115.29.44.189:8080/sms/smsInterface.do
-SINA_IP_URL=http://int.dpool.sina.com.cn/iplookup/iplookup.php?format=json&ip={0}
-APPID=wxe9e992877625202f
-MCH_ID=1316959401
-SECRET=ae12dfeca278d7e4f15047313d453733
-UNIFIED_ORDER_CALLBACK_URL=demo.tronsis.com
-master_secret=ffd6373d25f9e36ba6e9d7c3
-appkey=cef2f16aa36424f2a6d4ca60
-cdnUrl=http://cms.iamberry.com/cdn
-base_url=http://app.iamberry.com/imberry
-INTER_SMS_URL=https://sms.yunpian.com/v2/sms/single_send.json
-INTER_SMS_TEXT=\u3010\u4E0A\u6735\u5FAE\u5546\u57CE\u3011\u60A8\u7684\u9A8C\u8BC1\u7801\u662F{0}\uFF0C3\u5206\u949F\u5185\u6709\u6548\u3002\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1
-INTER_SMS_RENT_TYPE1_TEXT=\u3010\u7F8E\u56FDwatero\u3011\u611F\u8C22\u60A8\u79DF\u7528watero\u51C0\u6C34\u673A\uFF0C\u79DF\u671F{0}\u5E74\uFF01\u5DF2\u6536\u5230\u60A8\u7684\u62BC\u91D1{1}\u5143\uFF0C\u670D\u52A1\u8D39{2}\u5143\uFF08\u79DF\u671F\u5185\u5C06\u63D0\u4F9B\u6EE4\u82AF\u514D\u8D39\u66F4\u6362\u670D\u52A1\uFF09\u3002
-INTER_SMS_RENT_TYPE2_TEXT=\u3010\u7F8E\u56FDwatero\u3011\u611F\u8C22\u60A8\u79DF\u7528watero\u51C0\u6C34\u673A\uFF0C\u79DF\u671F{0}\u5E74\uFF01\u5DF2\u4E3A\u60A8\u514D\u53BB{1}\u5143\u62BC\u91D1\uFF0C\u6536\u5230\u670D\u52A1\u8D39{2}\u5143\uFF08\u79DF\u671F\u5185\u5C06\u63D0\u4F9B\u6EE4\u82AF\u514D\u8D39\u66F4\u6362\u670D\u52A1\uFF09\u3002
-INTER_SMS_RENT_TYPE3_TEXT=\u3010\u7F8E\u56FDWatero\u3011\u611F\u8C22\u60A8\u79DF\u7528watero\u51C0\u6C34\u673A\uFF01\u6536\u52303\u5E74\u670D\u52A1\u8D39{0}\u5143\u3002\u4F18\u60E0\uFF1A\u51C0\u6C34\u673A\u9001\u7ED9\u60A8\uFF0C\u5E76\u591A\u9001\u60A81\u5E74\u79DF\u671F\u3002\uFF08\u79DF\u671F\u51714\u5E74\uFF09
-INTER_SMS_KEY=2d3cc4afa42ec747b43a09ab89151133
-LEASE_ORDER_SUCCESS_TEXT=\u3010\u7F8E\u56FDwatero\u3011\u60A8\u5728{0}\u79DF\u7528\u4E86\u7F8E\u56FD\u51C0\u996E\u6C34\u4E00\u4F53\u673A\uFF0C\u79DF\u91D1\u4E3A{1}\uFF0C\u603B\u53EF\u7528\u6C34\u91CF\u4E3A{2}\uFF0C\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1
-# try order duan xin message
-PROBATION_SUCCESS_FIRST_TEXT=\u3010\u7F8E\u56FDwatero\u3011\u5C0A\u656C\u7684\u4F1A\u5458\u60A8\u597D\uFF01\u60A8\u7684\u8BD5\u7528\u8BA2\u535516\u5929\u540E\u5C06\u5230\u671F\uFF0C\u8BF7\u8FDB\u5165\u5FAE\u4FE1\u516C\u4F17\u53F7\u67E5\u770B\u8BA2\u5355\u4E0E\u4F18\u60E0\u4FE1\u606F\u3002
-PROBATION_SUCCESS_SECOND_TEXT=\u3010\u7F8E\u56FDWatero\u3011\u5C0A\u656C\u7684\u4F1A\u5458\u60A8\u597D\uFF01\u60A8\u7684\u8BD5\u7528\u8BA2\u53557\u5929\u540E\u5C06\u5230\u671F\uFF0C\u540C\u65F6\uFF0C\u8FD8\u67092\u76D2\u517B\u751F\u8336\u996E\u5F85\u9886\u53D6\uFF0C\u8BF7\u8FDB\u5165\u5FAE\u4FE1\u516C\u4F17\u53F7\u67E5\u770B\u8BA2\u5355\u3002
-PROBATION_SUCCESS_THIRD_TEXT=\u3010\u7F8E\u56FDWatero\u3011\u5C0A\u656C\u7684\u4F1A\u5458\u60A8\u597D\uFF01\u60A8\u7684\u8BD5\u7528\u8BA2\u53552\u5929\u540E\u5C06\u5230\u671F\uFF0C\u540C\u65F6\uFF0C\u8FD8\u67091L\u7CBE\u7F8E\u91CF\u676F\u5F85\u9886\u53D6\uFF0C\u8BF7\u8FDB\u5165\u5FAE\u4FE1\u516C\u4F17\u53F7\u67E5\u770B\u8BA2\u5355\u3002
-INFORM_SHIPPING=\u3010\u4E0A\u6735\u5FAE\u5546\u57CE\u3011\u4EB2\uFF0C\u60A8\u7684\u8BA2\u5355\u5DF2\u53D1\u8D27\u3002\u5173\u6CE8\u201C\u4E0A\u6735\u5FAE\u5546\u57CE\u201D\u516C\u4F17\u53F7\u53EF\u67E5\u8BE2\u7269\u6D41\u4FE1\u606F
-ORDER_UPDATE_STATUS_TEXT=\u3010\u4E0A\u6735\u5FAE\u5546\u57CE\u3011\u6709\u4E00\u4E2A\u8BA2\u5355\u5F85{0}\uFF0C\u8BF7\u767B\u9646\u4E0A\u6735\u5FAE\u4FE1\u540E\u53F0\u5904\u7406\u3002
-PENDING_ORDER_REMINDER=\u3010soodo\u4E0A\u6735\u3011\u5FAE\u4FE1\u5546\u57CE\u60A8\u6709{0}\u4E2A\u8BA2\u5355\u5F85\u5904\u7406\uFF0C\u8BF7\u53CA\u65F6\u5904\u7406\u3002
-
-SEND_VERIFICATION_PHONE=\u3010soodo\u4E0A\u6735\u3011\u60A8\u7684\u9A8C\u8BC1\u7801\u662F{0}\uFF0C\u57285\u5206\u949F\u5185\u6709\u6548\u3002\uFF08\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1\uFF09

wechat-wechat-web/src/main/resources/ioc.xml

@@ -2,34 +2,12 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:ehcache="http://ehcache-spring-annotations.googlecode.com/svn/schema/ehcache-spring"
-	xmlns:cache="http://www.springframework.org/schema/cache"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	default-autowire="byName"
-	default-lazy-init="true"
-    xmlns:task="http://www.springframework.org/schema/task"
 	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:ehcache-spring="http://ehcache-spring-annotations.googlecode.com/svn/schema/ehcache-spring"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:websocket="http://www.springframework.org/schema/websocket" 
-	xsi:schemaLocation=
-		"http://www.springframework.org/schema/aop
-		http://www.springframework.org/schema/aop/spring-aop-4.1.xsd
-		http://www.springframework.org/schema/beans
-		http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://ehcache-spring-annotations.googlecode.com/svn/schema/ehcache-spring
-		http://ehcache-spring-annotations.googlecode.com/svn/schema/ehcache-spring/ehcache-spring-1.1.xsd
-		http://www.springframework.org/schema/cache
-		http://www.springframework.org/schema/cache/spring-cache-4.1.xsd
-		http://www.springframework.org/schema/tx 
-		http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
-		http://www.springframework.org/schema/task  
-		http://www.springframework.org/schema/task/spring-task-3.1.xsd  
-		http://www.springframework.org/schema/websocket 
-		http://www.springframework.org/schema/websocket/spring-websocket.xsd
-		http://www.springframework.org/schema/context
-		http://www.springframework.org/schema/context/spring-context-3.2.xsd">
-		
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+        https://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/aop
+        https://www.springframework.org/schema/aop/spring-aop.xsd">
+
 	<!-- 配置自动扫描的包:不扫描控制器和异常处理 -->
 	<context:component-scan base-package="com.iamberry">
 		<context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller" />
@@ -59,8 +37,7 @@
 	<import resource="classpath:datasource.xml"/>
 	
 	<!-- spring监控 -->
-    <bean id="druid-stat-interceptor" class="com.alibaba.druid.support.spring.stat.DruidStatInterceptor">
-	</bean>
+    <bean id="druid-stat-interceptor" class="com.alibaba.druid.support.spring.stat.DruidStatInterceptor"></bean>
 	<bean id="druid-stat-pointcut" class="org.springframework.aop.support.JdkRegexpMethodPointcut" scope="prototype">
 		<property name="patterns">
 			<list>
@@ -71,4 +48,5 @@
 	<aop:config proxy-target-class="true">
 		<aop:advisor advice-ref="druid-stat-interceptor" pointcut-ref="druid-stat-pointcut" />
 	</aop:config>
+
 </beans>

wechat-wechat-web/src/main/resources/log4j.properties

@@ -33,11 +33,3 @@ log4j.logger.org.apache=INFO
 log4j.logger.java.sql.Connection=INFO
 log4j.logger.java.sql.Statement=INFO
 log4j.logger.java.sql.PreparedStatement=INFO
-
-#\u663e\u793aSQL\u8bed\u53e5\u90e8\u5206
-log4j.logger.com.iamberry.rent.service=DEBUG
-log4j.logger.java.sql.ResultSet=INFO
-log4j.logger.org.apache=INFO
-log4j.logger.java.sql.Connection=INFO
-log4j.logger.java.sql.Statement=INFO
-log4j.logger.java.sql.PreparedStatement=INFO

wechat-wechat-web/src/main/resources/mybatis.xml

@@ -16,7 +16,8 @@
     </settings>
     <!-- 别名设置 -->
 	<typeAliases>
-
+		<typeAlias type="com.iamberry.wechat.core.entity.PageBean" alias="PageBean"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.PaperBean" alias="PaperBean"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.JsonBack" alias="JsonBack"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.member.ApplyDto" alias="ApplyDto"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.member.Member" alias="Member"/>
@@ -24,17 +25,9 @@
 		<typeAlias type="com.iamberry.wechat.core.entity.member.Withdraw" alias="Withdraw"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.mq.MQMessage" alias="MQMessage"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.pay.PayResult" alias="PayResult"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.product.ProductImageText" alias="ProductImageText"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.product.ProductPicture" alias="ProductPicture"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.product.ProductColor" alias="ProductColor"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.qrcode.Qrcode" alias="Qrcode"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.qrcode.QrcodeResult" alias="QrcodeResult"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.qrcode.TemporaryQrcode" alias="TemporaryQrcode"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.reback.RebackInfo" alias="RebackInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.reback.RolesListDto" alias="RolesListDto"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.reback.StoreStatiscInfo" alias="StoreStatiscInfo"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.relationship.DealerRelation" alias="DealerRelation"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.relationship.WdRelation" alias="WdRelation"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.wx.AccessToken" alias="AccessToken"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.wx.Article" alias="Article"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.wx.BaseMessage" alias="BaseMessage"/>
@@ -72,13 +65,7 @@
 		<typeAlias type="com.iamberry.wechat.core.entity.wx.WxPayResult" alias="WxPayResult"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.wx.WxPrepayIdErrorResult" alias="WxPrepayIdErrorResult"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.wx.ZTreeBean" alias="ZTreeBean"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.drp.ApplyPlaceLogs" alias="ApplyPlaceLogs"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.wx.WechatShare" alias="WechatShare"/>
-		<typeAlias type="com.iamberry.wechat.core.entity.order.NumberBacklogDto" alias="NumberBacklogDto"/>
-
-		<typeAlias type="com.iamberry.wechat.core.entity.report.Report" alias="Report"/>
-
-		<typeAlias type="com.iamberry.wechat.core.entity.receive.ChargerReceive" alias="ChargerReceive"/>
 
 		<package name="com.iamberry.wechat.core.entity.rent"/>
 	</typeAliases>
@@ -90,26 +77,9 @@
 		</plugin>
 	</plugins>
 	<mappers>
-		<mapper resource="com/iamberry/wechat/service/mapper/adminBannerMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/adminChildPermissionsMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/adminCouponItemMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/adminInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/adminLogMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/adminOrderMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/adminStatisticsMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/agentMemberMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/agentOrderMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/bindingMacMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/cartMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/cashLogMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/configMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/couponItemMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/couponTypeMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/dealerRelationMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/drpRoleInfoMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/firstAccessMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/firstJoinKeyMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/gameMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/homeMemberMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/imageTextInfoMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/imageTextMoreMapper.xml"/>
@@ -118,107 +88,9 @@
 		<mapper resource="com/iamberry/wechat/service/mapper/menuInfoMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/menuKeySetMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/mqMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/newsMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/orderMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/placeInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/placeLogsMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/placeWithDrawalsLogsMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/productImageTextMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/productInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/productMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/productPictureMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/productColorMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/qrcodeMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/rebackInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/rewardsMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/salesLogMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/systemMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/taskMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/templateFlowInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/templateInfoMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/temporaryQrcodeMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/tokenMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/wdRelationMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/wechatShareMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/withdrawMapper.xml"/>
-
-		<mapper resource="com/iamberry/wechat/service/mapper/chargerReceiveMapper.xml"/>
-
-		<!--统计-->
-		<mapper resource="com/iamberry/wechat/service/mapper/reportMapper.xml"/>
-
-		<!-- 试用订单流程mapper -->
-		<mapper resource="com/iamberry/wechat/service/mapper/probationShopOrderMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/adminProbationOrderMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/probationMapper.xml"/>
-		
-		<!-- 前端统计mapper -->
-		<mapper resource="com/iamberry/wechat/service/mapper/statisticsRelationMapper.xml"/>
-		
-		<!-- 租赁订单流程mapper -->
-		<mapper resource="com/iamberry/wechat/service/mapper/leaseOrderMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/leaseMachineMapper.xml"/>
-		
-		<!-- 礼品卡 -->
-		<mapper resource="com/iamberry/wechat/service/mapper/userMachineInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/giftCardMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/agentMachineMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/agentMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/giftCardPayCodeMapper.xml"/>
-		<!-- 代理商信息 -->
-		<mapper resource="com/iamberry/wechat/service/mapper/agentInfoMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/agentPurchaseOrderMapper.xml"/>
-		<!-- 机器编号，获取二维码-->
-		<mapper resource="com/iamberry/wechat/service/mapper/machineNumberMapper.xml"/>
-		<!-- 机器 -->
-		<mapper resource="com/iamberry/wechat/service/mapper/apparatusMapper.xml"/>
-		<!--积分-->
-		<mapper resource="com/iamberry/wechat/service/mapper/useIntegralMapper.xml"/>
-
-		<!--积分商城-->
-		<mapper resource="com/iamberry/wechat/service/mapper/IntegralItemMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/integralOrderAddressMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/integralOrderMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/integralProductConvertMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/integralProductGradeMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/integralProductMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/integralProductPictureMapper.xml"/>
-
-		<!--牙刷定制-->
-		<mapper resource="com/iamberry/wechat/service/mapper/customizedColorMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/customizedPatternMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/customizedPositionMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/orderCustomizedMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/customizedToothMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/customizedExternalUrlMapper.xml"/>
-
-		<!--618活动，好友助力-->
-		<mapper resource="com/iamberry/wechat/service/mapper/activityHelpMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/activityMapper.xml"/>
-
-		<!-- 上朵促销统计产品浏览人数 -->
-		<mapper resource="com/iamberry/wechat/service/mapper/accessFlowMapper.xml"/>
-
-		<!--上朵分销-->
-		<mapper resource="com/iamberry/wechat/service/mapper/mainChannelMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/childChannelMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/channelRebateMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/channelPriceMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/balanceLogMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/channelAdminMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/attenStatisticsMapper.xml"/>
-
-		<!--活动-->
-		<mapper resource="com/iamberry/wechat/service/mapper/salesActivitiesMapper.xml"/>
-
-		<!--优惠券对应产品表-->
-		<mapper resource="com/iamberry/wechat/service/mapper/couponColorMapper.xml"/>
-
-		<!-- 赠品 -->
-		<mapper resource="com/iamberry/wechat/service/mapper/settlementGiftMapper.xml"/>
-
-		<!-- 年货节 -->
-		<mapper resource="com/iamberry/wechat/service/mapper/festivalHelpMapper.xml"/>
-		<mapper resource="com/iamberry/wechat/service/mapper/festivalMapper.xml"/>
 	</mappers>
 </configuration>

wechat-wechat-web/src/main/resources/wx_public_no.properties

@@ -1,21 +0,0 @@
-pubNo = gh_cdd0a86d3b19
-appId = wxdb090f0af89e0be3
-token = weixin
-appSecret = 518114a120274f625530750c1803921b
-partner = 1490237892
-partnerkey=8a90e3ab0e2db7772f5f64e7ed2f4b98
-charset=UTF-8
-KEYSTORE_FILE=E:/apiclient_cert.p12
-KEYSTORE_PASSWORD=1240220902
-ipAddress=120.25.79.106
-
-#pubNo = gh_d6b974cc3491
-#appId = wx921a7cdaa9fb2461
-#token = weixin
-#appSecret = 9d54dbc626c64939bd3682ef05a5a4a5
-#partner = 1490237892
-#partnerkey=8a90e3ab0e2db7772f5f64e7ed2f4b98
-#charset=UTF-8
-#KEYSTORE_FILE=E:/apiclient_cert.p12
-#KEYSTORE_PASSWORD=1240220902
-#ipAddress=120.25.79.106

wechat-wechat-web/src/main/webapp/WEB-INF/web.xml

@@ -7,8 +7,8 @@
 	<!-- Session配置 -->
 	<session-config>
 		<cookie-config>
+			<name>IAMBERRY_WECHAT</name>
 			<http-only>true</http-only>
-			<name>WATERO_WEB_PF</name>
 		</cookie-config>
 	</session-config>
 
@@ -73,18 +73,6 @@
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 
-	<error-page>
-		<error-code>404</error-code>
-		<location>/view/system_view/404.jsp</location>
-	</error-page>
-	<error-page>
-		<error-code>500</error-code>
-		<location>/view/system_view/500.jsp</location>
-	</error-page>
-
-	<listener>
-		<listener-class>com.iamberry.wechat.listener.MessageQueueListener</listener-class>
-	</listener>
 
 	<!-- 数据库监控 -->
 	<servlet>
@@ -107,7 +95,7 @@
 	</filter-mapping>
 
 	<!-- 解决Tomcat内部缓存问题 -->
-	<filter>
+	<!--<filter>
 		<filter-name>ExpiresFilter</filter-name>
 		<filter-class>org.apache.catalina.filters.ExpiresFilter</filter-class>
 		<init-param>
@@ -119,5 +107,5 @@
 		<filter-name>ExpiresFilter</filter-name>
 		<url-pattern>/*</url-pattern>
 		<dispatcher>REQUEST</dispatcher>
-	</filter-mapping>
+	</filter-mapping>-->
 </web-app>