4.1.18 中建企业微信同步逻辑调整,添加日志

platomix-gmetry-system-api/pom.xml

@@ -10,7 +10,7 @@
     <!--    日期和版本号需要同时升级-->
     <!--    4.2.64-2024.07.22->4.2.65-2024.07.22->4.2.66-2024.07.23-->
     <artifactId>platomix-gmetry-system-api</artifactId>
-    <version>4.1.17-20241114</version>
+    <version>4.1.18-20241129</version>
     <dependencies>
         <dependency>
             <groupId>com.platomix</groupId>

platomix-gmetry-system-api/src/main/java/org/springblade/wecom/controller/WeComController.java

@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -100,7 +101,9 @@ public class WeComController {
 		System.out.println("获取用户信息地址 userinfoUrl = " + userinfoUrl);
 		String res = HttpUtil.createGet(userinfoUrl).form(formMap).execute().body();
 		JSONObject jsonObject = JSONObject.parseObject(res);
-		System.out.println("res jsonObject = " + jsonObject);
+		SimpleDateFormat simple = new SimpleDateFormat("yyyy-MM-dd");
+		String format = simple.format(new Date());
+		System.out.println("pc res jsonObject = " + jsonObject + "time = " + format);
 		if (Objects.nonNull(jsonObject.get("errcode")) && jsonObject.getInteger("errcode") == 0) {
 			String userid = "";
 			if(domainName.contains("weixin")){
@@ -109,10 +112,12 @@ public class WeComController {
 			if(domainName.contains("cscec8b")){
 				userid = jsonObject.getString("UserId");
 			}
+			System.out.println("pc res userid = " + userid + "time = " + format);
 			BladeUser bladeUser = bladeUserService.getOne(new LambdaQueryWrapper<BladeUser>()
 					.eq(BladeUser::getThirdUserId, userid)
+					.eq(BladeUser::getIsDeleted, 0)
 			);
-			System.out.println("UserId = " + userid);
+			System.out.println("pc res bladeUser = " + bladeUser + "time = " + format);
 			User user = new User();
 			BeanUtils.copyProperties(bladeUser,user);
 			userInfo = userServiceImpl.userInfo(user, UserEnum.WEB);
@@ -454,12 +459,17 @@ public class WeComController {
 		formMap.put("code", code);
 		String res = HttpUtil.createGet(userinfoUrl).form(formMap).execute().body();
 		JSONObject jsonObject = JSONObject.parseObject(res);
-		System.out.println("jsonObject = " + jsonObject);
+		SimpleDateFormat simple = new SimpleDateFormat("yyyy-MM-dd");
+		String format = simple.format(new Date());
+		System.out.println("qywx res jsonObject = " + jsonObject + "time = " + format);
 		if (Objects.nonNull(jsonObject.get("errcode")) && jsonObject.getInteger("errcode") == 0) {
 			String userid = jsonObject.getString("userid");
+			System.out.println("qywx userid  = " + userid + "time = " + format);
 			BladeUser bladeUser = bladeUserService.getOne(new LambdaQueryWrapper<BladeUser>()
 					.eq(BladeUser::getThirdUserId, userid)
+					.eq(BladeUser::getIsDeleted, 0)
 			);
+			System.out.println("qywx bladeUser  = " + bladeUser + "time = " + format);
 			User user = new User();
 			BeanUtils.copyProperties(bladeUser,user);
 			userInfo.setUser(user);