From d795d6c07ca4f7edf827b557f6fd889882f5e557 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 23 Nov 2018 15:37:06 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[=E4=BC=9A=E5=91=98=E5=88=97=E8=A1=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=A4=9A=E6=9D=A1=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/mapper/WxTagsMapper.java | 6 +++--- .../iformall/service/impl/WxCUserBasicInfoServiceImpl.java | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxTagsMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxTagsMapper.java index 6528078f4..dbb6aafe9 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxTagsMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxTagsMapper.java @@ -1,12 +1,12 @@ package com.iformall.mapper; -import java.util.List; - import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxTags; +import java.util.List; + public interface WxTagsMapper extends CommonMapper { List findList(WxTags wxTags); - WxTags getByName(String name); + List getByName(String name); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index fdb4543f6..1dc2a1d7d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -39,6 +39,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.StopWatch; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; @@ -582,8 +583,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { String tagNames = userBase.getTagNames(); List tagIdList = new ArrayList<>(); for (String tagName : tagNames.split("/")) { - WxTags wxTags = wxTagsMapper.getByName(tagName); - if (wxTags != null) { + List wxTagsList = wxTagsMapper.getByName(tagName); + if (wxTagsList.size()==1) { + WxTags wxTags = wxTagsList.get(0); tagIdList.add(Long.valueOf(wxTags.getId())); } } From c5b08ef998eee581f85d99c2ba28349684adf9c1 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 23 Nov 2018 17:00:23 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E6=80=BB=E8=A7=88][?= =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=95=B0=E6=8D=AE][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8E=BB=E6=8E=89%=E5=8F=B7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/DataTowerServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 641d9770e..97d4dbec9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -404,8 +404,8 @@ public class DataTowerServiceImpl implements DataTowerService { double dczl = new BigDecimal(yczld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); double wczld = ((double) wczsize / size) * 100; double wczl = new BigDecimal(wczld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - datamap.put("yczl", dczl + "%"); - datamap.put("wczl", wczl + "%"); + datamap.put("yczl", dczl); + datamap.put("wczl", wczl); } //租金 @@ -430,7 +430,7 @@ public class DataTowerServiceImpl implements DataTowerService { double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); datamap.put("ysje", receivepay); datamap.put("ssje", pay); - datamap.put("zjsjl", zjcjl + "%"); + datamap.put("zjsjl", zjcjl); } else { datamap.put("ysje", 0); datamap.put("ssje", 0); @@ -458,7 +458,7 @@ public class DataTowerServiceImpl implements DataTowerService { if (merchantsize > 0 && tradesize > 0) { double shsbld = ((double) tradesize / merchantsize) * 100; double shsbl = new BigDecimal(shsbld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - datamap.put("shsbl", shsbl + "%"); + datamap.put("shsbl", shsbl); } else { datamap.put("shsbl", 0); } From 54ac80c402466952a8b234d6696381cc0e922d13 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 23 Nov 2018 17:26:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=B8=8D=E5=81=9C=E7=94=A8=E5=81=9C=E8=BD=A6=E5=95=86=E6=88=B7?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxMerchantServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 19e63fb05..3c0130c55 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -152,6 +152,12 @@ public class WxMerchantServiceImpl implements WxMerchantService { logger.info("未发现要停用的商户"); return; } + + if(!wxMerchant.getCarVendorType().equals(EnumMerchantStatus.NOT_VALID)){ + logger.info("不能停用停车商户"); + return; + } + wxMerchant.setStatus(EnumMerchantStatus.NOT_VALID.getCode()); wxMerchantMapper.updateByPrimaryKeySelective(wxMerchant); //解绑商铺 From 18445de6edd06dc58a55be8e1be03129274ea503 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 23 Nov 2018 17:43:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=AC=A0=E7=BC=B4=E9=87=91=E9=A2=9D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBillDailyServiceImpl.java | 3 ++- .../com/iformall/service/impl/WxBillDepositServiceImpl.java | 3 ++- .../java/com/iformall/service/impl/WxBillOtherServiceImpl.java | 3 ++- .../service/impl/WxBillPropertyDepositServiceImpl.java | 3 ++- .../com/iformall/service/impl/WxBillPropertyServiceImpl.java | 3 ++- .../java/com/iformall/service/impl/WxBillRentServiceImpl.java | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 147ee368c..17ec1a4d8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -128,6 +128,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { record.setUpdatetime(date); record.setUserId(user.getId()); record.setExpiredDay(0L); + record.setOwe(record.getReceivePay()-record.getPay()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { wxBillDailyMapper.insertSelective(record); @@ -145,7 +146,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { wxBillDaily.setPayDate(record.getPayDate()); wxBillDaily.setPay(record.getPay()); wxBillDaily.setReceivePay(record.getReceivePay()); - wxBillDaily.setOwe(record.getOwe()); + wxBillDaily.setOwe(record.getReceivePay()-record.getPay()); wxBillDaily.setStatus(record.getPay().equals(record.getReceivePay()) ? EnumBillDailyStatus.PAID.getCode() : wxBillDaily.getStatus()); wxBillDaily.setUpdatetime(new Date()); wxBillDaily.setUserId(user.getId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index 5f3d07583..913565844 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -105,6 +105,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { Date date = new Date(); record.setCreatetime(date); record.setUpdatetime(date); + record.setOwe(record.getReceivePay()-record.getPay()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { wxBillDepositMapper.insertSelective(record); @@ -122,7 +123,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { wxBillDeposit.setPayDate(record.getPayDate()); wxBillDeposit.setPay(record.getPay()); wxBillDeposit.setReceivePay(record.getReceivePay()); - wxBillDeposit.setOwe(record.getOwe()); + wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); wxBillDeposit.setStatus(record.getPay().equals(record.getReceivePay())?EnumBillRentStatus.PAID.getCode():wxBillDeposit.getStatus()); wxBillDeposit.setUpdatetime(new Date()); try { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index 9ccecd9cf..c5e259e4b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -127,6 +127,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { record.setUpdatetime(date); record.setUserId(user.getId()); record.setExpiredDay(0L); + record.setOwe(record.getReceivePay()-record.getPay()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { wxBillOtherMapper.insertSelective(record); @@ -144,7 +145,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { wxBillOther.setPayDate(record.getPayDate()); wxBillOther.setPay(record.getPay()); wxBillOther.setReceivePay(record.getReceivePay()); - wxBillOther.setOwe(record.getOwe()); + wxBillOther.setOwe(record.getReceivePay()-record.getPay()); wxBillOther.setStatus(record.getPay().equals(record.getReceivePay()) ? EnumBillDailyStatus.PAID.getCode() : wxBillOther.getStatus()); wxBillOther.setUpdatetime(new Date()); wxBillOther.setUserId(user.getId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index f06f2dc76..44a90c296 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -106,6 +106,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe Date date = new Date(); record.setCreatetime(date); record.setUpdatetime(date); + record.setOwe(record.getReceivePay()-record.getPay()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { wxBillPropertyDepositMapper.insertSelective(record); @@ -123,7 +124,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe wxBillDeposit.setPayDate(record.getPayDate()); wxBillDeposit.setPay(record.getPay()); wxBillDeposit.setReceivePay(record.getReceivePay()); - wxBillDeposit.setOwe(record.getOwe()); + wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); wxBillDeposit.setStatus(record.getPay().equals(record.getReceivePay())?EnumBillRentStatus.PAID.getCode():wxBillDeposit.getStatus()); wxBillDeposit.setUpdatetime(new Date()); try { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index a939d4387..129f65d2d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -104,6 +104,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { Date date = new Date(); record.setCreatetime(date); record.setUpdatetime(date); + record.setOwe(record.getReceivePay()-record.getPay()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { wxBillPropertyMapper.insertSelective(record); @@ -121,7 +122,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { property.setPayDate(record.getPayDate()); property.setPay(record.getPay()); property.setReceivePay(record.getReceivePay()); - property.setOwe(record.getOwe()); + property.setOwe(record.getReceivePay()-record.getPay()); property.setStatus(record.getPay().equals(record.getReceivePay())?EnumBillRentStatus.PAID.getCode():property.getStatus()); property.setUpdatetime(new Date()); try { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index f15fc8950..0b2274ba0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -105,6 +105,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { Date date = new Date(); record.setCreatetime(date); record.setUpdatetime(date); + record.setOwe(record.getReceivePay()-record.getPay()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { wxBillRentMapper.insertSelective(record); @@ -122,7 +123,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillRent.setPayDate(record.getPayDate()); wxBillRent.setPay(record.getPay()); wxBillRent.setReceivePay(record.getReceivePay()); - wxBillRent.setOwe(record.getOwe()); + wxBillRent.setOwe(record.getReceivePay()-record.getPay()); wxBillRent.setStatus(record.getPay().equals(record.getReceivePay())?EnumBillRentStatus.PAID.getCode():wxBillRent.getStatus()); wxBillRent.setUpdatetime(new Date()); try { From b05e1931efeae411a0ce6f71fc093760a650c33b Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 23 Nov 2018 18:21:34 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[=E5=85=A8=E5=B1=80exception][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:dev=E5=BC=82=E5=B8=B8=E4=B8=8D=E5=8F=91=E7=BB=99?= =?UTF-8?q?=E7=A0=94=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/UserApplication.java | 10 +++++++ .../iformall/controller/HomeController.java | 2 ++ .../src/main/resources/application-dev.yml | 3 ++ .../src/main/resources/application-prod.yml | 4 +++ .../src/main/resources/application-test.yml | 3 ++ .../main/java/com/iformall/BApplication.java | 11 ++++++++ .../src/main/resources/application-dev.yml | 3 ++ .../src/main/resources/application-prod.yml | 3 ++ .../src/main/resources/application-test.yml | 3 ++ .../main/java/com/iformall/CApplication.java | 11 ++++++++ .../src/main/resources/application-dev.yml | 3 ++ .../src/main/resources/application-prod.yml | 3 ++ .../src/main/resources/application-test.yml | 3 ++ .../com/iformall/ScheduleApplication.java | 11 ++++++++ .../src/main/resources/application-dev.yml | 3 ++ .../src/main/resources/application-prod.yml | 3 ++ .../src/main/resources/application-test.yml | 3 ++ .../common/GlobalDefultExceptionHandler.java | 28 +++++++++++-------- 18 files changed, 99 insertions(+), 11 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/UserApplication.java b/mallinkAdmin/src/main/java/com/iformall/UserApplication.java index fffc1111e..f1c776d8b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/UserApplication.java +++ b/mallinkAdmin/src/main/java/com/iformall/UserApplication.java @@ -1,8 +1,10 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.EnableAsync; import springfox.documentation.swagger2.annotations.EnableSwagger2; import tk.mybatis.spring.annotation.MapperScan; @@ -18,6 +20,14 @@ import tk.mybatis.spring.annotation.MapperScan; @EnableAsync public class UserApplication { + @Value("${fm.exception}") + private boolean fmException; + + @Bean + public boolean isFmException() { + return fmException; + } + public static void main(String[] args) { SpringApplication.run(UserApplication.class, args); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java index 66503982c..0fd3ac39f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java @@ -89,6 +89,8 @@ public class HomeController extends BaseController { return new ResultData(ErrorCode.KAPCHA_NOT_VALID.getCode(), e.getMessage()); } + Double.parseDouble("askhahsf"); + ResultData data = new ResultData(); if (StringUtils.isBlank(user.getUsername()) || StringUtils.isBlank(user.getPassword())) { diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 42b1b08aa..9cebfdae8 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -39,6 +39,9 @@ spring: max-wait: -1 min-idle: 10 +fm: + exception: false + logging: level: tk.mybatis: debug diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index 083287e5b..9d0dc20b8 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -35,6 +35,10 @@ spring: max-wait: -1 min-idle: 0 + +fm: + exception: true + logging: level: tk.mybatis: debug diff --git a/mallinkAdmin/src/main/resources/application-test.yml b/mallinkAdmin/src/main/resources/application-test.yml index 2a61a45a3..471b6de50 100644 --- a/mallinkAdmin/src/main/resources/application-test.yml +++ b/mallinkAdmin/src/main/resources/application-test.yml @@ -36,6 +36,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: true + logging: level: tk.mybatis: debug diff --git a/mallinkBApi/src/main/java/com/iformall/BApplication.java b/mallinkBApi/src/main/java/com/iformall/BApplication.java index 017c85a3c..ef3c776ba 100644 --- a/mallinkBApi/src/main/java/com/iformall/BApplication.java +++ b/mallinkBApi/src/main/java/com/iformall/BApplication.java @@ -1,8 +1,10 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; import tk.mybatis.spring.annotation.MapperScan; /** @@ -14,6 +16,15 @@ import tk.mybatis.spring.annotation.MapperScan; @EnableEncryptableProperties public class BApplication { + @Value("${fm.exception}") + private boolean fmException; + + @Bean + public boolean isFmException() { + return fmException; + } + + public static void main(String[] args) { SpringApplication.run(BApplication.class, args); } diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index 55dbfd2ab..70bd52b35 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -38,6 +38,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: false + logging: level: tk.mybatis: debug diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index c2790ee82..28021fe41 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -35,6 +35,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: true + logging: level: tk.mybatis: debug diff --git a/mallinkBApi/src/main/resources/application-test.yml b/mallinkBApi/src/main/resources/application-test.yml index 76cdc917b..e535f61ce 100644 --- a/mallinkBApi/src/main/resources/application-test.yml +++ b/mallinkBApi/src/main/resources/application-test.yml @@ -35,6 +35,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: true + logging: level: tk.mybatis: debug diff --git a/mallinkCApi/src/main/java/com/iformall/CApplication.java b/mallinkCApi/src/main/java/com/iformall/CApplication.java index d822ec386..eca6c85b2 100644 --- a/mallinkCApi/src/main/java/com/iformall/CApplication.java +++ b/mallinkCApi/src/main/java/com/iformall/CApplication.java @@ -1,8 +1,10 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; import tk.mybatis.spring.annotation.MapperScan; /** @@ -14,6 +16,15 @@ import tk.mybatis.spring.annotation.MapperScan; @EnableEncryptableProperties public class CApplication { + @Value("${fm.exception}") + private boolean fmException; + + @Bean + public boolean isFmException() { + return fmException; + } + + public static void main(String[] args) { SpringApplication.run(CApplication.class, args); } diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index 5bb86281d..5d5965d2e 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -37,6 +37,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: false + logging: level: tk.mybatis: debug diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index 9ca138926..9b9c66e3f 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -35,6 +35,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: true + logging: level: tk.mybatis: debug diff --git a/mallinkCApi/src/main/resources/application-test.yml b/mallinkCApi/src/main/resources/application-test.yml index 600046ff3..a7ffb6efb 100644 --- a/mallinkCApi/src/main/resources/application-test.yml +++ b/mallinkCApi/src/main/resources/application-test.yml @@ -35,6 +35,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: true + logging: level: tk.mybatis: debug diff --git a/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java b/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java index c9ab711ec..68815c746 100644 --- a/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java +++ b/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java @@ -1,8 +1,10 @@ package com.iformall; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; import springfox.documentation.swagger2.annotations.EnableSwagger2; import tk.mybatis.spring.annotation.MapperScan; @@ -16,6 +18,15 @@ import tk.mybatis.spring.annotation.MapperScan; @EnableEncryptableProperties public class ScheduleApplication { + @Value("${fm.exception}") + private boolean fmException; + + @Bean + public boolean isFmException() { + return fmException; + } + + public static void main(String[] args) { SpringApplication.run(ScheduleApplication.class, args); } diff --git a/mallinkSchedule/src/main/resources/application-dev.yml b/mallinkSchedule/src/main/resources/application-dev.yml index 54a5823a2..71fc13367 100644 --- a/mallinkSchedule/src/main/resources/application-dev.yml +++ b/mallinkSchedule/src/main/resources/application-dev.yml @@ -39,6 +39,9 @@ spring: max-wait: -1 min-idle: 10 +fm: + exception: false + logging: level: tk.mybatis: debug diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index c5859a633..94435ab1c 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -36,6 +36,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: true + logging: level: tk.mybatis: debug diff --git a/mallinkSchedule/src/main/resources/application-test.yml b/mallinkSchedule/src/main/resources/application-test.yml index 1162a3779..e93df812c 100644 --- a/mallinkSchedule/src/main/resources/application-test.yml +++ b/mallinkSchedule/src/main/resources/application-test.yml @@ -36,6 +36,9 @@ spring: max-wait: -1 min-idle: 0 +fm: + exception: true + logging: level: tk.mybatis: debug diff --git a/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java b/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java index 206adf796..6c9e81ed8 100644 --- a/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java +++ b/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java @@ -22,6 +22,9 @@ public class GlobalDefultExceptionHandler { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + private boolean isFmException; + @Autowired private MailService mailService; @@ -30,21 +33,24 @@ public class GlobalDefultExceptionHandler { public String defultExcepitonHandler(HttpServletRequest request, Exception e) { log(e, request); - StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw); - e.printStackTrace(pw); + if(isFmException) { + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + e.printStackTrace(pw); - SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式 + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式 - StringBuilder sb = new StringBuilder(); - sb.append(df.format(new Date())); - sb.append("\n"); - sb.append(sw.toString()); + StringBuilder sb = new StringBuilder(); + sb.append(df.format(new Date())); + sb.append("\n"); + sb.append(sw.toString()); - String[] receivers = new String[] {"hupeng@iformall.com", "wuguoqiang@iformall.com", "gongbiao@iformall.com"}; + String[] receivers = new String[] {"hupeng@iformall.com", "wuguoqiang@iformall.com", "gongbiao@iformall.com"}; + + //发送邮件 + mailService.sendSimpleMail(receivers, "请求地址：" + request.getRequestURL() + "异常", sb.toString()); + } - //发送邮件 - mailService.sendSimpleMail(receivers, "请求地址：" + request.getRequestURL() + "异常", sb.toString()); return "发生异常"; }