Merge branch 'dev-mysql' into dev

src/main/java/com/uas/platform/b2c/common/weixin/util/CheckoutUtil.java

@@ -44,7 +44,8 @@ public class CheckoutUtil {
         }
         content = null;
         // 将sha1加密后的字符串可与signature对比，标识该请求来源于微信
-        return tmpStr != null ? tmpStr.equals(signature.toUpperCase()) : false;
+        System.out.println("签名" + signature);
+        return tmpStr != null ? tmpStr.equalsIgnoreCase(signature) : false;
     }
 
     /**

src/main/resources/prod/message.properties

@@ -6,5 +6,6 @@ plaformB2cComponentApprovedTemplateId=36812a85-d0f9-4d2a-a7aa-62319f092b6f
 plaformB2cComponentUnproveTemplateId=6228240a-93ba-405f-851c-f874a6c99864
 plaformB2cSupplyChainTemplateId=b28337ba-f115-4f11-b457-15d558443160
 inviteVendorMailTemplateId=9028790a-9fc0-4759-a2df-8c26a7f3aa9a
+tplAfterBeAddedtoB2C=b9dee589-9fd8-45d3-9b2a-64b56d65e7e2
 
-messagePublicServiceDevUrl=https://api-message.ubtob.com/
+messagePublicServiceDevUrl=https://api-message.ubtob.com/

src/main/webapp/resources/js/vendor/app.js

@@ -978,7 +978,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
             }).success(function (data) {
                 $rootScope.unReadMessCount = data.count;
 
-            }).error(function (response) {
+            }).error(function (err) {
                 toaster.pop('error', err || '获取未读消息数量失败');
             });
         });