Merge branch 'develop'

src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java

@@ -402,7 +402,7 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         String uploadUrl  = PlatformEnvironment.getEnv().concatUrl("/risk/upload/") + event.getString("risk_id") + "/" + codeKey;
         int orderType = event.getIntValue("order_type");
         if (orderType == 1 || orderType == 2)
-            uploadUrl = PlatformEnvironment.getEnv().concatUrl("/manage.html#/analysis/monitoring/") + event.getString("risk_id") + "/bd/detail";
+            uploadUrl = PlatformEnvironment.getEnv().concatUrl("/manage.html#/analysis/monitoring/") + event.getString("risk_id") + "/bd/detail?codeKey=" + codeKey;
             //uploadUrl = "localhost:9009" + "/manage.html#/analysis/monitoring/" + event.getString("risk_id") + "/bd/detail";
         List<JSONObject> bds = clientBDMapper.listClientBDInfoAvailable(client.getIntValue("client_id"), new Date());
         List<String> bdNames = new ArrayList<>();

src/main/ui/static/analysis/risk_business.js

@@ -439,7 +439,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                     }
                 };
                 $scope.submit = function (form) {
-                    var codeKey = $scope.riskEvent.submit_url.substring($scope.riskEvent.submit_url.lastIndexOf('/') + 1);
+                    var codeKey = $scope.riskEvent.submit_url.substring($scope.riskEvent.submit_url.lastIndexOf('=') + 1) || $scope.riskEvent.submit_url.substring($scope.riskEvent.submit_url.lastIndexOf('/') + 1);
                     $http.post('/risk/upload/' + codeKey, $scope.material).then(function (resp) {
                         commonDialog.alert({
                             title: 'Success',

src/main/ui/static/boot/managerMainApp.js

@@ -431,7 +431,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                 case '3':
                     return '线上网关';
                 case '4':
-                    return 'JSAPI网关';
+                    return 'WeChat HTML5';
                 case '5':
                     return '线下网关';
                 case '6':

src/main/ui/static/boot/managerMainAppv2.js

@@ -445,7 +445,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                 case '3':
                     return '线上网关';
                 case '4':
-                    return 'JSAPI网关';
+                    return 'WeChat HTML5';
                 case '5':
                     return '线下网关';
                 case '6':