From 247d251415d4254f4b75f6a7a829b3d54a974102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Thu, 1 Aug 2024 15:42:35 +0800 Subject: [PATCH] 'commit' --- .../src/main/resources/bootstrap-dev.yml | 2 +- .../target/classes/bootstrap-dev.yml | 2 +- .../ChargeOrderTotalMannageController.java | 35 +++--- .../orderbk/listener/LabelFileListener.java | 10 -- .../src/main/resources/bootstrap-dev.yml | 110 +++++++++--------- Ylt/ms-admin/target/classes/bootstrap-dev.yml | 110 +++++++++--------- .../7、Mysql数据库下载与还原.md | 5 + 7 files changed, 139 insertions(+), 135 deletions(-) diff --git a/Ylt/gw-saas-mgr/src/main/resources/bootstrap-dev.yml b/Ylt/gw-saas-mgr/src/main/resources/bootstrap-dev.yml index 7079d88..0406fa4 100644 --- a/Ylt/gw-saas-mgr/src/main/resources/bootstrap-dev.yml +++ b/Ylt/gw-saas-mgr/src/main/resources/bootstrap-dev.yml @@ -309,7 +309,7 @@ hystrix: enabled: true #配置HystrixCommand的执行是否启用超时时间 isolation: thread: - timeoutInMilliseconds: 8000 #配置HystrixCommand执行的超时时间，执行超过该时间会进行服务降级处理 8s + timeoutInMilliseconds: 80000 #配置HystrixCommand执行的超时时间，执行超过该时间会进行服务降级处理 80s # 数据库 spring: diff --git a/Ylt/gw-saas-mgr/target/classes/bootstrap-dev.yml b/Ylt/gw-saas-mgr/target/classes/bootstrap-dev.yml index 7079d88..0406fa4 100644 --- a/Ylt/gw-saas-mgr/target/classes/bootstrap-dev.yml +++ b/Ylt/gw-saas-mgr/target/classes/bootstrap-dev.yml @@ -309,7 +309,7 @@ hystrix: enabled: true #配置HystrixCommand的执行是否启用超时时间 isolation: thread: - timeoutInMilliseconds: 8000 #配置HystrixCommand执行的超时时间，执行超过该时间会进行服务降级处理 8s + timeoutInMilliseconds: 80000 #配置HystrixCommand执行的超时时间，执行超过该时间会进行服务降级处理 80s # 数据库 spring: diff --git a/Ylt/ms-admin/src/main/java/com/charge/orderbk/controller/ChargeOrderTotalMannageController.java b/Ylt/ms-admin/src/main/java/com/charge/orderbk/controller/ChargeOrderTotalMannageController.java index 0a9866a..cd4e601 100644 --- a/Ylt/ms-admin/src/main/java/com/charge/orderbk/controller/ChargeOrderTotalMannageController.java +++ b/Ylt/ms-admin/src/main/java/com/charge/orderbk/controller/ChargeOrderTotalMannageController.java @@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; + import javax.servlet.http.HttpServletRequest; import java.util.Map; @@ -19,11 +20,12 @@ public class ChargeOrderTotalMannageController { @Autowired ChargeOrderTotalMannageService chargeOrderMannageService; - + private static final Logger logger = LoggerFactory.getLogger(ChargeOrderTotalMannageController.class); /** * 订单统计 + * * @param request * @param * @param @@ -34,18 +36,17 @@ public class ChargeOrderTotalMannageController { @ResponseBody public CommonResponse orderManagementPageInfo(HttpServletRequest request) { try { - - Map orderManagementPageInfo = chargeOrderMannageService.orderInfoTotalByTime(); return I100cResponse.success(orderManagementPageInfo); } catch (Exception e) { - logger.error("异常信息：",e); + logger.error("异常信息：", e); return I100cResponse.exception(e.getMessage()); } } /** * 订单统计 + * * @param request * @param * @param @@ -59,7 +60,7 @@ public class ChargeOrderTotalMannageController { Map bigData = chargeOrderMannageService.bigData(); return I100cResponse.success(bigData); } catch (Exception e) { - logger.error("异常信息：",e); + logger.error("异常信息：", e); return I100cResponse.exception(e.getMessage()); } } @@ -67,6 +68,7 @@ public class ChargeOrderTotalMannageController { /** * 订单统计 + * * @param request * @param * @param @@ -82,13 +84,14 @@ public class ChargeOrderTotalMannageController { Map bigData = chargeOrderMannageService.queryChargeInfoByRegionalName(); return I100cResponse.success(bigData); } catch (Exception e) { - logger.error("异常信息：",e); + logger.error("异常信息：", e); return I100cResponse.exception(e.getMessage()); } } /** * 订单统计 + * * @param request * @param * @param @@ -104,13 +107,14 @@ public class ChargeOrderTotalMannageController { Map bigData = chargeOrderMannageService.queryEquipmentType(); return I100cResponse.success(bigData); } catch (Exception e) { - logger.error("异常信息：",e); + logger.error("异常信息：", e); return I100cResponse.exception(e.getMessage()); } } /** * 订单统计 + * * @param request * @param * @param @@ -126,7 +130,7 @@ public class ChargeOrderTotalMannageController { Map bigData = chargeOrderMannageService.queryExceptionOrder(); return I100cResponse.success(bigData); } catch (Exception e) { - logger.error("异常信息：",e); + logger.error("异常信息：", e); return I100cResponse.exception(e.getMessage()); } } @@ -134,6 +138,7 @@ public class ChargeOrderTotalMannageController { /** * 订单统计 + * * @param request * @param * @param @@ -149,13 +154,14 @@ public class ChargeOrderTotalMannageController { Map bigData = chargeOrderMannageService.queryConnectorStatue(); return I100cResponse.success(bigData); } catch (Exception e) { - logger.error("异常信息：",e); + logger.error("异常信息：", e); return I100cResponse.exception(e.getMessage()); } } /** * 订单统计 + * * @param request * @param * @param @@ -171,12 +177,14 @@ public class ChargeOrderTotalMannageController { Map bigData = chargeOrderMannageService.queryChargeDegreeRank(); return I100cResponse.success(bigData); } catch (Exception e) { - logger.error("异常信息：",e); + logger.error("异常信息：", e); return I100cResponse.exception(e.getMessage()); } } + /** * 订单统计 + * * @param request * @param * @param @@ -192,7 +200,7 @@ public class ChargeOrderTotalMannageController { Map bigData = chargeOrderMannageService.queryChargeDegreeRankCompany(); return I100cResponse.success(bigData); } catch (Exception e) { - logger.error("异常信息：",e); + logger.error("异常信息：", e); return I100cResponse.exception(e.getMessage()); } } @@ -207,6 +215,7 @@ public class ChargeOrderTotalMannageController { /** * 数据大屏地图站点信息 + * * @param request * @param * @param @@ -222,9 +231,9 @@ public class ChargeOrderTotalMannageController { Map bigData = chargeOrderMannageService.chargeDegreeByStation(); return I100cResponse.success(bigData); } catch (Exception e) { - logger.error("异常信息：",e); + logger.error("异常信息：", e); return I100cResponse.exception(e.getMessage()); } } - + } diff --git a/Ylt/ms-admin/src/main/java/com/charge/orderbk/listener/LabelFileListener.java b/Ylt/ms-admin/src/main/java/com/charge/orderbk/listener/LabelFileListener.java index 09f93d5..d956078 100644 --- a/Ylt/ms-admin/src/main/java/com/charge/orderbk/listener/LabelFileListener.java +++ b/Ylt/ms-admin/src/main/java/com/charge/orderbk/listener/LabelFileListener.java @@ -5,7 +5,6 @@ import cn.hutool.core.lang.Validator; import cn.hutool.json.JSONUtil; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; -import com.alibaba.fastjson.JSON; import com.charge.orderbk.client.ExcelServiceApi; import com.charge.orderbk.config.RedisHandle; import com.charge.orderbk.config.TokenServiceTask; @@ -13,20 +12,15 @@ import com.charge.orderbk.dao.LabelDOMapper; import com.charge.orderbk.dao.LabelRelationDOMapper; import com.charge.orderbk.dao.UserDOMapper; import com.charge.orderbk.model.*; -import com.charge.orderbk.model.ao.SendCouponAO; import com.charge.orderbk.model.dto.*; -import com.charge.orderbk.service.ActivityNewService; import com.charge.util.Const; import com.charge.util.MyException; -import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import java.util.*; import java.util.concurrent.TimeUnit; -import java.util.stream.Stream; /** * 普通活动-人工发放-文件发放 easyExcel导入监听器 @@ -265,9 +259,5 @@ public class LabelFileListener extends AnalysisEventListener { int userCount = labelRelationDOMapper.getUserCount(labelDTO.getId()); labelDO.setUserCount(userCount); labelDOMapper.updateByPrimaryKeySelective(labelDO); - return ; - } - - } diff --git a/Ylt/ms-admin/src/main/resources/bootstrap-dev.yml b/Ylt/ms-admin/src/main/resources/bootstrap-dev.yml index 81ef0b4..1f55e64 100644 --- a/Ylt/ms-admin/src/main/resources/bootstrap-dev.yml +++ b/Ylt/ms-admin/src/main/resources/bootstrap-dev.yml @@ -32,61 +32,61 @@ spring: min-idle: 0 # 目前理解没有用，不应该写在这里 -orderbkapi: - ribbon: - listOfServers: http://i100c.3322.org:32202 - -distributeapi: - ribbon: - listOfServers: http://i100c.3322.org:31636 - -excelapi: - ribbon: - listOfServers: http://i100c.3322.org:30326 - -financeapi: - ribbon: - listOfServers: http://i100c.3322.org:32134 - -noticeapi: - ribbon: - listOfServers: http://i100c.3322.org:30745 - -openapi: - ribbon: - listOfServers: http://i100c.3322.org:31301 - -orderapi: - ribbon: - listOfServers: http://i100c.3322.org:30258 - -protocolshenghongapi: - ribbon: - listOfServers: http://i100c.3322.org:31766 - -stationapi: - ribbon: - listOfServers: http://i100c.3322.org:30836 - -taskapi: - ribbon: - listOfServers: http://localhost:7021 - -userapi: - ribbon: - listOfServers: http://i100c.3322.org:32150 - -walletapi: - ribbon: - listOfServers: http://i100c.3322.org:30723 - -websocketocppapi: - ribbon: - listOfServers: http://i100c.3322.org:30725 - -mgrapi: - ribbon: - listOfServers: http://i100c.3322.org:30115 +#orderbkapi: +# ribbon: +# listOfServers: http://ms-admin:7011 +# +#distributeapi: +# ribbon: +# listOfServers: http://ms-admin:7011 +# +#excelapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30326 +# +#financeapi: +# ribbon: +# listOfServers: http://i100c.3322.org:32134 +# +#noticeapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30745 +# +#openapi: +# ribbon: +# listOfServers: http://i100c.3322.org:31301 +# +#orderapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30258 +# +#protocolshenghongapi: +# ribbon: +# listOfServers: http://i100c.3322.org:31766 +# +#stationapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30836 +# +#taskapi: +# ribbon: +# listOfServers: http://localhost:7021 +# +#userapi: +# ribbon: +# listOfServers: http://i100c.3322.org:32150 +# +#walletapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30723 +# +#websocketocppapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30725 +# +#mgrapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30115 logging: level: diff --git a/Ylt/ms-admin/target/classes/bootstrap-dev.yml b/Ylt/ms-admin/target/classes/bootstrap-dev.yml index 81ef0b4..1f55e64 100644 --- a/Ylt/ms-admin/target/classes/bootstrap-dev.yml +++ b/Ylt/ms-admin/target/classes/bootstrap-dev.yml @@ -32,61 +32,61 @@ spring: min-idle: 0 # 目前理解没有用，不应该写在这里 -orderbkapi: - ribbon: - listOfServers: http://i100c.3322.org:32202 - -distributeapi: - ribbon: - listOfServers: http://i100c.3322.org:31636 - -excelapi: - ribbon: - listOfServers: http://i100c.3322.org:30326 - -financeapi: - ribbon: - listOfServers: http://i100c.3322.org:32134 - -noticeapi: - ribbon: - listOfServers: http://i100c.3322.org:30745 - -openapi: - ribbon: - listOfServers: http://i100c.3322.org:31301 - -orderapi: - ribbon: - listOfServers: http://i100c.3322.org:30258 - -protocolshenghongapi: - ribbon: - listOfServers: http://i100c.3322.org:31766 - -stationapi: - ribbon: - listOfServers: http://i100c.3322.org:30836 - -taskapi: - ribbon: - listOfServers: http://localhost:7021 - -userapi: - ribbon: - listOfServers: http://i100c.3322.org:32150 - -walletapi: - ribbon: - listOfServers: http://i100c.3322.org:30723 - -websocketocppapi: - ribbon: - listOfServers: http://i100c.3322.org:30725 - -mgrapi: - ribbon: - listOfServers: http://i100c.3322.org:30115 +#orderbkapi: +# ribbon: +# listOfServers: http://ms-admin:7011 +# +#distributeapi: +# ribbon: +# listOfServers: http://ms-admin:7011 +# +#excelapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30326 +# +#financeapi: +# ribbon: +# listOfServers: http://i100c.3322.org:32134 +# +#noticeapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30745 +# +#openapi: +# ribbon: +# listOfServers: http://i100c.3322.org:31301 +# +#orderapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30258 +# +#protocolshenghongapi: +# ribbon: +# listOfServers: http://i100c.3322.org:31766 +# +#stationapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30836 +# +#taskapi: +# ribbon: +# listOfServers: http://localhost:7021 +# +#userapi: +# ribbon: +# listOfServers: http://i100c.3322.org:32150 +# +#walletapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30723 +# +#websocketocppapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30725 +# +#mgrapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30115 logging: level: diff --git a/操作文档/7、Mysql数据库下载与还原.md b/操作文档/7、Mysql数据库下载与还原.md index c12db83..48180d0 100644 --- a/操作文档/7、Mysql数据库下载与还原.md +++ b/操作文档/7、Mysql数据库下载与还原.md @@ -160,3 +160,8 @@ ALTER TABLE `mysql`.`event` ENGINE = MyISAM; ALTER TABLE `mysql`.`func` ENGINE = MyISAM; ``` + + +#### MySQL错误-this is incompatible with sql_mode=only_full_group_by完美解决方案 + +https://blog.csdn.net/weixin_43102784/article/details/136162801