From: Xia Kaixiang <kaixiang.xia@supwisdom.com>
Date: Tue, 18 Jun 2019 08:52:00 +0000 (+0800)
Subject: appclient问题修改
X-Git-Tag: 1.0.0^2~172
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=11f8bbdebe97879503d43d703880f077a2cc55ac;p=epayment%2Ffood_payapi.git

appclient问题修改
---

diff --git a/src/main/java/com/supwisdom/dlpay/framework/domain/TApiClient.java b/src/main/java/com/supwisdom/dlpay/framework/domain/TApiClient.java
index 385bff93..63fa2072 100644
--- a/src/main/java/com/supwisdom/dlpay/framework/domain/TApiClient.java
+++ b/src/main/java/com/supwisdom/dlpay/framework/domain/TApiClient.java
@@ -1,5 +1,7 @@
 package com.supwisdom.dlpay.framework.domain;
 
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -21,6 +23,9 @@ public class TApiClient {
   @Column(name = "roles", length = 300)
   private String roles;
 
+  @Column(name = "BCRYPT_SECRET", nullable = false, length = 64)
+  private String bcryptSecret;
+
   public String getAppid() {
     return appid;
   }
@@ -35,6 +40,7 @@ public class TApiClient {
 
   public void setSecret(String secret) {
     this.secret = secret;
+    this.bcryptSecret = new BCryptPasswordEncoder().encode(secret);
   }
 
   public String getStatus() {
@@ -52,4 +58,8 @@ public class TApiClient {
   public void setRoles(String roles) {
     this.roles = roles;
   }
+
+  public String getBcryptSecret() {
+    return bcryptSecret;
+  }
 }
diff --git a/src/main/java/com/supwisdom/dlpay/framework/service/DayendSettleService.java b/src/main/java/com/supwisdom/dlpay/framework/service/DayendSettleService.java
index d3318f06..86d7dbd9 100644
--- a/src/main/java/com/supwisdom/dlpay/framework/service/DayendSettleService.java
+++ b/src/main/java/com/supwisdom/dlpay/framework/service/DayendSettleService.java
@@ -8,7 +8,10 @@ import org.springframework.transaction.annotation.Transactional;
  * 日终结算
  * */
 public interface DayendSettleService {
+  @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
   TSettleLog doCreateSettleLog();
+
+  @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
   TSettleLog doUpdateSettleLog(TSettleLog log);
 
   @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
diff --git a/src/main/kotlin/com/supwisdom/dlpay/api/controller/charge_api_controller.kt b/src/main/kotlin/com/supwisdom/dlpay/api/controller/charge_api_controller.kt
index 91a32979..6dcc9ee8 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/api/controller/charge_api_controller.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/api/controller/charge_api_controller.kt
@@ -3,10 +3,7 @@ package com.supwisdom.dlpay.api.controller
 import com.supwisdom.dlpay.api.AccountProxy
 import com.supwisdom.dlpay.api.TransactionBuilder
 import com.supwisdom.dlpay.api.bean.*
-import com.supwisdom.dlpay.api.service.AccountUtilServcie
-import com.supwisdom.dlpay.api.service.ChargeApiService
-import com.supwisdom.dlpay.api.service.TransactionService
-import com.supwisdom.dlpay.api.service.UserService
+import com.supwisdom.dlpay.api.service.*
 import com.supwisdom.dlpay.exception.TransactionCheckException
 import com.supwisdom.dlpay.exception.TransactionProcessException
 import com.supwisdom.dlpay.framework.ResponseBodyBuilder
@@ -32,7 +29,7 @@ class ChargeAPIController {
     @Autowired
     lateinit var systemUtilService: SystemUtilService
     @Autowired
-    lateinit var transactionService: TransactionService
+    lateinit var transactionService: TransactionServiceProxy
     @Autowired
     lateinit var commonService: CommonService
     @Autowired
diff --git a/src/main/kotlin/com/supwisdom/dlpay/oauth.kt b/src/main/kotlin/com/supwisdom/dlpay/oauth.kt
index d46342c8..a2491931 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/oauth.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/oauth.kt
@@ -44,7 +44,7 @@ class OAuthDetailService : ClientDetailsService {
             authorities.add(SimpleGrantedAuthority("ROLE_THIRD_ADMIN"))
             details.authorities = authorities
             details.setAutoApproveScopes(Arrays.asList("true"))
-            details.clientSecret = it.secret
+            details.clientSecret = it.bcryptSecret
             details.accessTokenValiditySeconds = 3600
             details.refreshTokenValiditySeconds=43200
             val redir = HashSet<String>()