From 37cc2ce8bb44a123b605c0b6c401fec963bfc7ac Mon Sep 17 00:00:00 2001 From: gu_zhang_w Date: Tue, 23 Jun 2020 18:17:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../south/example/cloud/base/flowable/FlowableApplication.java | 1 + 1 file changed, 1 insertion(+) diff --git a/example-spring-cloud/spring-cloud-base/spring-cloud-base-flowable/src/main/java/org/nm/south/example/cloud/base/flowable/FlowableApplication.java b/example-spring-cloud/spring-cloud-base/spring-cloud-base-flowable/src/main/java/org/nm/south/example/cloud/base/flowable/FlowableApplication.java index 7225148..8e35d1f 100644 --- a/example-spring-cloud/spring-cloud-base/spring-cloud-base-flowable/src/main/java/org/nm/south/example/cloud/base/flowable/FlowableApplication.java +++ b/example-spring-cloud/spring-cloud-base/spring-cloud-base-flowable/src/main/java/org/nm/south/example/cloud/base/flowable/FlowableApplication.java @@ -15,6 +15,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; public class FlowableApplication { public static void main(String[] args) { SpringApplication.run(FlowableApplication.class,args); + System.out.println("========"); } -- Gitee From 2659cd91480b22182b52756ebcfe81ddbd146295 Mon Sep 17 00:00:00 2001 From: gu_zhang_w Date: Tue, 22 Sep 2020 09:46:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=9B=86=E6=88=90logback?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example-mybatis-plus/pom.xml | 16 ++++ .../sys/controller/UserController.java | 10 +++ .../src/main/resources/application.yml | 4 +- .../src/main/resources/logback-spring.xml | 82 +++++++++++++++++++ .../src/main/resources/application.yml | 6 +- .../rockemq/base/AsynchronousProducer.java | 6 +- .../spring/cloud/rockemq/base/Consumer.java | 2 +- pom.xml | 24 +++++- 8 files changed, 141 insertions(+), 9 deletions(-) create mode 100644 example-mybatis-plus/src/main/resources/logback-spring.xml diff --git a/example-mybatis-plus/pom.xml b/example-mybatis-plus/pom.xml index 7ab18dd..17fce4b 100644 --- a/example-mybatis-plus/pom.xml +++ b/example-mybatis-plus/pom.xml @@ -82,6 +82,22 @@ freemarker 2.3.23 + + log4j + log4j + + + org.slf4j + slf4j-api + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + diff --git a/example-mybatis-plus/src/main/java/org/nm/example/sys/controller/UserController.java b/example-mybatis-plus/src/main/java/org/nm/example/sys/controller/UserController.java index 344c106..73d3df2 100644 --- a/example-mybatis-plus/src/main/java/org/nm/example/sys/controller/UserController.java +++ b/example-mybatis-plus/src/main/java/org/nm/example/sys/controller/UserController.java @@ -1,6 +1,8 @@ package org.nm.example.sys.controller; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.extension.api.ApiController; @@ -13,8 +15,16 @@ import com.baomidou.mybatisplus.extension.api.ApiController; * @author jobob * @since 2018-11-03 */ +@Slf4j @RestController @RequestMapping("/sys/user") public class UserController extends ApiController { + @GetMapping("/hello") + public String hello(){ + log.debug("hello"); + return "hi"; + } + + } diff --git a/example-mybatis-plus/src/main/resources/application.yml b/example-mybatis-plus/src/main/resources/application.yml index d6a826c..675fa46 100644 --- a/example-mybatis-plus/src/main/resources/application.yml +++ b/example-mybatis-plus/src/main/resources/application.yml @@ -63,5 +63,7 @@ mybatis-plus: # Logger Config logging: level: - org.nm.example: debug + org.nm.example: info + path: ./logs + config: classpath:logback-spring.xml # MyBatis-Plus 配置该演示无 \ No newline at end of file diff --git a/example-mybatis-plus/src/main/resources/logback-spring.xml b/example-mybatis-plus/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..0ac045c --- /dev/null +++ b/example-mybatis-plus/src/main/resources/logback-spring.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + %d{HH:mm:ss.SSS} %-5level %logger{80} - %msg%n + + + + + + true + + + error + + + ${logging.path}/${logging.project}/common-error.log + + + + ${logging.path}/${logging.project}/common-error.log.%d{yyyy-MM-dd} + + 30 + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + + UTF-8 + + + + + false + + ${logging.path}/${logging.project}/common-default.log + + + + ${logging.path}/${logging.project}/common-default.log.%d{yyyy-MM-dd} + + + 30 + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + + UTF-8 + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/example-spring-cloud/spring-cloud-base/spring-cloud-base-flowable/src/main/resources/application.yml b/example-spring-cloud/spring-cloud-base/spring-cloud-base-flowable/src/main/resources/application.yml index 56f32ec..fd7300f 100644 --- a/example-spring-cloud/spring-cloud-base/spring-cloud-base-flowable/src/main/resources/application.yml +++ b/example-spring-cloud/spring-cloud-base/spring-cloud-base-flowable/src/main/resources/application.yml @@ -4,9 +4,9 @@ server: port: 9002 spring: datasource: - url: jdbc:mysql://192.168.0.11:3306/flowable?characterEncoding=utf-8&useSSL=false - username: root - password: qwe123 + url: jdbc:mysql://rm-bp15ps09hg4ql87jtwo.mysql.rds.aliyuncs.com:3306/dev_tenant_2_erp?characterEncoding=utf-8&useSSL=false&nullCatalogMeansCurrent=true + username: dev + password: 13560744911Ww driver-class-name: com.mysql.jdbc.Driver jpa: show-sql: true diff --git a/example-spring-cloud/spring-cloud-base/spring-cloud-base-rocketmq/src/main/java/org/nm/south/spring/cloud/rockemq/base/AsynchronousProducer.java b/example-spring-cloud/spring-cloud-base/spring-cloud-base-rocketmq/src/main/java/org/nm/south/spring/cloud/rockemq/base/AsynchronousProducer.java index cb6225a..9b00f0b 100644 --- a/example-spring-cloud/spring-cloud-base/spring-cloud-base-rocketmq/src/main/java/org/nm/south/spring/cloud/rockemq/base/AsynchronousProducer.java +++ b/example-spring-cloud/spring-cloud-base/spring-cloud-base-rocketmq/src/main/java/org/nm/south/spring/cloud/rockemq/base/AsynchronousProducer.java @@ -15,8 +15,8 @@ import java.util.concurrent.TimeUnit; */ public class AsynchronousProducer { public static void main(String[] args) throws Exception { - DefaultMQProducer producer = new DefaultMQProducer("syn_message"); - producer.setNamesrvAddr("192.168.0.11:9876"); + DefaultMQProducer producer = new DefaultMQProducer("GID-ixbooking-pt-open-api"); + producer.setNamesrvAddr("47.104.233.36:9876"); producer.setVipChannelEnabled(false); producer.start(); producer.setRetryTimesWhenSendAsyncFailed(0); @@ -26,7 +26,7 @@ public class AsynchronousProducer { final int index = i; Message message = new Message( - "baseTopicTest", "tagA", "OrderID188", "hello asynchronous rocketMq".getBytes()); + "ixbooking-pt-open-api-travel-order", "tagA", "OrderID188", "hello asynchronous rocketMq".getBytes()); producer.send( message, new SendCallback() { diff --git a/example-spring-cloud/spring-cloud-base/spring-cloud-base-rocketmq/src/main/java/org/nm/south/spring/cloud/rockemq/base/Consumer.java b/example-spring-cloud/spring-cloud-base/spring-cloud-base-rocketmq/src/main/java/org/nm/south/spring/cloud/rockemq/base/Consumer.java index 38ec51b..b5444c3 100644 --- a/example-spring-cloud/spring-cloud-base/spring-cloud-base-rocketmq/src/main/java/org/nm/south/spring/cloud/rockemq/base/Consumer.java +++ b/example-spring-cloud/spring-cloud-base/spring-cloud-base-rocketmq/src/main/java/org/nm/south/spring/cloud/rockemq/base/Consumer.java @@ -17,7 +17,7 @@ import java.util.List; public class Consumer { public static void main(String[] args) throws MQClientException { DefaultMQPushConsumer consumer = new DefaultMQPushConsumer("syn_message"); - consumer.setNamesrvAddr("192.168.0.11:9876"); + consumer.setNamesrvAddr("47.104.233.36:9876"); consumer.subscribe("baseTopicTest", "*"); consumer.registerMessageListener( new MessageListenerConcurrently() { diff --git a/pom.xml b/pom.xml index 62106fb..4ba677b 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,9 @@ 1.8 Finchley.SR1 1.2.0 + 1.1.7 + 1.7.21 + 1.2.17 @@ -118,7 +121,26 @@ spring-cloud-common 1.0-SNAPSHOT - + + log4j + log4j + 1.2.17 + + + org.slf4j + slf4j-api + 1.7.21 + + + ch.qos.logback + logback-core + 1.1.7 + + + ch.qos.logback + logback-classic + 1.1.7 + -- Gitee From dce70e57234dcda4a7c028237792d546142cb596 Mon Sep 17 00:00:00 2001 From: gu_zhang_w Date: Sun, 22 Nov 2020 15:29:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=9B=86=E6=88=90logback?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nm/south/pay/controller/PayController.java | 9 ++++----- example-swagger/pom.xml | 16 +++++++--------- pom.xml | 1 + 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/example-pay/src/main/java/org/nm/south/pay/controller/PayController.java b/example-pay/src/main/java/org/nm/south/pay/controller/PayController.java index 5032af3..7e1b8fe 100644 --- a/example-pay/src/main/java/org/nm/south/pay/controller/PayController.java +++ b/example-pay/src/main/java/org/nm/south/pay/controller/PayController.java @@ -166,12 +166,10 @@ public class PayController extends AbstractPayProcessor { @ResponseBody public String refundNodify(@PathVariable PayTypeEnum payType, HttpServletRequest request) { if (payType == PayTypeEnum.WX) { - - } else if (payType == PayTypeEnum.ALI) { String responseStr = " \n" + - " \n" + - " \n" + - ""; + " \n" + + " \n" + + ""; String result = HttpKit.readData(request); Map map = PaymentKit.xmlToMap(result); String return_code = map.get("return_code"); @@ -191,6 +189,7 @@ public class PayController extends AbstractPayProcessor { log.error("微信那款通知数据解密错误"); } } + } else if (payType == PayTypeEnum.ALI) { } return null; } diff --git a/example-swagger/pom.xml b/example-swagger/pom.xml index afa6534..6ac2280 100644 --- a/example-swagger/pom.xml +++ b/example-swagger/pom.xml @@ -2,6 +2,11 @@ 4.0.0 + + example-parent + nm-example + 1.0-SNAPSHOT + nm.example example-swagger @@ -11,13 +16,6 @@ example-swagger Demo project for Spring Boot - - org.springframework.boot - spring-boot-starter-parent - 1.5.1.RELEASE - - - UTF-8 UTF-8 @@ -52,12 +50,12 @@ io.springfox springfox-swagger2 - 2.4.0 + 2.9.2 io.springfox springfox-swagger-ui - 2.4.0 + 2.9.2 net.sourceforge.nekohtml diff --git a/pom.xml b/pom.xml index 4ba677b..a5262f2 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,7 @@ example-spring-actuator example-spring-cloud example-open + example-swagger -- Gitee