diff --git a/src/main/ui/static/analysis/customer_analysis.js b/src/main/ui/static/analysis/customer_analysis.js
index 3ac557e08..e7c2f4a9e 100644
--- a/src/main/ui/static/analysis/customer_analysis.js
+++ b/src/main/ui/static/analysis/customer_analysis.js
@@ -148,6 +148,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
// $scope.analysis = resp.data.analysis;
});
};
+ $scope.chooseToday();
$scope.orderDetail = function (order) {
orderService.managerOrderDetail(order)
diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html
index b50d77cd4..0c6387fa1 100644
--- a/src/main/ui/static/analysis/templates/customer_analysis.html
+++ b/src/main/ui/static/analysis/templates/customer_analysis.html
@@ -90,8 +90,8 @@
@@ -101,7 +101,7 @@
Customer openId |
Amount(AUD) |
- Points |
+
Orders |
Max Order(AUD) |
@@ -112,7 +112,7 @@
ng-click="order_params.customer_id=customer.customer_id;listCustomerOrders()">
|
|
- |
+
|
|
From 2dfb1a052acff8783456f3b7f521cdc76046f46b Mon Sep 17 00:00:00 2001
From: Tayl0r
Date: Sun, 20 May 2018 10:59:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[Y]=20=E7=AD=BE=E5=90=8D=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E9=AA=8C=E8=AF=81=E8=8A=82=E7=82=B9ip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../apps/core/impls/AppPermissionSupportImpl.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/AppPermissionSupportImpl.java b/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/AppPermissionSupportImpl.java
index 679441084..e9263e407 100644
--- a/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/AppPermissionSupportImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/AppPermissionSupportImpl.java
@@ -21,6 +21,7 @@ public class AppPermissionSupportImpl implements AppPermissionSupport {
private SysAppsMapper sysAppsMapper;
private final String signTemplate = "%s&%s&%s&%s&%s";
private Logger logger = LoggerFactory.getLogger(getClass());
+ public static final String[] NODES_IP_ADDRESSS = new String[]{"119.28.3.196","150.109.64.108", "119.28.178.24", "119.28.24.146", "119.28.77.25"};
@Override
public JSONObject validateSign(String appid, long timestamp, String ip, String requestUri, String sign) {
@@ -44,6 +45,15 @@ public class AppPermissionSupportImpl implements AppPermissionSupport {
logger.debug("sso-str before hash:" + str);
String hash = DigestUtils.sha256Hex(str).toLowerCase();
if (!StringUtils.equals(hash, sign)) {
+ logger.error("[{}]请求的签名有误,使用节点 [{}] 签名", appid, NODES_IP_ADDRESSS.toString());
+ for (String nodeIp : NODES_IP_ADDRESSS) {
+ str = String.format(signTemplate, appid, auth, timestamp, requestUri, nodeIp);
+ logger.debug("NodeIp check sso-str before hash:" + str);
+ hash = DigestUtils.sha256Hex(str).toLowerCase();
+ if (StringUtils.equals(hash, sign)) {
+ return app;
+ }
+ }
throw new ForbiddenException("InvalidSign");
}
return app;