diff --git a/smart-admin-service/smart-admin-api/pom.xml b/smart-admin-service/smart-admin-api/pom.xml index 1dba541a..f629a6a0 100644 --- a/smart-admin-service/smart-admin-api/pom.xml +++ b/smart-admin-service/smart-admin-api/pom.xml @@ -22,10 +22,13 @@ + org.springframework.boot spring-boot-starter-aop @@ -51,7 +54,26 @@ org.springframework.boot spring-boot-starter-web + + + + + org.springframework.boot spring-boot-starter-websocket @@ -263,6 +285,9 @@ ${basedir}/lib/commons-logging-1.1.1.jar + + + @@ -317,6 +342,15 @@ true + + + + org.apache.maven.plugins + maven-war-plugin + + false + + diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/SmartAdminApplication.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/SmartAdminApplication.java index b22d0670..606d99af 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/SmartAdminApplication.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/SmartAdminApplication.java @@ -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()); +// } } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java index 0a60838f..5fd544f2 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java @@ -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; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java index 222b7b45..4c48841f 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java @@ -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 batchAddFlow(List flowEntities){ - flowDao.batchInsert(flowEntities); - return ResponseDTO.succ(); - } - public List listGoodsByNameBankNameTagUsedAge(String title){ return goodsDao.selectRoleIdByGoodsNameBankNameTagUsedAge(title); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/sdk/WXPayReport.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/sdk/WXPayReport.java index dba76414..99bf3024 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/sdk/WXPayReport.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/sdk/WXPayReport.java @@ -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(); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/sdk/WXPayRequest.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/sdk/WXPayRequest.java index b69072f1..894a2bae 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/sdk/WXPayRequest.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/sdk/WXPayRequest.java @@ -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, diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/sdk/WXPayUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/sdk/WXPayUtil.java index 1fa1df19..d69545f9 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/sdk/WXPayUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/sdk/WXPayUtil.java @@ -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; } diff --git a/smart-admin-service/smart-admin-api/src/main/resources/dev/log4j2.xml b/smart-admin-service/smart-admin-api/src/main/resources/dev/log4j2.xml deleted file mode 100644 index 86c514a3..00000000 --- a/smart-admin-service/smart-admin-api/src/main/resources/dev/log4j2.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - /home/logs/smart-admin/dev/logs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/smart-admin-service/smart-admin-api/src/main/resources/pre/log4j2.xml b/smart-admin-service/smart-admin-api/src/main/resources/pre/log4j2.xml deleted file mode 100644 index f1942baf..00000000 --- a/smart-admin-service/smart-admin-api/src/main/resources/pre/log4j2.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - /home/logs/smart-admin/dev/logs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/smart-admin-service/smart-admin-api/src/main/resources/sit/log4j2.xml b/smart-admin-service/smart-admin-api/src/main/resources/sit/log4j2.xml deleted file mode 100644 index ac533c99..00000000 --- a/smart-admin-service/smart-admin-api/src/main/resources/sit/log4j2.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - /home/logs/smart-admin/dev/logs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file