diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index cf8501c5a..aee3d5b60 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,6 +1,16 @@ -spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.schema-name=royalpay_local -spring.datasource.host=192.168.0.50:3306 -spring.datasource.url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false -spring.datasource.username=root -spring.datasource.password=root +#多数据源配置 +spring.datasource.type = com.zaxxer.hikari.HikariDataSource +#数据源master + +spring.datasource.master.schema-name=royalpay_production +spring.datasource.master.host=192.168.1.52:3306 +spring.datasource.master.jdbc-url=jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false +spring.datasource.master.username=taylor +spring.datasource.master.password=taylor + +#数据源salve +spring.datasource.slave.schema-name=royalpay_production +spring.datasource.slave.host=192.168.1.52:3306 +spring.datasource.slave.jdbc-url=jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false +spring.datasource.slave.username=taylor +spring.datasource.slave.password=taylor \ No newline at end of file diff --git a/src/main/ui/static/cashback/templates/partner_cashback_records.html b/src/main/ui/static/cashback/templates/partner_cashback_records.html index eb00e422f..0157c9dd2 100644 --- a/src/main/ui/static/cashback/templates/partner_cashback_records.html +++ b/src/main/ui/static/cashback/templates/partner_cashback_records.html @@ -84,7 +84,7 @@ + uib-tooltip="R跨境商城" ng-if="record.source=='R跨境商城'"/> {{record.order_id}} diff --git a/src/main/ui/static/images/R跨境商城.jpg b/src/main/ui/static/images/R跨境商城.jpg new file mode 100644 index 000000000..9b0713935 Binary files /dev/null and b/src/main/ui/static/images/R跨境商城.jpg differ diff --git a/src/main/ui/static/images/r_cross_mall.png b/src/main/ui/static/images/r_cross_mall.png new file mode 100644 index 000000000..761f7ca4b Binary files /dev/null and b/src/main/ui/static/images/r_cross_mall.png differ diff --git a/src/main/ui/static/images/yangmaimai_sign.png b/src/main/ui/static/images/yangmaimai_sign.png index 53883856b..a77e570a0 100644 Binary files a/src/main/ui/static/images/yangmaimai_sign.png and b/src/main/ui/static/images/yangmaimai_sign.png differ diff --git a/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html b/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html index ef6932fa2..caaaa6f17 100644 --- a/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html +++ b/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html @@ -139,8 +139,8 @@ ng-click="params.source='ALL';loadTradeLogs(1)">All | System | - Yangmaimai2 + R跨境商城

--> @@ -368,7 +368,7 @@ - + BestPay diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html index 820d76a7c..db6e5a9a0 100644 --- a/src/main/ui/static/invoice/templates/invoice_assistant.html +++ b/src/main/ui/static/invoice/templates/invoice_assistant.html @@ -197,7 +197,7 @@ + uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/> + uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/> Input Amount System Rate System Profit - YangMaiMai Rate - YangMaiMai Profit + R跨境商城 Rate + R跨境商城 Profit Status Create Time Operation @@ -366,7 +366,7 @@ + uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/> All | System | - Yangmaimai2 + R跨境商城

--> @@ -330,7 +330,7 @@ - + BestPay diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html index 8d7002b93..3477729cd 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html @@ -220,7 +220,7 @@ - + {{tr.order_id}} diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html index be6c72794..b0b8c09bd 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html @@ -117,8 +117,8 @@ ng-click="params.source='ALL';loadTradeLogs(1)">All | System | - YangMaiMai + R跨境商城

@@ -420,7 +420,7 @@ - + BestPay diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html index e8547b206..1b2d1b30e 100644 --- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html @@ -150,8 +150,8 @@ ng-click="params.source='ALL';loadTradeLogs(1)">All | System | - YangMaiMai + R跨境商城

@@ -465,7 +465,7 @@ + uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/> ' + '
手续费组成
'+'
'+ '

system:'+ system_surcharge +'

' + - '

yangmaimai:'+ incremental_surcharge +'

' + + '

R跨境商城:'+ incremental_surcharge +'

' + '

tax amount:'+ tax_amount +'

' + ''); } @@ -297,7 +297,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { app.controller('IncrementalTradeLogCtrl', ['$scope', '$http', '$filter', '$timeout', 'partnerRefunder', 'orderService', 'commonDialog', function ($scope, $http, $filter, $timeout, partnerRefunder, orderService, commonDialog) { - $scope.params = {source: 'yangmaimai',status: 'PAID', channel :'ALL' ,textType: 'all', datefrom: new Date(), dateto: new Date()}; + $scope.params = {source: 'R跨境商城',status: 'PAID', channel :'ALL' ,textType: 'all', datefrom: new Date(), dateto: new Date()}; $scope.pagination = {}; $scope.today = new Date(); $scope.isAll = true;