caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!145 fix bugs and improve code

Browse Source 
Merge pull request !145 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep 2022-04-01 07:25:20 +00:00 committed by Gitee
commit 5292d6ef90
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/main/java/cn/lili/modules/goods/serviceimpl/StoreGoodsLabelServiceImpl.java
View File

@ -66,7 +66,7 @@ public class StoreGoodsLabelServiceImpl extends ServiceImpl<StoreGoodsLabelMappe
storeGoodsLabelVOList.sort(Comparator.comparing(StoreGoodsLabelVO::getSortOrder)); storeGoodsLabelVOList.sort(Comparator.comparing(StoreGoodsLabelVO::getSortOrder));
if (!storeGoodsLabelVOList.isEmpty()) { if (!storeGoodsLabelVOList.isEmpty()) {
cache.put(CachePrefix.CATEGORY.getPrefix() + storeId + "tree", storeGoodsLabelVOList); cache.put(CachePrefix.CATEGORY.getPrefix() + storeId, storeGoodsLabelVOList);
} }
return storeGoodsLabelVOList; return storeGoodsLabelVOList;
} }

21
framework/src/main/java/cn/lili/modules/payment/kit/core/http/AbstractHttpDelegate.java
View File

@ -1,10 +1,11 @@
package cn.lili.modules.payment.kit.core.http; package cn.lili.modules.payment.kit.core.http;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.net.SSLContextBuilder;
import cn.hutool.core.net.SSLProtocols;
import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import cn.hutool.http.ssl.SSLSocketFactoryBuilder;
import cn.lili.modules.payment.kit.core.PaymentHttpResponse; import cn.lili.modules.payment.kit.core.PaymentHttpResponse;
import javax.net.ssl.KeyManager; import javax.net.ssl.KeyManager;
@ -235,12 +236,12 @@ public abstract class AbstractHttpDelegate {
try { try {
File file = FileUtil.newFile(filePath); File file = FileUtil.newFile(filePath);
return HttpRequest.post(url) return HttpRequest.post(url)
.setSSLSocketFactory(SSLSocketFactoryBuilder .setSSLSocketFactory(SSLContextBuilder
.create() .create()
.setProtocol(protocol) .setProtocol(protocol)
.setKeyManagers(getKeyManager(certPass, certPath, null)) .setKeyManagers(getKeyManager(certPass, certPath, null))
.setSecureRandom(new SecureRandom()) .setSecureRandom(new SecureRandom())
.build() .build().getSocketFactory()
) )
.header("Content-Type", "multipart/form-data;boundary=\"boundary\"") .header("Content-Type", "multipart/form-data;boundary=\"boundary\"")
.form("file", file) .form("file", file)
@ -263,7 +264,7 @@ public abstract class AbstractHttpDelegate {
* @return {@link String} 请求返回的结果 * @return {@link String} 请求返回的结果
*/ */
public String upload(String url, String data, String certPath, String certPass, String filePath) { public String upload(String url, String data, String certPath, String certPass, String filePath) {
return upload(url, data, certPath, certPass, filePath, SSLSocketFactoryBuilder.TLSv1); return upload(url, data, certPath, certPass, filePath, SSLProtocols.TLSv1);
} }
/** /**
@ -279,12 +280,12 @@ public abstract class AbstractHttpDelegate {
public String post(String url, String data, String certPath, String certPass, String protocol) { public String post(String url, String data, String certPath, String certPass, String protocol) {
try { try {
return HttpRequest.post(url) return HttpRequest.post(url)
.setSSLSocketFactory(SSLSocketFactoryBuilder .setSSLSocketFactory(SSLContextBuilder
.create() .create()
.setProtocol(protocol) .setProtocol(protocol)
.setKeyManagers(getKeyManager(certPass, certPath, null)) .setKeyManagers(getKeyManager(certPass, certPath, null))
.setSecureRandom(new SecureRandom()) .setSecureRandom(new SecureRandom())
.build() .build().getSocketFactory()
) )
.body(data) .body(data)
.execute() .execute()
@ -304,7 +305,7 @@ public abstract class AbstractHttpDelegate {
* @return {@link String} 请求返回的结果 * @return {@link String} 请求返回的结果
*/ */
public String post(String url, String data, String certPath, String certPass) { public String post(String url, String data, String certPath, String certPass) {
return post(url, data, certPath, certPass, SSLSocketFactoryBuilder.TLSv1); return post(url, data, certPath, certPass, SSLProtocols.TLSv1);
} }
/** /**
@ -320,12 +321,12 @@ public abstract class AbstractHttpDelegate {
public String post(String url, String data, InputStream certFile, String certPass, String protocol) { public String post(String url, String data, InputStream certFile, String certPass, String protocol) {
try { try {
return HttpRequest.post(url) return HttpRequest.post(url)
.setSSLSocketFactory(SSLSocketFactoryBuilder .setSSLSocketFactory(SSLContextBuilder
.create() .create()
.setProtocol(protocol) .setProtocol(protocol)
.setKeyManagers(getKeyManager(certPass, null, certFile)) .setKeyManagers(getKeyManager(certPass, null, certFile))
.setSecureRandom(new SecureRandom()) .setSecureRandom(new SecureRandom())
.build() .build().getSocketFactory()
) )
.body(data) .body(data)
.execute() .execute()
@ -345,7 +346,7 @@ public abstract class AbstractHttpDelegate {
* @return {@link String} 请求返回的结果 * @return {@link String} 请求返回的结果
*/ */
public String post(String url, String data, InputStream certFile, String certPass) { public String post(String url, String data, InputStream certFile, String certPass) {
return post(url, data, certFile, certPass, SSLSocketFactoryBuilder.TLSv1); return post(url, data, certFile, certPass, SSLProtocols.TLSv1);
} }
/** /**