fix pom.xml

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.58</version>
+    <version>1.3.59</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -6503,7 +6503,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     }
 
     @Override
-    public JSONObject getClientIncrementalServiceLoginToken(JSONObject account,String channel){
+    public JSONObject getClientIncrementalServiceLoginToken(JSONObject account,String sourceCode){
         JSONObject client = clientMapper.findClient(account.getIntValue("client_id"));
         if (client == null) {
             throw new InvalidShortIdException();
@@ -6512,7 +6512,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if(!clientConfig.getBooleanValue("geek_shop_status")){
             throw new BadRequestException("Merchant service not opened");
         }
-        return retailRSvcService.getGeekSsoTokenInfo("RYCBSM",client.getString("client_moniker"));
+        return retailRSvcService.getGeekSsoTokenInfo(sourceCode,client.getString("client_moniker"));
     }
 
     @Override

src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java

@@ -651,8 +651,8 @@ public class PartnerViewController {
 
     @PartnerMapping(value = "/incremental_service/{channel}/login_token", method = RequestMethod.GET, roles = {PartnerRole.ADMIN, PartnerRole.MANAGER})
     @ResponseBody
-    public JSONObject getClientIncrementalServiceLoginToken(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account, @PathVariable("channel") String channel){
-        return  clientManager.getClientIncrementalServiceLoginToken(account,channel);
+    public JSONObject getClientIncrementalServiceLoginToken(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account, @PathVariable("channel") String sourceCode){
+        return  clientManager.getClientIncrementalServiceLoginToken(account,sourceCode);
     }
 
 }

src/main/ui/login.html

@@ -358,7 +358,7 @@
         function getGeekSsoLoginUrl() {
             var url = "http://mch.dev.geekforbest.com/#/sso_login?token=";
             $.ajax({
-                url: '/client/partner_info/incremental_service/RP跨境商城/login_token',
+                url: '/client/partner_info/incremental_service/RYCBSM/login_token',
                 method: 'get',
                 success: function (res) {
                     url += res.token;

src/main/ui/login_v1.html

@@ -339,7 +339,7 @@
         function getGeekSsoLoginUrl() {
             var url = "http://mch.dev.geekforbest.com/#/sso_login?token=";
             $.ajax({
-                url: '/client/partner_info/incremental_service/RP跨境商城/login_token',
+                url: '/client/partner_info/incremental_service/RYCBSM/login_token',
                 method: 'get',
                 success: function (res) {
                     url += res.token;

src/main/ui/static/incrementalService/partner-incremental-service.js

@@ -44,7 +44,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
 
         $scope.getGeekSsoLoginUrl = function () {
             var url = "http://mch.dev.geekforbest.com/#/sso_login?token=";
-            $http.get("/client/partner_info/incremental_service/RP跨境商城/login_token").then(function (res) {
+            $http.get("/client/partner_info/incremental_service/RYCBSM/login_token").then(function (res) {
                 url += res.data.token;
                 window.open(url, '_blank');
             }, function (resp) {
@@ -93,7 +93,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
 
         $scope.getGeekSsoLoginUrl = function () {
             var url = "http://mch.dev.geekforbest.com/#/sso_login?token=";
-            $http.get("/client/partner_info/incremental_service/" + $stateParams.channel + "/login_token").then(function (res) {
+            $http.get("/client/partner_info/incremental_service/RYCBSM/login_token").then(function (res) {
                 url += res.data.token;
                 window.open(url, '_blank');
             }, function (resp) {