From 2507d4b332b60d8555392aba1676cb8c6252d302 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 24 Mar 2020 15:59:00 +0800
Subject: [PATCH 1/7] =?UTF-8?q?add=20=E5=90=88=E8=A7=84=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 .../manage/signin/core/impls/SignInStatusManagerImpl.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 48f1995eb..5173364fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.4.7</version>
+    <version>1.4.8</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java
index 38e553741..2acc88797 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInStatusManagerImpl.java
@@ -135,7 +135,7 @@ public class SignInStatusManagerImpl implements SignInStatusManager {
     @Override
     public void managerAuthToClient(String managerStatusKey, String clientMoniker) {
         JSONObject manager = getCurrentManager(managerStatusKey);
-        if (manager != null && ManagerRole.ADMIN.hasRole(manager.getIntValue("role"))) {
+        if (manager != null && (ManagerRole.ADMIN.hasRole(manager.getIntValue("role")) || ManagerRole.OPERATOR.hasRole(manager.getIntValue("role")))) {
             String cacheKey = clientMockRedisKey(managerStatusKey);
             stringRedisTemplate.boundValueOps(cacheKey).set(clientMoniker, 30, TimeUnit.MINUTES);
             return;

From 8b458244404cc60a28e4870d67a4008c81275bef Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 24 Mar 2020 17:46:08 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix=20=E5=BE=AE=E4=BF=A1=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/payment/partner/partner-manage.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index a6c2209ce..49d1cfb4c 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -224,6 +224,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 $scope.analysisClients();
             }
             $scope.pagination = {};
+            $scope.industries = industryMap.configs();
             $scope.states = stateMap.configs();
             $scope.countries = countryMap.configs();
             $scope.sectors = sectorMap.configs();

From a1465a7a3b7b375fb052856b74c92b09a3a650f8 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 24 Mar 2020 18:19:25 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix=20=E5=95=86=E6=88=B7=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                |  2 +-
 .../analysis/mappers/TransactionAnalysisMapper.xml     | 10 ++++++++--
 .../payment/manage/mappers/system/ClientMapper.xml     |  5 ++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5173364fa..d42d12543 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.4.8</version>
+    <version>1.4.9</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
index 3506f47a6..1735082c6 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
@@ -1116,10 +1116,13 @@
         statistics_customer_order so
         inner JOIN sys_clients c ON so.client_id = c.client_id
         AND c.is_valid = 1
-        <if test="industry != null and industry!=0">
+        <if test="industry != null and industry!=0 and industry!=1">
             <bind name="industry" value="industry+'%'"/>
             AND c.royalpayindustry like #{industry}
         </if>
+        <if test="industry != null and industry==1">
+            AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
+        </if>
         and so.date >= #{from}
         and so.date &lt; #{to}
         and so.client_id!=0
@@ -1144,10 +1147,13 @@
         statistics_customer_order so
         inner JOIN sys_clients c ON so.client_id = c.client_id
         AND c.is_valid = 1
-        <if test="industry != null and industry!=0">
+        <if test="industry != null and industry!=0 and industry!=1">
             <bind name="industry" value="industry+'%'"/>
             AND c.royalpayindustry like #{industry}
         </if>
+        <if test="industry != null and industry==1">
+            AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
+        </if>
         and so.date= #{transDate}
         and so.client_id!=0
         <if test="bd_user!=null">
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
index 5b9e0db6a..6812d0dbb 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
@@ -89,10 +89,13 @@
             <if test="business_structure!=null">
                 AND c.business_structure=#{business_structure}
             </if>
-            <if test="industry!=null and industry != 0 and industry">
+            <if test="industry!=null and industry != 0 and industry and industry!=1">
                 <bind name="industry" value="industry+'%'"/>
                 AND c.royalpayindustry like #{industry}
             </if>
+            <if test="industry != null and industry==1">
+                AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
+            </if>
             <if test="create_start_time!=null">
                 AND c.create_time >= #{create_start_time}
             </if>

From d160dd54f5050d858bbe8cfef3d3e2a536174c6b Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 24 Mar 2020 18:51:40 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix=20=E5=95=86=E6=88=B7=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                        |  2 +-
 .../mappers/TransactionAnalysisMapper.xml      | 18 +++++++++---------
 .../manage/mappers/system/ClientMapper.xml     |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index d42d12543..dad4a61cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.4.9</version>
+    <version>1.4.11</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
index 1735082c6..0485158ff 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
@@ -1116,13 +1116,13 @@
         statistics_customer_order so
         inner JOIN sys_clients c ON so.client_id = c.client_id
         AND c.is_valid = 1
-        <if test="industry != null and industry!=0 and industry!=1">
-            <bind name="industry" value="industry+'%'"/>
-            AND c.royalpayindustry like #{industry}
-        </if>
-        <if test="industry != null and industry==1">
+        <if test="industry != null and industry=='1'.toString()">
             AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
         </if>
+        <if test="industry != null and industry!='0'.toString() and industry!='1'">
+            <bind name="industry" value="industry +'%'"/>
+            AND c.royalpayindustry like #{industry}
+        </if>
         and so.date >= #{from}
         and so.date &lt; #{to}
         and so.client_id!=0
@@ -1147,13 +1147,13 @@
         statistics_customer_order so
         inner JOIN sys_clients c ON so.client_id = c.client_id
         AND c.is_valid = 1
-        <if test="industry != null and industry!=0 and industry!=1">
+        <if test="industry != null and industry=='1'.toString()">
+            AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
+        </if>
+        <if test="industry != null and industry!='0'.toString() and industry!='1'.toString()">
             <bind name="industry" value="industry+'%'"/>
             AND c.royalpayindustry like #{industry}
         </if>
-        <if test="industry != null and industry==1">
-            AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
-        </if>
         and so.date= #{transDate}
         and so.client_id!=0
         <if test="bd_user!=null">
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
index 6812d0dbb..f6ccf6d31 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
@@ -89,13 +89,13 @@
             <if test="business_structure!=null">
                 AND c.business_structure=#{business_structure}
             </if>
-            <if test="industry!=null and industry != 0 and industry and industry!=1">
+            <if test="industry != null and industry == '1'.toString()">
+                AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
+            </if>
+            <if test="industry!=null and industry != '0'.toString() and industry and industry!='1'">
                 <bind name="industry" value="industry+'%'"/>
                 AND c.royalpayindustry like #{industry}
             </if>
-            <if test="industry != null and industry==1">
-                AND (c.royalpayindustry =1 or c.royalpayindustry like '100%')
-            </if>
             <if test="create_start_time!=null">
                 AND c.create_time >= #{create_start_time}
             </if>

From 1166a671896bbdf9dca2e800dc02e472c93fcad0 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 25 Mar 2020 11:09:00 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix=20=E9=80=9A=E7=9F=A5=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/notice/beans/NoticeInfo.java       | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/notice/beans/NoticeInfo.java b/src/main/java/au/com/royalpay/payment/manage/notice/beans/NoticeInfo.java
index b018e3d41..2bb82f64c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/notice/beans/NoticeInfo.java
+++ b/src/main/java/au/com/royalpay/payment/manage/notice/beans/NoticeInfo.java
@@ -12,6 +12,8 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Created by yishuqian on 28/09/2016.
@@ -54,6 +56,9 @@ public class NoticeInfo {
         }
         res.put("merchants_type",merchants_type);
         if (content != null){
+            if (content.contains("<img")) {
+                initImgAutoSize();
+            }
             res.put("content",content);
         }
         if (status != null && status != "0"){
@@ -106,6 +111,31 @@ public class NoticeInfo {
         }
         return res;
     }
+
+    private void initImgAutoSize() {
+        String regxpForIMGTag = "<\\s*img\\s+([^>]*)\\s*/>";
+        Pattern pattern = Pattern.compile(regxpForIMGTag);
+        Matcher matcher = pattern.matcher(content);
+        while (matcher.find()) {
+            String imgStr = matcher.group(1);
+            String regxpForWidth = "width=\"([^\"]+)\"";
+            String regxpForHeight = "height=\"([^\"]+)\"";
+            Matcher matcherForWidth = Pattern.compile(regxpForWidth).matcher(imgStr);
+            if (matcherForWidth.find()){
+                setContent(content.replaceAll("(<img[^>]*?)\\s+width\\s*=\\s*\\S+", "$1 width=100%"));
+            }else {
+                String regex = "(?i)(\\<img)([^\\>]+\\>)";
+                setContent(content.replaceAll(regex, "$1 width =\"100%\"$2"));
+            }
+            Matcher matcherForHeight = Pattern.compile(regxpForHeight).matcher(imgStr);
+            if (matcherForHeight.find()){
+                setContent(content.replaceAll("(<img[^>]*?)\\s+height\\s*=\\s*\\S+", "$1 height=100%"));
+            }else {
+                String regex = "(?i)(\\<img)([^\\>]+\\>)";
+                setContent(content.replaceAll(regex, "$1 height =\"100%\"$2"));
+            }
+        }
+    }
     public String getTitle() {
         return title;
     }

From cb83e256206add91a42fc14d9e30412cebd3ed6f Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 25 Mar 2020 11:09:35 +0800
Subject: [PATCH 6/7] fix pom

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dad4a61cb..6699cf29c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.4.11</version>
+    <version>1.4.12</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

From 4413caa1428c71e39a9c887501eab01449dca4cc Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@geekforbest.com>
Date: Wed, 25 Mar 2020 11:24:51 +0800
Subject: [PATCH 7/7] apidoc

---
 src/document/cn/apis.js                                    | 1 +
 src/document/en/apis.js                                    | 7 +++----
 .../au/com/royalpay/payment/manage/valid/JPinYinTest.java  | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/document/cn/apis.js b/src/document/cn/apis.js
index 6d2d28a08..36c8acdfb 100644
--- a/src/document/cn/apis.js
+++ b/src/document/cn/apis.js
@@ -441,6 +441,7 @@
  * @apiParam (PathVariable) {String} refund_id 必填，商户退款单号
  * @apiUse Sign
  * @apiParam (JSON) {int} fee 必填，退款金额，单位是货币最小单位，单个订单退款单金额总和不能超过用户支付金额
+ * @apiParam (JSON) {String} device_id 可选，设备ID
  *
  * @apiSuccess {String} return_code 执行结果
  * @apiSuccess {String} result_code
diff --git a/src/document/en/apis.js b/src/document/en/apis.js
index ed523570b..351482eb1 100644
--- a/src/document/en/apis.js
+++ b/src/document/en/apis.js
@@ -344,7 +344,7 @@
  * @apiSuccess {String} pay_time Time when order is paid(yyyy-MM-dd HH:mm:ss, UTC+10)
  * @apiSuccess {String} create_time Time when order is created(according to the latest order)(yyyy-MM-dd HH:mm:ss, UTC+10)
  * @apiSuccess {String} currency Currency. Default value is AUD.
- * @apiSuccess {String} channel	 Currency. Channel. Alipay,Wechat,Bestpay.
+ * @apiSuccess {String} channel     Currency. Channel. Alipay,Wechat,Bestpay.
  *
  * @apiUse GlobalError
  * @apiError (ERROR_CODE) ORDER_MISMATCH Order ID does not belongs to current partner.
@@ -447,7 +447,7 @@
  * @apiParam (PathVariable) {String} refund_id Required, Partner refund order id
  * @apiUse Sign
  * @apiParam (JSON) {int} fee Required, Refund amount. Use base unit of the currency. Total amount of all refund orders must be less than actual paid amount.
- *
+ * @apiParam (JSON) {String} device_id is Optional, ID of the device which sends the request
  * @apiSuccess {String} return_code Execution result
  * @apiSuccess {String} result_code
  * <ul>
@@ -812,7 +812,6 @@
  */
 
 
-
 /**
  * @api {PUT} /api/v1.0/alipay/partners/{partner_code}/orders/{order_id} Create Alipay Online Order
  * @apiName AlipayOnline
@@ -897,7 +896,6 @@
  */
 
 
-
 /**
  * @api {PUT} /api/v1.0/hf_gateway/partners/{partner_code}/orders/{orderId} Create HF Web Order
  * @apiName hfapi
@@ -1029,6 +1027,7 @@
  * @apiError (ERROR_CODE) ORDER_MISMATCH Order is not belong to this partner
  *
  */
+
 /**
  * @api {PUT} /api/v1.0/customs/partners/{partner_code}/redeclare/report/{client_report_id} Redeclare
  * @apiName redeclare_report
diff --git a/src/test/java/au/com/royalpay/payment/manage/valid/JPinYinTest.java b/src/test/java/au/com/royalpay/payment/manage/valid/JPinYinTest.java
index bd427757c..12160b5d6 100644
--- a/src/test/java/au/com/royalpay/payment/manage/valid/JPinYinTest.java
+++ b/src/test/java/au/com/royalpay/payment/manage/valid/JPinYinTest.java
@@ -68,9 +68,7 @@ public class JPinYinTest {
 
     @Test
     public void testhash(){
-        String hash = DigestUtils.sha256Hex("customer&xxnpdBRwd4sIaCCI&1575949279241&/api/sso/manager_sign_in").toLowerCase();
-        String hash2 = DigestUtils.sha256Hex("customer&xxnpdBRwd4sIaCCI&1575950092568&/api/sso/manager_sign_in&119.28.3.196").toLowerCase();
+        String hash = DigestUtils.sha256Hex("TST8&1581903765147&123&nL4FCaj8ojI3IqKUcMELPkRAamKG86oy").toLowerCase();
         System.err.println(hash);
-        System.err.println(hash2);
     }
 }