Merge remote-tracking branch 'origin/master'

pom.xml

@@ -17,7 +17,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<shiro.version>1.4.1</shiro.version>
+		<shiro.version>1.6.0</shiro.version>
 		<thymeleaf.extras.shiro.version>2.0.0</thymeleaf.extras.shiro.version>
 		<mybatis.boot.version>1.3.2</mybatis.boot.version>
 		<druid.version>1.1.14</druid.version>

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxController.java

@@ -122,6 +122,7 @@ public class WxController extends ApiBaseController {
         String shipmentNumber = obj.getString("shipmentNumber");
         String orderNumber = obj.getString("orderNumber");
         String belongToName = obj.getString("belongToName");
+        logger.info("收到需要通知收货的请求参数："+obj.toString());
         if(belongToName==null){
             belongToName = "经销商";
         }
@@ -148,9 +149,11 @@ public class WxController extends ApiBaseController {
     })
     @PostMapping("sendTextMessageByCustomerCode")
     public Object sendTextMessage(){
+
         ParameterObject obj =  getParameterObject();
         JSONObject jobj = obj.getJSONObject();
         Set<String> customerCodes = jobj.keySet();
+        logger.info("收到需要通知过信息的请求参数："+jobj.toString());
         logger.info("收到需要通知的经销商组织代码："+customerCodes.toString());
         Map<String,Map<String,Object>> maps = sysUserService.selectLoginNamesByCostumerCode(customerCodes);
         String temple =configService.selectConfigByKey("wx.notification.time");