From f342c7eb0cc779bfdad1fd10cfcdeec8ffd1e7cb Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 21 Sep 2018 16:48:46 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[=E6=8C=87=E5=AE=9A=E6=97=A5=E5=BF=97loggin?= =?UTF-8?q?g.path][=E6=96=B0=E5=A2=9E]:=E6=97=A5=E5=BF=97=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E8=A1=8C=E6=8C=87=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{logback.xml => logback-spring.xml} | 188 +++++++++--------- .../{logback.xml => logback-spring.xml} | 6 +- .../{logback.xml => logback-spring.xml} | 26 +-- 3 files changed, 110 insertions(+), 110 deletions(-) rename mallinkAdmin/src/main/resources/{logback.xml => logback-spring.xml} (79%) rename mallinkBApi/src/main/resources/{logback.xml => logback-spring.xml} (95%) rename mallinkCApi/src/main/resources/{logback.xml => logback-spring.xml} (79%) diff --git a/mallinkAdmin/src/main/resources/logback.xml b/mallinkAdmin/src/main/resources/logback-spring.xml similarity index 79% rename from mallinkAdmin/src/main/resources/logback.xml rename to mallinkAdmin/src/main/resources/logback-spring.xml index 41e865f70..1d04331e4 100644 --- a/mallinkAdmin/src/main/resources/logback.xml +++ b/mallinkAdmin/src/main/resources/logback-spring.xml @@ -1,95 +1,95 @@ - - - - - - - - [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] --%mdc{client}%msg%n - - - - - ${PATH}/trace.log - - logs/trace.%d{yyyy-MM-dd}.log - - - [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n - - - - - ${PATH}/info.log - - logs/info.%d{yyyy-MM-dd}.log - - - [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n - - - INFO - ACCEPT - DENY - - - - - ${PATH}/debug.log - - logs/debug.%d{yyyy-MM-dd}.log - - - [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n - - - DEBUG - ACCEPT - DENY - - - - - - ${PATH}/warn.log - - logs/warn.%d{yyyy-MM-dd}.log - - - [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n - - - WARN - ACCEPT - DENY - - - - - - - ${PATH}/error.log - - logs/error.%d{yyyy-MM-dd}.log - - - [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n - - - ERROR - ACCEPT - DENY - - - - - - - - - - - - - + + + + + + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] --%mdc{client}%msg%n + + + + + ${logPath}/trace.log + + ${logPath}/trace.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + + + ${logPath}/info.log + + ${logPath}/info.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + INFO + ACCEPT + DENY + + + + + ${logPath}/debug.log + + ${logPath}/debug.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + DEBUG + ACCEPT + DENY + + + + + + ${logPath}/warn.log + + ${logPath}/warn.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + WARN + ACCEPT + DENY + + + + + + + ${logPath}/error.log + + ${logPath}/error.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + \ No newline at end of file diff --git a/mallinkBApi/src/main/resources/logback.xml b/mallinkBApi/src/main/resources/logback-spring.xml similarity index 95% rename from mallinkBApi/src/main/resources/logback.xml rename to mallinkBApi/src/main/resources/logback-spring.xml index 155df638e..fe80d3c3a 100644 --- a/mallinkBApi/src/main/resources/logback.xml +++ b/mallinkBApi/src/main/resources/logback-spring.xml @@ -1,7 +1,7 @@ - - - + + + diff --git a/mallinkCApi/src/main/resources/logback.xml b/mallinkCApi/src/main/resources/logback-spring.xml similarity index 79% rename from mallinkCApi/src/main/resources/logback.xml rename to mallinkCApi/src/main/resources/logback-spring.xml index 155df638e..1d04331e4 100644 --- a/mallinkCApi/src/main/resources/logback.xml +++ b/mallinkCApi/src/main/resources/logback-spring.xml @@ -1,7 +1,7 @@ - - - + + + @@ -10,9 +10,9 @@ - ${PATH}/trace.log + ${logPath}/trace.log - logs/trace.%d{yyyy-MM-dd}.log + ${logPath}/trace.%d{yyyy-MM-dd}.log [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -20,9 +20,9 @@ - ${PATH}/info.log + ${logPath}/info.log - logs/info.%d{yyyy-MM-dd}.log + ${logPath}/info.%d{yyyy-MM-dd}.log [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -35,9 +35,9 @@ - ${PATH}/debug.log + ${logPath}/debug.log - logs/debug.%d{yyyy-MM-dd}.log + ${logPath}/debug.%d{yyyy-MM-dd}.log [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -51,9 +51,9 @@ - ${PATH}/warn.log + ${logPath}/warn.log - logs/warn.%d{yyyy-MM-dd}.log + ${logPath}/warn.%d{yyyy-MM-dd}.log [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -68,9 +68,9 @@ - ${PATH}/error.log + ${logPath}/error.log - logs/error.%d{yyyy-MM-dd}.log + ${logPath}/error.%d{yyyy-MM-dd}.log [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n From 8263601e7f4e734a1444991055e5f33ed51bacf4 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Fri, 21 Sep 2018 17:02:50 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[=E6=8C=87=E5=AE=9A=E6=97=A5=E5=BF=97loggin?= =?UTF-8?q?g.path][=E6=96=B0=E5=A2=9E]:=E6=97=A5=E5=BF=97=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E8=A1=8C=E6=8C=87=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/logback-spring.xml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mallinkBApi/src/main/resources/logback-spring.xml b/mallinkBApi/src/main/resources/logback-spring.xml index fe80d3c3a..1d04331e4 100644 --- a/mallinkBApi/src/main/resources/logback-spring.xml +++ b/mallinkBApi/src/main/resources/logback-spring.xml @@ -10,9 +10,9 @@ - ${PATH}/trace.log + ${logPath}/trace.log - logs/trace.%d{yyyy-MM-dd}.log + ${logPath}/trace.%d{yyyy-MM-dd}.log [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -20,9 +20,9 @@ - ${PATH}/info.log + ${logPath}/info.log - logs/info.%d{yyyy-MM-dd}.log + ${logPath}/info.%d{yyyy-MM-dd}.log [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -35,9 +35,9 @@ - ${PATH}/debug.log + ${logPath}/debug.log - logs/debug.%d{yyyy-MM-dd}.log + ${logPath}/debug.%d{yyyy-MM-dd}.log [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -51,9 +51,9 @@ - ${PATH}/warn.log + ${logPath}/warn.log - logs/warn.%d{yyyy-MM-dd}.log + ${logPath}/warn.%d{yyyy-MM-dd}.log [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n @@ -68,9 +68,9 @@ - ${PATH}/error.log + ${logPath}/error.log - logs/error.%d{yyyy-MM-dd}.log + ${logPath}/error.%d{yyyy-MM-dd}.log [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n From 7283a60feea03d7ea4ff816ba292409a720a99d3 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 22 Sep 2018 13:52:01 +0800 Subject: [PATCH 3/6] =?UTF-8?q?[appinfo=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E5=A4=84=E7=90=86][=E4=BF=AE=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/controller/BaseController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index 2bdb76ad0..22d9365a9 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -87,6 +87,9 @@ public class BaseController { public WxMaService getWeappService(String appId) { WxAppinfo appinfo = wxAppinfoService.getByAppId(appId); + if (appinfo == null) { + return null; + } WxMaService service = MaUtil.getWeappService(appinfo); return service; } From 2f97b8ffcbe5191e6644184ee86ebf7ca46d02df Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 22 Sep 2018 13:57:19 +0800 Subject: [PATCH 4/6] =?UTF-8?q?[=E6=88=90=E9=95=BF=E5=80=BC=E5=A4=9A?= =?UTF-8?q?=E7=A7=9F=E6=88=B7=E6=94=AF=E6=8C=81][=E4=BF=AE=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxScoreRulesController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreRulesController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreRulesController.java index 10aa278a8..784ed16e2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreRulesController.java @@ -30,6 +30,7 @@ public class WxScoreRulesController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxScoreRules wxScoreRules, Integer pageNum, Integer pageSize) { if (null == wxScoreRules) wxScoreRules = new WxScoreRules(); + wxScoreRules.setTenantId(getTenantId()); final PageInfo page = wxScoreRulesService.listAsPage(wxScoreRules, pageNum, pageSize); return new ResultData(page); } @@ -47,6 +48,7 @@ public class WxScoreRulesController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxScoreRules wxScoreRules) { + wxScoreRules.setTenantId(getTenantId()); wxScoreRulesService.saveOrUpdate(wxScoreRules); return new ResultData(); } From cf5ac01db125350cf3d5145721480c35cc21b1cf Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 22 Sep 2018 21:10:31 +0800 Subject: [PATCH 5/6] =?UTF-8?q?[=E6=A0=87=E7=AD=BE=E7=9F=AD=E4=BF=A1][?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/service/impl/WxMsgServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index 1b2d75524..4d1601d37 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -69,6 +69,8 @@ public class WxMsgServiceImpl implements WxMsgService { if(phones.equals("")){ return new ResultData(ErrorCode.MSG_PHONE_NOT_FOUND, "请输入手机号"); + } else { + wxMsg.setPhones(phones); } if (wxMsg.getId() == null) { From 852356a43b8a9862872c37bf95e8624f18a1ac75 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 22 Sep 2018 21:14:03 +0800 Subject: [PATCH 6/6] =?UTF-8?q?[=E6=A0=87=E7=AD=BE=E7=9F=AD=E4=BF=A1][?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/controller/WxMsgController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java index d971cb9a6..e60920aa9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java @@ -47,8 +47,7 @@ public class WxMsgController extends BaseController { //Assert.notNull(wxMsg.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxMsg.setTenantId(getTenantId()); - wxMsgService.saveOrUpdate(wxMsg); - return new ResultData(); + return wxMsgService.saveOrUpdate(wxMsg); } @ApiOperation("根据id更新接口")