Welcome to Git (version 1.9.5-preview20150319)
Run 'git help git' to display the help index.
Run 'git help <command>' to display help for specific commands.
robin@robin-PC2 /D/JavaWorkSpace/payment/payment-facade (master)
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
robin@robin-PC2 /D/JavaWorkSpace/payment/payment-facade (master)
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
robin@robin-PC2 /D/JavaWorkSpace/payment/payment-facade (master)
$ git che
checkout cherry cherry-pick
robin@robin-PC2 /D/JavaWorkSpace/payment/payment-facade (master)
$ git checkout develop
Branch develop set up to track remote branch develop from origin.
Switched to a new branch 'develop'
robin@robin-PC2 /D/JavaWorkSpace/payment/payment-facade (develop)
$ git pull origin develop
remote: Counting objects: 110, done.
remote: Compressing objects: 100% (86/86), done.
emote: Total 110 (delta 46), reused 0 (delta 0)Receiving objects: 25% (28/110)
Receiving objects: 100% (110/110), 15.48 KiB | 0 bytes/s, done.
Resolving deltas: 100% (46/46), completed with 13 local objects.
From gitlab.y**t**.org:payment/payment-facade
* branch develop -> FETCH_HEAD
643536c..d7e66fc develop -> origin/develop
Updating 643536c..d7e66fc
Fast-forward
build.gradle | 1 +
.../y**t**/payment/SerialServiceSettings.groovy | 2 -
.../payment/common/PaymentServiceFactory.groovy | 58 +++++++++++
.../com/y**t**/payment/common/SerialService.groovy | 3 +-
.../y**t**/payment/converter/PayConverter.groovy | 5 +-
.../exception/GatewayNotFoundException.groovy | 4 +
.../com/y**t**/payment/pay/PayFacadeService.groovy | 81 +++++++--------
.../groovy/com/y**t**/payment/pay/Payment.groovy | 51 +++++-----
.../payment/refund/RefundFacadeService.groovy | 109 ++++++++-------------
.../groovy/com/y**t**/payment/tenant/Token.groovy | 16 +--
src/main/resources/application.yml | 8 +-
11 files changed, 179 insertions(+), 159 deletions(-)
create mode 100644 src/main/groovy/com/y**t**/payment/common/PaymentServiceFact
ory.groovy
robin@robin-PC2 /D/JavaWorkSpace/payment/payment-facade (develop)
$ git status
On branch develop
Your branch is up-to-date with 'origin/develop'.
nothing to commit, working directory clean
robin@robin-PC2 /D/JavaWorkSpace/payment/payment-facade (develop)
$