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 385bff9..63fa207 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 @@
@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 void setSecret(String secret) {
this.secret = secret;
+ this.bcryptSecret = new BCryptPasswordEncoder().encode(secret);
}
public String getStatus() {
@@ -52,4 +58,8 @@
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 d3318f0..86d7dbd 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 @@
* 日终结算
* */
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 91a3297..6dcc9ee 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 @@
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 @@
@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 d46342c..a249193 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/oauth.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/oauth.kt
@@ -44,7 +44,7 @@
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>()