diff --git a/example-mybatis-plus/pom.xml b/example-mybatis-plus/pom.xml
index 7ab18dd0a072282aa74fc01707f479ad1bee0d81..17fce4bbe65cbd74988bf7bc9f50d46fa760de0b 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 344c1065dc6869ecda222fdf49870521665de0e7..73d3df27280bd57d9bfadda7d5bab14ee0ed2a29 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 d6a826ce893079b4b6a1e0fed2ae4d8b683938af..675fa46f8f2450398bf614643e453485ef05b400 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 0000000000000000000000000000000000000000..0ac045cb0271c82a5580519ac3877846b5dac1a6
--- /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-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 5032af33b79af491c5fb648328eb3292e321b176..7e1b8feba755a6919e94679e42dc70f702d56b39 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-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 7225148a28381da38675602744ccdc416b0cf9ad..8e35d1f5751cfcb1440a228f06c57489025f2dbc 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("========");
}
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 56f32ec890728b42df085364f02c6ed654a3a1de..fd7300ff2fc8443131bc376fccf0d77f40db6974 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 cb6225aaa87ef9aba3eda6933924da996ca47edd..9b00f0b120e3b605ff0eb25d9d014c5726d92503 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 38ec51bb9b6910a9fcb1696ca42d3576f9742665..b5444c3086433a200172af2a1c1f38c3e25255b8 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/example-swagger/pom.xml b/example-swagger/pom.xml
index afa65340592fb8ad895a1a2b9d34c72aed1975e5..6ac228095691ade6e1b1bd1d1836d45393119d37 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 62106fb3732fee3408673e2931ba6fb3e2d3c2ff..a5262f21f1f148de15a1571bedab2518f43686de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,7 @@
example-spring-actuator
example-spring-cloud
example-open
+ example-swagger
@@ -28,6 +29,9 @@
1.8
Finchley.SR1
1.2.0
+ 1.1.7
+ 1.7.21
+ 1.2.17
@@ -118,7 +122,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
+