提交 4f9a7546 authored 作者: 吴德鹏's avatar 吴德鹏

优化

上级 3f9f9162
...@@ -46,12 +46,12 @@ public class PaypalConfig { ...@@ -46,12 +46,12 @@ public class PaypalConfig {
return new OAuthTokenCredential(clientId, clientSecret, paypalSdkConfig()); return new OAuthTokenCredential(clientId, clientSecret, paypalSdkConfig());
} }
// @Bean @Bean
// public APIContext apiContext() throws PayPalRESTException { public APIContext apiContext() throws PayPalRESTException {
// APIContext apiContext = new APIContext(authTokenCredential().getAccessToken()); APIContext apiContext = new APIContext(authTokenCredential().getAccessToken());
// apiContext.setConfigurationMap(paypalSdkConfig()); apiContext.setConfigurationMap(paypalSdkConfig());
// return apiContext; return apiContext;
// } }
} }
...@@ -56,7 +56,7 @@ public class PaypalContoller extends Controller { ...@@ -56,7 +56,7 @@ public class PaypalContoller extends Controller {
@Value("${paypal.mode}") @Value("${paypal.mode}")
private String mode; private String mode;
// private final APIContext oldApiContext; private final APIContext oldApiContext;
private final TbCfOrderRepository orderRepository; private final TbCfOrderRepository orderRepository;
private final TbCfFinanceRepository financeRepository; private final TbCfFinanceRepository financeRepository;
private final NetworkRepository networkRepository; private final NetworkRepository networkRepository;
...@@ -66,8 +66,8 @@ public class PaypalContoller extends Controller { ...@@ -66,8 +66,8 @@ public class PaypalContoller extends Controller {
private final TokenRepository tokenRepository; private final TokenRepository tokenRepository;
public PaypalContoller(/*APIContext oldApiContext,*/ TbCfOrderRepository orderRepository, TbCfFinanceRepository financeRepository, NetworkRepository networkRepository, BonusRepository bonusRepository, PostRepository postRepository, UserRepository userRepository, TokenRepository tokenRepository) { public PaypalContoller(APIContext oldApiContext, TbCfOrderRepository orderRepository, TbCfFinanceRepository financeRepository, NetworkRepository networkRepository, BonusRepository bonusRepository, PostRepository postRepository, UserRepository userRepository, TokenRepository tokenRepository) {
// this.oldApiContext = oldApiContext; this.oldApiContext = oldApiContext;
this.orderRepository = orderRepository; this.orderRepository = orderRepository;
this.financeRepository = financeRepository; this.financeRepository = financeRepository;
this.networkRepository = networkRepository; this.networkRepository = networkRepository;
......
...@@ -50,7 +50,7 @@ public class UploadController { ...@@ -50,7 +50,7 @@ public class UploadController {
for (int i = 0; i < strImg.length; i++) { for (int i = 0; i < strImg.length; i++) {
// String url = sendFile(strImg[i], api); // String url = sendFile(strImg[i], api);
MultipartFile file = BASE64DecodedMultipartFile.base64ToMultipart(strImg[i]); MultipartFile file = BASE64DecodedMultipartFile.base64ToMultipart(strImg[i]);
byte[] bytes = PicUtils.compressPicForScale(file.getBytes(), 30); byte[] bytes = PicUtils.compressPicForScale(file.getBytes(), 100);
// ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes); // ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
long l = System.currentTimeMillis(); long l = System.currentTimeMillis();
String urlName = UUID.randomUUID() + "_" + String.valueOf(l).substring(6) + ".jpg"; String urlName = UUID.randomUUID() + "_" + String.valueOf(l).substring(6) + ".jpg";
......
...@@ -23,7 +23,7 @@ spring: ...@@ -23,7 +23,7 @@ spring:
password: AfriShop_date@2#!& password: AfriShop_date@2#!&
upload: upload:
api: http://dev.diaosaas.com:8302/africa-shop/api/upload/uploadBase64 api: http://admin.afrieshop.com/api/upload/uploadBase64
#易境通物流 #易境通物流
......
server.servlet.context-path=/zion server.servlet.context-path=/zion
spring.jpa.hibernate.ddl-auto=update spring.jpa.hibernate.ddl-auto=update
server.port=8083 server.port=8083
spring.profiles.active=test spring.profiles.active=prod
#spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/afrishop_test?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC #spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/afrishop_test?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
#spring.datasource.username=root #spring.datasource.username=root
#spring.datasource.password=Diaoyunnuli.8 #spring.datasource.password=Diaoyunnuli.8
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论