解决logger注入问题

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

@@ -1,182 +0,0 @@
-package com.iamberry.wechat.tools;
-
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-
-@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、申请单出库通知
-		 * @return
-		 */
-		public boolean sendTemplateMessageToOpenid(String date,String openId, String url,Integer type) {
-			boolean result = false;
-			switch (type) {
-			case 1:  //1，订单审核结果通知
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId,ResultInfo.ORDER_REVIEW_RESULTS, date, url);
-				break;
-			case 2:  // 2，审核结果通知
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.REVIEW_RESULTS, date, url);
-				break;
-			case 3:  //3、商品入库通知
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.GOODS_WAREHOUSING_NOTICE, date, url);
-				break;
-			case 4:  //4、提货申请通知
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.APPLICATION_DELIVERY_NOTIFICATION, date, url);
-				break;
-			case 5:  //5、申请单出库通知 (通过/驳回)
-				WeixinUtil.sendTemplateMessage(NameUtils.getConfig("appId"), NameUtils.getConfig("appSecret"), openId, ResultInfo.DELIVERY_APPLICATION_FORM, date, url);
-				break;
-			default: 
-				break;
-			}
-			result = true;
-			return  result;
-		}
-		
-		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 openId = "o-icas0dRzE7WYAEAmcX4BQCUyFo";
-			String appId = "wxd995fb95b97ece1b";// 应用ID
-			String appSecret = "34922854462fba23cf54ce859349fcf4";// 应用密钥
-			
-			WeixinUtil.sendTemplateMessage(appId, appSecret, openId, "744KA1PdB1I5PzRcjtxqbEz5t2bp8vdsi4I2ytW1rbE", date, "xx");
-			System.out.println("发送成功");
-		}
-		
-		/**
-		 * 订单审核结果推送
-		 * @param first  标题
-		 * @param keyword1	订单号
-		 * @param keyword2	申请人姓名
-		 * @param keyword3	申请时间
-		 * @param keyword4	详细资料
-		 * @param remark	全部内容
-		 * @param openId	用户openid
-		 * @param url	地址
-		 */
-		public void orderReviewResultsPush(String first,String keyword1,String keyword2,String keyword3,String keyword4,String remark,String openId,String url){
-			String temp = ResultInfo.ORDERREVIEWRESULTS;
-			temp = temp.replaceFirst("firstValueIamberry", first)
-					.replaceFirst("keyword1Value",keyword1)
-					.replaceFirst("keyword2Value",keyword2)
-					.replaceFirst("keyword3Value",keyword3)
-					.replaceFirst("keyword4Value",keyword4)
-					.replaceFirst("remarkValue",remark);
-				sendTemplateMessageToOpenid(temp, openId, url,1);
-		}
-
-
-	/**
-	 * 审核结果通知推送
-	 * @param first  标题
-	 * @param keyword1	姓名
-	 * @param keyword2	审核结果
-	 * @param keyword3	审核时间
-	 * @param remark	全部内容
-	 * @param openId	用户openid
-	 * @param url	地址
-	 */
-	public void reviewResultsPush(String first,String keyword1,String keyword2,String keyword3,String remark,String openId,String url){
-		String temp = ResultInfo.REVIEWRESULTS;
-		temp = temp.replaceFirst("firstValueIamberry", first)
-				.replaceFirst("keyword1Value",keyword1)
-				.replaceFirst("keyword2Value",keyword2)
-				.replaceFirst("keyword3Value",keyword3)
-				.replaceFirst("remarkValue",remark);
-		sendTemplateMessageToOpenid(temp, openId, url,2);
-	}
-
-	/**
-	 * 商品入库通知推送
-	 * @param first
-	 * @param keyword1	商品信息
-	 * @param keyword2	入库数量
-	 * @param keyword3	操作人员
-	 * @param keyword4	入库仓库
-	 * @param remark	全部内容
-	 * @param openId	用户openid
-	 * @param url	地址
-	 */
-	public void putStoragePush(String first,String keyword1,String keyword2,String keyword3,String keyword4,String remark,String openId,String url){
-		String temp = ResultInfo.GOODSWAREHOUSINGNOTICE;
-		temp = temp.replaceFirst("firstValueIamberry", first)
-				.replaceFirst("keyword1Value",keyword1)
-				.replaceFirst("keyword2Value",keyword2)
-				.replaceFirst("keyword3Value",keyword3)
-				.replaceFirst("keyword4Value",keyword4)
-				.replaceFirst("remarkValue",remark);
-		sendTemplateMessageToOpenid(temp, openId, url,3);
-	}
-
-	/**
-	 * 提货申请通知推送
-	 * @param first
-	 * @param keyword1	报检单号
-	 * @param keyword2	提货方
-	 * @param keyword3	提货仓库
-	 * @param keyword4	申请时间
-	 * @param remark	全部内容
-	 * @param openId	用户openid
-	 * @param url	地址
-	 */
-	public void applicationDeliveryPush(String first,String keyword1,String keyword2,String keyword3,String keyword4,String remark,String openId,String url){
-		String temp = ResultInfo.APPLICATIONDELIVERYNOTIFICATION;
-		temp = temp.replaceFirst("firstValueIamberry", first)
-				.replaceFirst("keyword1Value",keyword1)
-				.replaceFirst("keyword2Value",keyword2)
-				.replaceFirst("keyword3Value",keyword3)
-				.replaceFirst("keyword4Value",keyword4)
-				.replaceFirst("remarkValue",remark);
-		sendTemplateMessageToOpenid(temp, openId, url,4);
-	}
-
-
-	/**
-	 * 申请单出库通知推送
-	 * @param first  标题
-	 * @param keyword1	申请时间
-	 * @param keyword2	申请单号
-	 * @param keyword3	物料名称
-	 * @param remark	全部内容
-	 * @param openId	用户openid
-	 * @param url	地址
-	 */
-	public void applicationFormPush(String first,String keyword1,String keyword2,String keyword3,String remark,String openId,String url){
-		String temp = ResultInfo.DELIVERYAPPLICATIONFORM;
-		temp = temp.replaceFirst("firstValueIamberry", first)
-				.replaceFirst("keyword1Value",keyword1)
-				.replaceFirst("keyword2Value",keyword2)
-				.replaceFirst("keyword3Value",keyword3)
-				.replaceFirst("remarkValue",remark);
-		sendTemplateMessageToOpenid(temp, openId, url,5);
-	}
-}

watero-common-tool/src/main/java/com/iamberry/app/tool/des/MD5.java

@@ -22,9 +22,9 @@ import com.iamberry.app.tool.log.RatFWLogger;
 public class MD5 {
 
 	@Autowired
-	private RatFWLogger ratFWLogger;
-	public void setInLongLogger(RatFWLogger inLongLogger) {
-		this.ratFWLogger = inLongLogger;
+	private RatFWLogger logger;
+	public void setInLongLogger(RatFWLogger logger) {
+		this.logger = logger;
 	}
 	// md5字符数组
 	private char[] chars = { '0', '1', '2', '3', '4', '5', '6', '7',
@@ -155,7 +155,7 @@ public class MD5 {
 		try {
 			return new String(decrypt(hexStr2ByteArr(strIn)));
 		} catch (Exception e) {
-			ratFWLogger.debug("加密和解密字符串不匹配:", e.getMessage());
+			logger.debug("加密和解密字符串不匹配:", e.getMessage());
 			return "INLONGADMD5";
 		}
 	}

watero-rent-service/pom.xml

@@ -40,5 +40,15 @@
 			<filtering>false</filtering>
 		</resource>
 	</resources>
-	</build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

watero-rent-service/src/main/java/com/iamberry/rent/service/order/RentOrderServiceImpl.java

@@ -46,7 +46,7 @@ public class RentOrderServiceImpl implements RentOrderService{
 	@Autowired
 	private RentExchangeMapper rentExchangeMapper;
 	@Autowired
-    private RatFWLogger inLongLogger;
+    private RatFWLogger logger;
 	@Autowired
 	private RentPayService rentPayService;
 	@Autowired
@@ -276,7 +276,7 @@ public boolean addRentOrderToEfast(String rentOrderId,  String rentOpenId) throw
 	try {
 		String result = HttpClient431Util.doGet(requestData, url);
 		result = StringEscapeUtils.unescapeJava(result); // unicode 编码
-		inLongLogger.info("add-推送订单号为:" + rentOrder.getRentOrderId() + "的订单，百胜返回信息:" + result);
+		logger.info("add-推送订单号为:" + rentOrder.getRentOrderId() + "的订单，百胜返回信息:" + result);
 		// parse JSON String to Object
 		JSONObject jsonObject = JSONObject.fromObject(result);
 		JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
@@ -287,7 +287,7 @@ public boolean addRentOrderToEfast(String rentOrderId,  String rentOpenId) throw
 				return true;
 			}
 		}
-		inLongLogger.error(this, "add-推送订单号为:" + rentOrder.getRentOrderId() + "的订单，百胜返回信息:" + result);
+		logger.error(this, "add-推送订单号为:" + rentOrder.getRentOrderId() + "的订单，百胜返回信息:" + result);
 		throw new Exception(respData.getString("msg"));
 	} catch (Exception e) {
 		throw e;
@@ -415,13 +415,13 @@ public boolean addRentOrderToEfast(String rentOrderId,  String rentOpenId) throw
 					money,3,"订单退货");
 			returnCode = json.getReturnCode().intValue();
 			if (returnCode == 200) {
-				inLongLogger.info("订单号为:" + rentOrder.getRentOrderId() + "的退货订单微信转账成功");
+				logger.info("订单号为:" + rentOrder.getRentOrderId() + "的退货订单微信转账成功");
 			} else {
-				inLongLogger.info("订单号为:" + rentOrder.getRentOrderId() + "的退货订单微信转账失败");
+				logger.info("订单号为:" + rentOrder.getRentOrderId() + "的退货订单微信转账失败");
 			}
 
 		} catch (Exception e) {
-			inLongLogger.info("订单号为:" + rentOrder.getRentOrderId() + "的退货订单微信转账失败");
+			logger.info("订单号为:" + rentOrder.getRentOrderId() + "的退货订单微信转账失败");
 			e.printStackTrace();
 		}
 
@@ -555,12 +555,12 @@ public boolean addRentOrderToEfast(String rentOrderId,  String rentOpenId) throw
             ResponseJson json = rentPayService.payTransfer(rentOrder.getRentOpenid(),rentOrder.getRentOrderId(),
                     rentOrder.getRentPayMoney(),4,"订单退款");
             if (json.getReturnCode().intValue() == 200) {
-                inLongLogger.info("订单号:" + rentOrder.getRentOrderId() + ",退款，微信转账成功!");
+                logger.info("订单号:" + rentOrder.getRentOrderId() + ",退款，微信转账成功!");
                 boolean flag1 = updateServiceAndPledge(rentOrder.getRentServiceId(),
                         Integer.getInteger(rentOrder.getList().get(0).getRentPledgeId()));
                 return true;
             } else {
-                inLongLogger.info("订单号:" + rentOrder.getRentOrderId() + ",退款，微信转账失败!");
+                logger.info("订单号:" + rentOrder.getRentOrderId() + ",退款，微信转账失败!");
                 throw new IllegalArgumentException("微信转账失败!");
             }
 		}

watero-rent-service/src/main/java/com/iamberry/rent/service/rebate/OrderRebateServiceImpl.java

@@ -33,6 +33,9 @@ import com.iamberry.wechat.face.admin.SystemService;
 import com.iamberry.wechat.face.member.MemberService;
 import com.iamberry.wechat.face.relationship.WdRelationService;
 
+/**
+ * @author Administrator
+ */
 @Service
 public class OrderRebateServiceImpl implements OrderRebateService{
 	
@@ -41,7 +44,7 @@ public class OrderRebateServiceImpl implements OrderRebateService{
 	@Autowired
 	private MemberService memberService;
 	@Autowired
-	private RatFWLogger inLongLogger;
+	private RatFWLogger logger;
 	@Autowired
 	private WdRelationService wdRelationService;
 	@Autowired
@@ -66,21 +69,21 @@ public class OrderRebateServiceImpl implements OrderRebateService{
 		//获取用户信息
 		Member member = memberService.getMemberByUserOpenId(openId);
 		if (member == null) {
-			inLongLogger.error(this, "--saveRentOrderRebate--:" + openId + "没有查到对应的用户信息");
+			logger.error(this, "--saveRentOrderRebate--:" + openId + "没有查到对应的用户信息");
 			return false;
 		}
 		//如果来源为2，则上线是微代理
 		if (member.getUserResType() != null && member.getUserResType().intValue() == 2) {
 			WdRelation wdRelation = wdRelationService.getWdRelationByOpenid(openId);
 			if (wdRelation == null) {
-				inLongLogger.error(this, "--saveRentOrderRebate--:" + openId + "用户关系有误");
+				logger.error(this, "--saveRentOrderRebate--:" + openId + "用户关系有误");
 				return false;
 			}
 			int userId = wdRelation.getWdFirst();
 			//根据上级id查询上级用户信息
 			Member resMember = memberService.getMemberByUserId(userId);
 			if (resMember == null) {
-				inLongLogger.error(this, "--saveRentOrderRebate--:userId=" + userId + ",没有查到对应的用户信息");
+				logger.error(this, "--saveRentOrderRebate--:userId=" + userId + ",没有查到对应的用户信息");
 				return false;
 			}
 			RentOrderDTO rentOrder = new RentOrderDTO();
@@ -93,7 +96,7 @@ public class OrderRebateServiceImpl implements OrderRebateService{
 			List<RentOrderDTO> orderList = rentOrderMapper.listRentOrder(rentOrder);
 			//如果该上线没有租赁该商品或已退款，则不返利
 			if (orderList == null || orderList.size() == 0) {
-				inLongLogger.error(this, "--saveRentOrderRebate--:userId=" + userId + "没有租赁该商品或已退款，所以不返利");
+				logger.error(this, "--saveRentOrderRebate--:userId=" + userId + "没有租赁该商品或已退款，所以不返利");
 				return true;
 			}
 			//用来存放被激活的机器数量
@@ -102,7 +105,7 @@ public class OrderRebateServiceImpl implements OrderRebateService{
 			int type = 0;
 			for (RentOrderDTO order : orderList) {
 				if (order.getOrderItemList() == null || order.getOrderItemList().size() == 0) {
-					inLongLogger.error(this, "--saveRentOrderRebate--:userId=" + userId + "有订单没有订单项");
+					logger.error(this, "--saveRentOrderRebate--:userId=" + userId + "有订单没有订单项");
 					return false;
 				}
 				for (RentOrderItemDTO item : order.getOrderItemList()) {
@@ -116,7 +119,7 @@ public class OrderRebateServiceImpl implements OrderRebateService{
 			}
 			//如果该值为0，则表示没有激活的机器，因而不参与返利
 			if (rentNum == 0) {
-				inLongLogger.error(this, "--saveRentOrderRebate--:userId=" + userId + "租赁订单商品没有被激活，不返利");
+				logger.error(this, "--saveRentOrderRebate--:userId=" + userId + "租赁订单商品没有被激活，不返利");
 				return true;
 			}
 			//目前为止，2和3只是租赁方式不同，但返利相同，所以暂定为2
@@ -170,7 +173,7 @@ public class OrderRebateServiceImpl implements OrderRebateService{
 		rebateRecord.setRecordTypeId(type);
 		//如果为空，则该数据不返利
 		if (rebate == null || (rebateRecordList != null && rebateRecordList.size() > 0)) {
-			inLongLogger.error(this, "--saveRebateRecord--:openId=" + openId + "因返利层次超出或已经给"+resOpenId+"返利，所以不再返利");
+			logger.error(this, "--saveRebateRecord--:openId=" + openId + "因返利层次超出或已经给"+resOpenId+"返利，所以不再返利");
 			return true;
 		} else {
 			//获取返利标识，确定该返利的东西

watero-rent-web/src/main/java/com/iamberry/rent/handlers/pay/RentPayHandler.java

@@ -45,7 +45,7 @@ import com.iamberry.wechat.tools.StaticInfo;
 @RequestMapping("/callback")
 public class RentPayHandler {
 	@Autowired
-	private RatFWLogger inLongLogger;
+	private RatFWLogger logger;
 	@Autowired
 	private RentOrderService rentOrderService;
 	@Autowired
@@ -143,7 +143,7 @@ public class RentPayHandler {
 						codeService.sendRentOrderToUser(order.getRentAddressTel(), 
 								rentTypeInfo.getTypeDuration()/12, deposit/100, rentTypeInfo.getTypeServiceMoney()/100,order.getRentTypeId());
 					} catch (Exception e) {
-						inLongLogger.info("为订单-->" + order.getRentOrderId() + ",:" + "发送短信失败");
+						logger.info("为订单-->" + order.getRentOrderId() + ",:" + "发送短信失败");
 					}
 					
 					//推送消息到微信
@@ -164,7 +164,7 @@ public class RentPayHandler {
 					}
 				} else {
 					resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文有误]]></return_msg></xml>";
-					inLongLogger.error(this, "订单:" + orderIdMD5 + "支付成功，但是没有通过校验!");
+					logger.error(this, "订单:" + orderIdMD5 + "支付成功，但是没有通过校验!");
 				}
 			}else{
 				resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文为空]]></return_msg></xml>";
@@ -262,7 +262,7 @@ public class RentPayHandler {
                     }
                 } else {
                     resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文有误]]></return_msg></xml>";
-                    inLongLogger.error(this, "订单:" + orderIdMD5 + "支付成功，但是没有通过校验!");
+                    logger.error(this, "订单:" + orderIdMD5 + "支付成功，但是没有通过校验!");
                 }
             }else{
                 resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文为空]]></return_msg></xml>";

watero-wechat-service/src/main/java/com/iamberry/wechat/service/member/MemberServiceImpl.java

@@ -42,7 +42,7 @@ public class MemberServiceImpl implements MemberService {
 	@Autowired
 	private WdRelationDao wdRelationDao;
 	@Autowired
-	private RatFWLogger log;
+	private RatFWLogger logger;
 	/**
 	 * 根据userid得到会员信息
 	 * @param userId
@@ -204,7 +204,7 @@ public class MemberServiceImpl implements MemberService {
     		Integer i = homeServiceDao.updateUserResAndTypeByOpenid(member); // 更新
     		boolean flag = wdRelationDao.insertWdrelation(parentInfo, member);//插入微代理层关系
     		if(i.intValue() > 0 && flag){
-    			log.info(this,"--用户-->>" + member.getUserOpenid() + "<<--成为用户-->>" 
+    			logger.info(this,"--用户-->>" + member.getUserOpenid() + "<<--成为用户-->>"
     					+ parentInfo.getUserOpenid() + "<<--下线");
     			return true;
     		}

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

@@ -54,7 +54,7 @@ public class WeChatServiceImpl implements WeChatService {
 	@Autowired
 	private KeyWordService keyWordService;
 	@Autowired
-	private RatFWLogger inLongLogger;
+	private RatFWLogger logger;
 	@Autowired
 	private MenuKeySetService menuKeySetService;
 	@Autowired
@@ -235,7 +235,7 @@ public class WeChatServiceImpl implements WeChatService {
 			textMessage.setContent(respContent);
 			respMessage = MessageUtil.textMessageToXml(textMessage);
 		} catch (Exception e) {
-			inLongLogger.debug(this, e.getMessage());
+			logger.debug(this, e.getMessage());
 			TextMessage textMessage = new TextMessage();
 			textMessage.setCreateTime(createTime);
 			textMessage.setToUserName(fromUserName);
@@ -293,7 +293,7 @@ public class WeChatServiceImpl implements WeChatService {
 			//查询rst订单信息
 			String resultJson = HttpClient431Util.doGet(params,url,null,null,null);
 			resultJson = StringEscapeUtils.unescapeJava(resultJson); // unicode
-			inLongLogger.info("==========================获取机器信息成功,返回值为:" + resultJson + "=========================");
+			logger.info("==========================获取机器信息成功,返回值为:" + resultJson + "=========================");
 			JSONObject jsonObject = JSONObject.fromObject(resultJson);
 			if (jsonObject.getInt("resultCode") != 200) {
 				str.append("尊敬的美国WaterO用户您好。\n" +
@@ -315,7 +315,7 @@ public class WeChatServiceImpl implements WeChatService {
 			str.append("。请放心使用。");
 			return str.toString();
 		} catch (Exception e) {
-			inLongLogger.info("==========================获取机器信息失败,机器条形码为:" + senceid + "=========================");
+			logger.info("==========================获取机器信息失败,机器条形码为:" + senceid + "=========================");
 			str.append("尊敬的美国WaterO用户您好。\n" +
 					"经检测，您的机器为正品，可放心使用。\n" +
 					"如有疑问，请联系官方客服 4008006692.");
@@ -390,7 +390,7 @@ public class WeChatServiceImpl implements WeChatService {
 			isNew = true; 
 		}
 	/*	QrcodeResult qr = temporaryQrcodeService.applyTempQrcode(fromUserName);//为用户生成二维码
-		inLongLogger.info("为用户-->" + fromUserName + ",生成二维码:" + qr.getQroceUrl());*/
+		logger.info("为用户-->" + fromUserName + ",生成二维码:" + qr.getQroceUrl());*/
         return buildRelation(member, senceid, isNew);	//为用户绑定关系 
 	}
 	
@@ -437,7 +437,7 @@ public class WeChatServiceImpl implements WeChatService {
     		status.setCountext("欢迎您关注美国watero，恭喜您成为金牌会员。自己购买或者推荐朋友购买水机均将享受3280元优惠价，并免费赠送3年滤芯哦！点击菜单“分销中心-代理分销”可进入您的专属分销管理中心。");
         }
         /*QrcodeResult qr = temporaryQrcodeService.applyTempQrcode(fromUserName);//为用户生成二维码
-        inLongLogger.info("为用户-->" + fromUserName + ",生成二维码:" + qr.getQroceUrl());*/
+        logger.info("为用户-->" + fromUserName + ",生成二维码:" + qr.getQroceUrl());*/
 		//返回数据
 		return status;
 	}
@@ -455,7 +455,7 @@ public class WeChatServiceImpl implements WeChatService {
 		//memberDao.updateUserFlagByOpenId(fromUserName);		// 绑定用户关系
 		/*QrcodeResult qr = temporaryQrcodeService.applyTempQrcode(fromUserName);//为用户生成二维码
 		if(qr != null ){
-			inLongLogger.info("为用户-->" + fromUserName + ",生成二维结果成功！");
+			logger.info("为用户-->" + fromUserName + ",生成二维结果成功！");
 		}*/
 		
 		Status status = new Status();
@@ -480,7 +480,7 @@ public class WeChatServiceImpl implements WeChatService {
 			nickname = URLEncoder.encode(jsonObject.getString("nickname"), "UTF-8");
 		} catch (UnsupportedEncodingException e) {
 			nickname = "";
-			inLongLogger.error(this, e.getMessage());
+			logger.error(this, e.getMessage());
 		}
 		Member member = homeService.selectMemberInfoByOpenId(openId);
 		//赋值&更新会员数据
@@ -589,7 +589,7 @@ public class WeChatServiceImpl implements WeChatService {
         	Integer qrcodeId = Integer.parseInt(senceid.replaceAll("QR", ""));
         	Qrcode qrcode = qrcodeService.selectQrcodeByQrcodeId(qrcodeId);
         	
-        	inLongLogger.info("线下代理:" + isNew + ", qrcodeID:" + qrcodeId + "," + qrcode);
+        	logger.info("线下代理:" + isNew + ", qrcodeID:" + qrcodeId + "," + qrcode);
         	// 无论邦不绑定关系，都要对二维码的扫描次数设置
     		if (isNew) {
 	        	// 此二维码对应关系存在，并且openid不能是自己
@@ -602,7 +602,7 @@ public class WeChatServiceImpl implements WeChatService {
 	        		// PlaceID
 	        		int placeId = Integer.parseInt(qrcode.getQrcodeReplaceOpenid());
 	        		
-	        		inLongLogger.info("goldPlace:" + goldPlaceId + ", " + placeId + " " + (goldPlaceId ==placeId));
+	        		logger.info("goldPlace:" + goldPlaceId + ", " + placeId + " " + (goldPlaceId ==placeId));
 	        		
 	        		// 判断是否为特定的金牌会员
 	        		if (placeId == goldPlaceId) {
@@ -615,10 +615,10 @@ public class WeChatServiceImpl implements WeChatService {
 								// 判断当前OpenID是否绑定已经成为金牌会员
 			        			Integer info = placeInfoMapper.selectPlaceIdByOpenId(member.getUserOpenid());
 			        			
-			        			inLongLogger.info("当前用户:" + info);
+			        			logger.info("当前用户:" + info);
 			        			if (info == null) {
 			        				/**可以成为金牌会员,并且金牌会员一旦生成，不允许改变*/
-			        				inLongLogger.info("可以成为金牌会员");
+			        				logger.info("可以成为金牌会员");
 
 				        			// 生成金牌会员、包括二维码
 			        				PlaceInfo parentInfo = placeInfoMapper.selectPlaceInfobyId(Integer.parseInt(qrcode.getQrcodeReplaceOpenid()));
@@ -697,7 +697,7 @@ public class WeChatServiceImpl implements WeChatService {
 			// qrcodeService.updateQRcodeStatusByUserOpenid(fromUserName);
 			// 待确认，是否微代理一旦取消关注就自动回收微代理的资格?
 		} catch (Exception e) {
-			inLongLogger.error(this, e.getMessage());
+			logger.error(this, e.getMessage());
 		}
 	}
 	

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/exception/ExceptionHandlerAction.java

@@ -13,10 +13,10 @@ import com.iamberry.app.tool.log.RatFWLogger;
 public class ExceptionHandlerAction {
 	
 	@Autowired
-	private RatFWLogger fwLogger;
+	private RatFWLogger logger;
 
-	public void setInLongLogger(RatFWLogger fwLogger) {
-		this.fwLogger = fwLogger;
+	public void setInLongLogger(RatFWLogger logger) {
+		this.logger = logger;
 	}
 	
 	/**
@@ -40,7 +40,7 @@ public class ExceptionHandlerAction {
 			andView.setViewName("forward:/wechat/error");
 		}
 		// 错误日志
-		fwLogger.error(this, url + ", error[" + exception.getMessage() + "]");
+		logger.error(this, url + ", error[" + exception.getMessage() + "]");
 		exception.printStackTrace();
 		// 返回逻辑视图
 		return andView;

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

@@ -80,7 +80,7 @@ import com.iamberry.wechat.utils.SendMessageUtil;
 public class ResponseWechatPayHandler {
 
 	@Autowired
-	private RatFWLogger ratFWLogger;
+	private RatFWLogger logger;
 	
 	private Object lock = new Object();
 	
@@ -111,8 +111,6 @@ public class ResponseWechatPayHandler {
 	@Autowired
 	private TemporaryQrcodeService temporaryQrcodeService;
 	@Autowired
-	private RatFWLogger inLongLogger;
-	@Autowired
 	private LeaseOrderService leaseOrderService;
 	@Autowired
 	private AdminUtils adminUtils;
@@ -247,7 +245,7 @@ public class ResponseWechatPayHandler {
 							homeService.updateMemberIsFlagByOpenid(member);
 						}
 						QrcodeResult qr = temporaryQrcodeService.applyTempQrcode(order.getSalesOpenid());//为用户生成二维码
-						inLongLogger.info("为用户-->" + order.getSalesOpenid() + ",生成二维码:" + qr.getQroceUrl());
+						logger.info("为用户-->" + order.getSalesOpenid() + ",生成二维码:" + qr.getQroceUrl());
 					} catch (Exception e) {
 						System.out.println("修改已购买状态和终身绑定失败!");
 						e.printStackTrace();
@@ -255,7 +253,7 @@ public class ResponseWechatPayHandler {
 					
 				} else {
 					resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文有误]]></return_msg></xml>";
-					ratFWLogger.error(this, "订单:" + orderIdMD5 + "支付成功，但是没有通过校验!");
+					logger.error(this, "订单:" + orderIdMD5 + "支付成功，但是没有通过校验!");
 				}
 			}else{
 				resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文为空]]></return_msg></xml>";
@@ -394,7 +392,7 @@ public class ResponseWechatPayHandler {
 						}
 						try {
 						QrcodeResult qr = temporaryQrcodeService.applyTempQrcode(order.getProbationOpenid());//为用户生成二维码
-						inLongLogger.info("为用户-->" + order.getProbationOpenid() + ",生成二维码:" + qr.getQroceUrl());
+						logger.info("为用户-->" + order.getProbationOpenid() + ",生成二维码:" + qr.getQroceUrl());
 						} catch (Exception e) {
 							System.out.println("为用户生成二维码失败!");
 						}
@@ -428,7 +426,7 @@ public class ResponseWechatPayHandler {
 					}
 				} else {
 					resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文有误]]></return_msg></xml>";
-					ratFWLogger.error(this, "订单:" + orderIdMD5 + "支付成功，但是没有通过校验!");
+					logger.error(this, "订单:" + orderIdMD5 + "支付成功，但是没有通过校验!");
 				}
 			}else{
 				resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文为空]]></return_msg></xml>";
@@ -525,7 +523,7 @@ public class ResponseWechatPayHandler {
 //							codeService.sendLeaseOrderToUser(leaseOrder.getOrderAddressTel(), 
 //									format.format(nowDate), leaseOrder.getOrderDeposit(), ShopSystemRule.getRuleNum().intValue());
 //						} catch (Exception e) {
-//							inLongLogger.info("为订单-->" + order.getOrderId() + ",:" + "发送短信失败");
+//							logger.info("为订单-->" + order.getOrderId() + ",:" + "发送短信失败");
 //						}
 						//添加到返利表
 						//rebackServices.loadSingleOrderReward(order);
@@ -553,7 +551,7 @@ public class ResponseWechatPayHandler {
 								homeService.updateMemberIsFlagByOpenid(member);
 							}
 							QrcodeResult qr = temporaryQrcodeService.applyTempQrcode(order.getOrderId());//为用户生成二维码
-							inLongLogger.info("为用户-->" + order.getOrderId() + ",生成二维码:" + qr.getQroceUrl());
+							logger.info("为用户-->" + order.getOrderId() + ",生成二维码:" + qr.getQroceUrl());
 						} catch (Exception e) {
 							System.out.println("修改已购买状态和终身绑定失败!");
 							e.printStackTrace();
@@ -561,7 +559,7 @@ public class ResponseWechatPayHandler {
 						
 					} else {
 						resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文有误]]></return_msg></xml>";
-						ratFWLogger.error(this, "订单:" + orderIdMD5 + "支付成功，但是没有通过校验!");
+						logger.error(this, "订单:" + orderIdMD5 + "支付成功，但是没有通过校验!");
 					}
 				}else{
 					resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文为空]]></return_msg></xml>";
@@ -602,7 +600,7 @@ public class ResponseWechatPayHandler {
 				//resXml:返回给微信服务器的数据
 				resXml = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
 				String orderIdMD5 = StaticInfo.orderIdMD5.decrypt(wpr.getAttach());
-				inLongLogger.info(this, "orderIdMD5--->>" + orderIdMD5);
+				logger.info(this, "orderIdMD5--->>" + orderIdMD5);
 				if (orderIdMD5.equals(wpr.getOutTradeNo())) {
 					// 组装数据
 					AgentPayLogs payLogs = new AgentPayLogs();
@@ -626,7 +624,7 @@ public class ResponseWechatPayHandler {
 						efastOrderService.giftCard(agentMachine.getAgentMachineAddressInfo(), "ZS1111111_" + agentMachine.getAgentMachineId(), agentMachine.getAgentMachineColorId(),
 								agentMachine.getAgentMachineAddressName(), agentMachine.getAgentMachineAddressTel(), agentMachine.getAgentMachineOpenId());
 					} catch (Exception e) {
-					    inLongLogger.info(this, "推送百胜失败!");
+					    logger.info(this, "推送百胜失败!");
 					    e.printStackTrace();
 					}
 					
@@ -652,7 +650,7 @@ public class ResponseWechatPayHandler {
 										);
 							}
 						} catch (Exception e) {
-						    inLongLogger.info(this, "给推荐人推送消息失败！");
+						    logger.info(this, "给推荐人推送消息失败！");
                             e.printStackTrace();
 						}
 					}
@@ -661,7 +659,7 @@ public class ResponseWechatPayHandler {
 					}
 				} else {
 					resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文有误]]></return_msg></xml>";
-					ratFWLogger.error(this, "订单:" + orderIdMD5 + "支付成功，但是没有通过校验!");
+					logger.error(this, "订单:" + orderIdMD5 + "支付成功，但是没有通过校验!");
 				}
 			}else{
 				resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文为空]]></return_msg></xml>";
@@ -738,7 +736,7 @@ public class ResponseWechatPayHandler {
 					}
 				} else {
 					resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文有误]]></return_msg></xml>";
-					ratFWLogger.error(this, "订单:" + orderIdMD5 + "支付成功，但是没有通过校验!");
+					logger.error(this, "订单:" + orderIdMD5 + "支付成功，但是没有通过校验!");
 				}
 			}else{
 				resXml = "<xml><return_code><![CDATA[FAIL]]></return_code><return_msg><![CDATA[报文为空]]></return_msg></xml>";

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

@@ -51,7 +51,7 @@
 	<bean id="loadResultInfo" class="com.iamberry.wechat.tools.loadResultUtil" lazy-init="false"></bean>
 	
 	<!-- 开启注解启动定时器 -->
-    <task:annotation-driven/>
+    <!--<task:annotation-driven/>-->
     
     <!-- 将30天后奖励积分的定时任务的xml引入
 	<import resource="classpath:iamberry-wechat-service-orderTesk.xml"></import>  -->

watero-wechat-web/src/main/resources/platform.properties

@@ -146,18 +146,22 @@ DATE_TIME_FORMAT2=yyyy\u5E74MM\u6708dd\u65E5 HH:mm
 PICTRUE_FORMATE_JPG=jpg
 # signatureSimple
 signatureSimple=userAgent=%s&userIp=%s&token=%s&timestamp=%s&sessionId=%s
+
 # pubNo
 pubNo=gh_c73446c8ce91
-# appId-test
-appId=wxc71b789fad06a2d7
-# appId-watero
-#appId=wx27c9f825761a861b
 # token
 token=weixin
+
+# appId-test
+#appId=wxc71b789fad06a2d7
+# appId-watero
+appId=wx27c9f825761a861b
+
 # appSecret-test
-appSecret=8a90e3ab0e2db7772f5f64e7ed2f4b98
+#appSecret=8a90e3ab0e2db7772f5f64e7ed2f4b98
 # appSecret-watero
-#appSecret=97b2f2991e4ff0f2567fbc625f858377
+appSecret=97b2f2991e4ff0f2567fbc625f858377
+
 # partnerkey
 partnerkey=8a90e3ab0e2db7772f5f64e7ed2f4b98
 # wechat-machine-id		test

watero-wechat-web/src/test/java/TestClassPath.java

@@ -16,46 +16,46 @@ import java.io.IOException;
  * @tel 18271840547
  * @date 2017/4/25
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations="classpath:iamberry-wechat-web-ioc.xml")
+//@RunWith(SpringJUnit4ClassRunner.class)
+//@ContextConfiguration(locations="classpath:iamberry-wechat-web-ioc.xml")
 public class TestClassPath {
-    public static void main(String[] args) throws IOException {
-        UserAgent userAgent = UserAgent.parseUserAgentString("Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36");
-        Browser browser = userAgent.getBrowser();
-        OperatingSystem os = userAgent.getOperatingSystem();
-        System.out.println(browser.getName());
-        System.out.println(os.getDeviceType().getName());
-        System.out.println(os.getName());
-        System.out.println(os.isMobileDevice());
+//    public static void main(String[] args) throws IOException {
+//        UserAgent userAgent = UserAgent.parseUserAgentString("Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36");
+//        Browser browser = userAgent.getBrowser();
+//        OperatingSystem os = userAgent.getOperatingSystem();
+//        System.out.println(browser.getName());
+//        System.out.println(os.getDeviceType().getName());
+//        System.out.println(os.getName());
+//        System.out.println(os.isMobileDevice());
+//
+//        String productInfo = "{\"resultCode\":200,\"resultMsg\":\"SUCCESS\", \"returnCode\":200, " +
+//                "\"product_info\":{\"productName\":\"美国进口watero净饮水一体机\", " +
+//                "\"colors\":[" +
+//                "{\"colorName\":\"红色\",\"colorPic\":\"color_pic_1\"}," +
+//                "{\"colorName\":\"绿色\",\"colorPic\":\"color_pic_2\"}," +
+//                "{\"colorName\":\"蓝色\",\"colorPic\":\"color_pic_2\"}" +
+//                "]" +
+//                ",\"productPrcie\":368000, \"subPrcie\":900}," +
+//                "\"packages\":[" +
+//                "{\"name\":\"套餐一\",\"auth\":\"两年使用权\",\"info\":\"包两年滤芯\", \"prcie\":169000, \"gives\":" +
+//                "[{\"giveName\":\"杯子\",\"givePic\":\"gife_pic1\"},{\"giveName\":\"铁锅\",\"givePic\":\"gife_pic1\"}]" +
+//                "}," +
+//                "{\"name\":\"套餐一\",\"auth\":\"两年使用权\",\"info\":\"包两年滤芯\", \"prcie\":169000, \"gives\":" +
+//                "[{\"giveName\":\"杯子\",\"givePic\":\"gife_pic1\"},{\"giveName\":\"铁锅\",\"givePic\":\"gife_pic1\"}]" +
+//                "}" +
+//                "]" +
+//                "}";
+//        System.out.println(productInfo);
+//    }
+//    @Test
+//    public void testReOrder() {
+//        System.out.println(WxPayUtil.refund("abc", "aaaaaaa", "aaaaaaaa", 100, 100));
+//    }
 
-        String productInfo = "{\"resultCode\":200,\"resultMsg\":\"SUCCESS\", \"returnCode\":200, " +
-                "\"product_info\":{\"productName\":\"美国进口watero净饮水一体机\", " +
-                "\"colors\":[" +
-                "{\"colorName\":\"红色\",\"colorPic\":\"color_pic_1\"}," +
-                "{\"colorName\":\"绿色\",\"colorPic\":\"color_pic_2\"}," +
-                "{\"colorName\":\"蓝色\",\"colorPic\":\"color_pic_2\"}" +
-                "]" +
-                ",\"productPrcie\":368000, \"subPrcie\":900}," +
-                "\"packages\":[" +
-                "{\"name\":\"套餐一\",\"auth\":\"两年使用权\",\"info\":\"包两年滤芯\", \"prcie\":169000, \"gives\":" +
-                "[{\"giveName\":\"杯子\",\"givePic\":\"gife_pic1\"},{\"giveName\":\"铁锅\",\"givePic\":\"gife_pic1\"}]" +
-                "}," +
-                "{\"name\":\"套餐一\",\"auth\":\"两年使用权\",\"info\":\"包两年滤芯\", \"prcie\":169000, \"gives\":" +
-                "[{\"giveName\":\"杯子\",\"givePic\":\"gife_pic1\"},{\"giveName\":\"铁锅\",\"givePic\":\"gife_pic1\"}]" +
-                "}" +
-                "]" +
-                "}";
-        System.out.println(productInfo);
-    }
-    @Test
-    public void testReOrder() {
-        System.out.println(WxPayUtil.refund("abc", "aaaaaaa", "aaaaaaaa", 100, 100));
-    }
-
-    public void testBrowser() {
-        UserAgent userAgent = UserAgent.parseUserAgentString("");
-        Browser browser = userAgent.getBrowser();
-        OperatingSystem os = userAgent.getOperatingSystem();
-        System.out.println(browser);
-    }
+//    public void testBrowser() {
+//        UserAgent userAgent = UserAgent.parseUserAgentString("");
+//        Browser browser = userAgent.getBrowser();
+//        OperatingSystem os = userAgent.getOperatingSystem();
+//        System.out.println(browser);
+//    }
 }