瀏覽代碼

修改中建获取userid,升级4.1.28-20241230

changyuchun 1 月之前
父節點
當前提交
ced3c21f71

+ 15 - 15
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.27-20241229</version>
+    <version>4.1.28-20241230</version>
     <dependencies>
         <dependency>
             <groupId>com.platomix</groupId>
@@ -82,20 +82,20 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
-<!--			<plugin>-->
-<!--	             <groupId>io.fabric8</groupId>-->
-<!--	             <artifactId>docker-maven-plugin</artifactId>-->
-<!--	             <executions>-->
-<!--	                 <execution>-->
-<!--	                     <id>build-push</id>-->
-<!--	                     <phase>package</phase>-->
-<!--	                     <goals>-->
-<!--	                         <goal>build</goal>-->
-<!--	                         <goal>push</goal>-->
-<!--	                     </goals>-->
-<!--	                 </execution>-->
-<!--	             </executions>-->
-<!--	         </plugin>-->
+			<plugin>
+	             <groupId>io.fabric8</groupId>
+	             <artifactId>docker-maven-plugin</artifactId>
+	             <executions>
+	                 <execution>
+	                     <id>build-push</id>
+	                     <phase>package</phase>
+	                     <goals>
+	                         <goal>build</goal>
+	                         <goal>push</goal>
+	                     </goals>
+	                 </execution>
+	             </executions>
+	         </plugin>
         </plugins>
     </build>
 

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

@@ -2,6 +2,7 @@ package org.springblade.wecom.controller;
 
 
 import cn.hutool.core.net.url.UrlQuery;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.URLUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -503,7 +504,7 @@ public class WeComController {
 		String format = simple.format(new Date());
 		log.info("qywx res jsonObject = " + jsonObject + "time = " + format);
 		if (Objects.nonNull(jsonObject.get("errcode")) && jsonObject.getInteger("errcode") == 0) {
-			String userid = jsonObject.getString("userid");
+			String userid = StrUtil.isNotEmpty(jsonObject.getString("userid")) ?jsonObject.getString("userid"):jsonObject.getString("UserId");
 			log.info("qywx userid  = " + userid + "time = " + format);
 			BladeUser bladeUser = bladeUserService.getOne(new LambdaQueryWrapper<BladeUser>()
 					.eq(BladeUser::getThirdUserId, userid)