xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-11-22 18:36:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

modify

Browse Source
This commit is contained in:
Carl
2021-12-24 11:29:23 +08:00
parent 83ac894413
commit c010409b3b
10 changed files with 42 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/SmartAdminApplication.java
View File

@@ -26,4 +26,9 @@ public class SmartAdminApplication {
public static void main(String[] args) {
SpringApplication.run(SmartAdminApplication.class, args);
}
// @Override
// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
// return builder.sources(this.getClass());
// }
}

1
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java
View File

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.log4j.Log4j2;
import net.lab1024.smartadmin.common.anno.OperateLog;
import net.lab1024.smartadmin.common.domain.ResponseDTO;
import net.lab1024.smartadmin.common.heartbeat.StringUtil;

23
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java
View File

@@ -30,29 +30,6 @@ public class GoodService {
@Autowired
private FlowDao flowDao;
public OrdersEntity getOrderById(String OrderNo){
return ordersDao.findByOrderId(OrderNo);
}
public GoodsEntity getGoodsById(String productCode){
return goodsDao.findByProductCode(productCode);
}
public int updateOrderStatus(String out_trade_no,String total_amount){
return ordersDao.updateOrderStatus(out_trade_no,total_amount);
}
public int addOrder(OrdersEntity ordersEntity){
return ordersDao.insert(ordersEntity);
}
public ResponseDTO<String> batchAddFlow(List<FlowEntity> flowEntities){
flowDao.batchInsert(flowEntities);
return ResponseDTO.succ();
}
public List<GoodsEntity> listGoodsByNameBankNameTagUsedAge(String title){
return goodsDao.selectRoleIdByGoodsNameBankNameTagUsedAge(title);
}

6
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/sdk/WXPayReport.java
View File

@@ -133,7 +133,6 @@ public class WXPayReport {
});
if (config.shouldAutoReport()) {
WXPayUtil.getLogger().info("report worker num: {}", config.getReportWorkerNum());
for (int i = 0; i < config.getReportWorkerNum(); ++i) {
executorService.execute(new Runnable() {
public void run() {
@@ -142,7 +141,6 @@ public class WXPayReport {
try {
StringBuffer sb = new StringBuffer();
String firstMsg = reportMsgQueue.take();
WXPayUtil.getLogger().info("get first report msg: {}", firstMsg);
String msg = null;
sb.append(firstMsg); //会阻塞至有消息
int remainNum = config.getReportBatchSize() - 1;
@@ -150,7 +148,6 @@ public class WXPayReport {
WXPayUtil.getLogger().info("try get remain report msg");
// msg = reportMsgQueue.poll(); // 不阻塞了
msg = reportMsgQueue.take();
WXPayUtil.getLogger().info("get remain report msg: {}", msg);
if (msg == null) {
break;
}
@@ -163,7 +160,6 @@ public class WXPayReport {
WXPayReport.httpRequest(sb.toString(), DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
}
catch (Exception ex) {
WXPayUtil.getLogger().warn("report fail. reason: {}", ex.getMessage());
}
}
}
@@ -198,7 +194,6 @@ public class WXPayReport {
firstDomain, primaryDomain, firstConnectTimeoutMillis, firstReadTimeoutMillis,
firstHasDnsError, firstHasConnectTimeout, firstHasReadTimeout);
String data = reportInfo.toLineString(config.getKey());
WXPayUtil.getLogger().info("report {}", data);
if (data != null) {
reportMsgQueue.offer(data);
}
@@ -218,7 +213,6 @@ public class WXPayReport {
httpRequest(data, DEFAULT_CONNECT_TIMEOUT_MS, DEFAULT_READ_TIMEOUT_MS);
}
catch (Exception ex) {
WXPayUtil.getLogger().warn("report fail. reason: {}", ex.getMessage());
}
}
}).start();

3
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/sdk/WXPayRequest.java
View File

@@ -143,7 +143,6 @@ public class WXPayRequest {
exception = ex;
firstHasDnsErr = true;
elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
WXPayUtil.getLogger().warn("UnknownHostException for domainInfo {}", domainInfo);
WXPayReport.getInstance(config).report(
uuid,
elapsedTimeMillis,
@@ -160,7 +159,6 @@ public class WXPayRequest {
exception = ex;
firstHasConnectTimeout = true;
elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
WXPayUtil.getLogger().warn("connect timeout happened for domainInfo {}", domainInfo);
WXPayReport.getInstance(config).report(
uuid,
elapsedTimeMillis,
@@ -177,7 +175,6 @@ public class WXPayRequest {
exception = ex;
firstHasReadTimeout = true;
elapsedTimeMillis = WXPayUtil.getCurrentTimestampMs()-startTimestampMs;
WXPayUtil.getLogger().warn("timeout happened for domainInfo {}", domainInfo);
WXPayReport.getInstance(config).report(
uuid,
elapsedTimeMillis,

6
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/sdk/WXPayUtil.java
View File

@@ -1,8 +1,6 @@
package net.lab1024.smartadmin.module.system.wxpay.sdk;
import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayConstants.SignType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -20,6 +18,7 @@ import java.io.StringWriter;
import java.security.MessageDigest;
import java.security.SecureRandom;
import java.util.*;
import java.util.logging.Logger;
public class WXPayUtil {
@@ -57,7 +56,6 @@ public class WXPayUtil {
}
return data;
} catch (Exception ex) {
WXPayUtil.getLogger().warn("Invalid XML, can not convert to map. Error message: {}. XML content: {}", ex.getMessage(), strXML);
throw ex;
}
@@ -325,7 +323,7 @@ public class WXPayUtil {
* @return
*/
public static Logger getLogger() {
Logger logger = LoggerFactory.getLogger("wxpay java sdk");
Logger logger = Logger.getLogger("WXpayUtil");
return logger;
}