From 7c89a6361e3df6c5719f1b445716bf769a0d7cb6 Mon Sep 17 00:00:00 2001
From: Yan <Yan@DESKTOP-66E87L5>
Date: Sat, 8 Mar 2025 16:33:05 +0800
Subject: [PATCH] 2.1.2 Logback.xml update, camel version minor update

---
 bruno/updateUser.bru                               | 8 ++++----
 conf/logback.xml                                   | 4 +---
 conf2/logback.xml                                  | 4 +---
 pom.xml                                            | 4 ++--
 src/main/java/com/example/sbcamel/CamelRouter.java | 5 +++--
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/bruno/updateUser.bru b/bruno/updateUser.bru
index 0f1bee9..097fdf3 100644
--- a/bruno/updateUser.bru
+++ b/bruno/updateUser.bru
@@ -5,7 +5,7 @@ meta {
 }
 
 post {
-  url: http://localhost:9090/services/api/user
+  url: http://localhost:9091/services/api/user
   body: json
   auth: basic
 }
@@ -22,7 +22,7 @@ auth:basic {
 
 body:json {
   {
-    "id": 2,
-    "name": "Wallie West"
-  }
+      "id": 4,
+      "name": "Diana Themyscira"
+    }
 }
diff --git a/conf/logback.xml b/conf/logback.xml
index c3c1afd..43014b7 100644
--- a/conf/logback.xml
+++ b/conf/logback.xml
@@ -19,9 +19,7 @@
 			<pattern>%-5level %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
 		</encoder>
 	</appender>
-	<logger name="org.springframework.security.ldap.userdetails" level="TRACE" /> 
-	<logger name="org.springframework.security" level="DEBUG" /> 
-	<logger name="com.example.camel" level="DEBUG" /> 
+	<logger name="com.example.sbcamel" level="DEBUG" /> 
 	<root level="INFO">
 		<appender-ref ref="STDOUT" />
 	</root>
diff --git a/conf2/logback.xml b/conf2/logback.xml
index c3c1afd..43014b7 100644
--- a/conf2/logback.xml
+++ b/conf2/logback.xml
@@ -19,9 +19,7 @@
 			<pattern>%-5level %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n</pattern>
 		</encoder>
 	</appender>
-	<logger name="org.springframework.security.ldap.userdetails" level="TRACE" /> 
-	<logger name="org.springframework.security" level="DEBUG" /> 
-	<logger name="com.example.camel" level="DEBUG" /> 
+	<logger name="com.example.sbcamel" level="DEBUG" /> 
 	<root level="INFO">
 		<appender-ref ref="STDOUT" />
 	</root>
diff --git a/pom.xml b/pom.xml
index 93fbbc5..f03c3e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.example</groupId>
 	<artifactId>camel-springboot-activemq6-example</artifactId>
-	<version>2.1.1</version>
+	<version>2.1.2</version>
 	<name>camel-springboot-activemq6-example</name>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -15,7 +15,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
-		<camel.version>4.8.3</camel.version>
+		<camel.version>4.8.4</camel.version>
 		<springboot.version>${project.parent.version}</springboot.version>
 		<mybatis.version>3.5.19</mybatis.version>
 		<mybatis-spring.version>3.0.4</mybatis-spring.version>
diff --git a/src/main/java/com/example/sbcamel/CamelRouter.java b/src/main/java/com/example/sbcamel/CamelRouter.java
index 0f19c69..50a61c6 100644
--- a/src/main/java/com/example/sbcamel/CamelRouter.java
+++ b/src/main/java/com/example/sbcamel/CamelRouter.java
@@ -35,6 +35,7 @@ public class CamelRouter extends RouteBuilder {
 
 	@PostConstruct
 	private void init() {
+		org.apache.ibatis.logging.LogFactory.useSlf4jLogging();
 		jdbcTemplate.execute(createUserSql);
 	}
 
@@ -73,8 +74,8 @@ public class CamelRouter extends RouteBuilder {
 				.when(header(BeanConstants.BEAN_METHOD_NAME).isEqualTo("findUsers"))
 				.to("mybatis:com.example.sbcamel.mapper.UserMapper.findUsers?statementType=SelectList")
 				.when(header(BeanConstants.BEAN_METHOD_NAME).isEqualTo("findUser"))
-				.to("mybatis:com.example.sbcamel.mapper.UserMapper.findUser?statementType=SelectOne").end().marshal()
-				.json(JsonLibrary.Jackson);
+				.to("mybatis:com.example.sbcamel.mapper.UserMapper.findUser?statementType=SelectOne")
+				.end().marshal().json(JsonLibrary.Jackson);
 	}
 
 }
\ No newline at end of file