Merge remote-tracking branch 'origin/master'

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AliPayServiceImpl.java

@@ -171,7 +171,9 @@ public class AliPayServiceImpl implements AliPayService {
      */
     @Override
     public void aliPayCallBack(HttpServletResponse response, HttpServletRequest request) throws Exception {
+        log.info("进入支付宝回调接口 begin ....... ");
         PrintWriter out = response.getWriter();
+        log.info("进入支付宝回调接口 out ....... {}",out);
         System.out.println("进入支付宝回调");
         //获取支付宝POST过来反馈信息
         Map<String, String> params = convertRequestParamsToMap(request); // 将异步通知中收到的待验证所有参数都存放到map中

wisenergy-service/src/main/java/cn/wisenergy/service/shir/config/ShiroConfig.java

@@ -97,7 +97,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/upload_flowChart/**", "anon");//图片地址
         filterChainDefinitionMap.put("/webSocket/**", "anon");//socket
         filterChainDefinitionMap.put("/message/**", "anon");//消息推送接口
-        filterChainDefinitionMap.put("/pay/**", "anno");
+        filterChainDefinitionMap.put("/pay/**", "anon");
         filterChainDefinitionMap.put("/**", "authc");
         filterChainDefinitionMap.put("/account/**", "kickout");
         filterChainDefinitionMap.put("/banner/**", "kickout");