2023年1月8 13:44

blade-auth/pom.xml

@@ -85,12 +85,6 @@
             <groupId>com.github.whvcse</groupId>
             <artifactId>easy-captcha</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>blade-client-api</artifactId>
-            <version>2.8.2.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
         <!-- 链路追踪、服务监控 -->
         <!--<dependency>
             <groupId>org.springblade</groupId>

blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java

@@ -22,8 +22,6 @@ import lombok.SneakyThrows;
 import org.apache.commons.lang.StringUtils;
 import org.springblade.auth.constant.AuthConstant;
 import org.springblade.auth.utils.TokenUtil;
-import org.springblade.client.entity.WxUnionIdOpenId;
-import org.springblade.client.feign.IWxUnionIdOpenIdClient;
 import org.springblade.common.cache.CacheNames;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.tool.api.R;
@@ -34,6 +32,8 @@ import org.springblade.system.user.entity.User;
 import org.springblade.system.user.entity.UserInfo;
 import org.springblade.system.user.enums.UserEnum;
 import org.springblade.system.user.feign.IUserClient;
+import org.springblade.system.user.feign.IWxUnionIdOpenIdClient;
+import org.springblade.system.user.entity.WxUnionIdOpenId;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -104,9 +104,11 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 			}
 
 			//根据unionId查询微信信息表是否存在该unionId
-			WxUnionIdOpenId wxUnionIdOpenId = wxUnionIdOpenIdClient.getWxUnionId(unionId);
-			if (ObjectUtil.isNotEmpty(wxUnionIdOpenId)){//存在 更新公众号openid
-				user.setOaOpenId(wxUnionIdOpenId.getOpenId());
+			if (ObjectUtil.isNotEmpty(unionId)){
+				WxUnionIdOpenId wxUnionIdOpenId = wxUnionIdOpenIdClient.getWxUnionId(unionId);
+				if (ObjectUtil.isNotEmpty(wxUnionIdOpenId)){//存在 更新公众号openid
+					user.setOaOpenId(wxUnionIdOpenId.getOpenId());
+				}
 			}
 			user.setOpenId(openId);
 			user.setUnionId(unionId);

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/WxUnionIdOpenId.java → blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/WxUnionIdOpenId.java

@@ -1,4 +1,4 @@
-package org.springblade.client.entity;
+package org.springblade.system.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/IWxUnionIdOpenIdClient.java → blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IWxUnionIdOpenIdClient.java

@@ -1,12 +1,12 @@
-package org.springblade.client.feign;
+package org.springblade.system.user.feign;
 
-import org.springblade.client.entity.WxUnionIdOpenId;
-import org.springblade.common.constant.LauncherConstant;
+import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.system.user.entity.WxUnionIdOpenId;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 @FeignClient(
-	value = LauncherConstant.APPLICATION_CLIENT_NAME
+	value = AppConstant.APPLICATION_USER_NAME
 )
 /**
  * 公众号信息对外访问API
@@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.*;
 public interface IWxUnionIdOpenIdClient {
 
 	String API_PREFIX = "/client";
-	String GET_WX_UNION_ID = "/getWxUnionId";
-	String INSERT_WX_UO = "/insertWxUO";
-	String UPDATE_WX_UO = "/updateWxUO";
+	String GET_WX_UNION_ID = API_PREFIX + "/getWxUnionId";
+	String INSERT_WX_UO = API_PREFIX + "/insertWxUO";
+	String UPDATE_WX_UO = API_PREFIX + "/updateWxUO";
 
 	/**
 	 * 根据unionId查询

blade-service/blade-client/pom.xml

@@ -148,6 +148,12 @@
             <artifactId>bcprov-jdk15on</artifactId>
             <version>1.50</version>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-user</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

blade-service/blade-client/src/main/java/org/springblade/client/wechat/controller/WxUnionIdOpenIdController.java

@@ -1,29 +1,18 @@
 package org.springblade.client.wechat.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springblade.client.entity.WxUnionIdOpenId;
-import org.springblade.client.wechat.Util.HttpUtil;
+import org.springblade.system.user.feign.IWxUnionIdOpenIdClient;
+import org.springblade.system.user.entity.WxUnionIdOpenId;
 import org.springblade.client.wechat.Util.WXPayXmlUtil;
 import org.springblade.client.wechat.Util.WxUtil;
-import org.springblade.client.wechat.service.IWxUnionIdOpenIdService;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.xml.parsers.DocumentBuilder;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -37,7 +26,7 @@ import java.util.Map;
 @AllArgsConstructor
 public class WxUnionIdOpenIdController {
 
-	private final IWxUnionIdOpenIdService wxUnionIdOpenIdService;
+	 private final IWxUnionIdOpenIdClient wxUnionIdOpenIdClient;
 
 	//公众号的appId以及secret
 	private static final String appId = "wxf077390a6ec17f23";
@@ -65,14 +54,14 @@ public class WxUnionIdOpenIdController {
 
 			if (ObjectUtil.isNotEmpty(unionId)){
 				//根据unionId查询数据库是否存在
-				WxUnionIdOpenId wxUnionIdOpenId = wxUnionIdOpenIdService.getWxUnionId(userMap.get("unionid"));
+				WxUnionIdOpenId wxUnionIdOpenId = wxUnionIdOpenIdClient.getWxUnionId(userMap.get("unionid"));
 				if (ObjectUtil.isEmpty(wxUnionIdOpenId)){//不存在 新增
 					wxUnionIdOpenId.setOpenId(openId);
 					wxUnionIdOpenId.setUnionId(unionId);
-					wxUnionIdOpenIdService.insert(wxUnionIdOpenId);
+					wxUnionIdOpenIdClient.insertWxUO(wxUnionIdOpenId);
 				}else {//存在 则更新
 					wxUnionIdOpenId.setOpenId(openId);
-					wxUnionIdOpenIdService.updateById(wxUnionIdOpenId);
+					wxUnionIdOpenIdClient.updateWxUO(wxUnionIdOpenId);
 				}
 			}
 

blade-service/blade-school/src/main/java/org/springblade/school/controller/WxTest.java

@@ -6,8 +6,8 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springblade.client.entity.WxUnionIdOpenId;
-import org.springblade.client.feign.IWxUnionIdOpenIdClient;
+import org.springblade.system.user.entity.WxUnionIdOpenId;
+import org.springblade.system.user.feign.IWxUnionIdOpenIdClient;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.school.util.WXPayXmlUtil;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -62,11 +62,12 @@ public class WxTest {
 
 			if (ObjectUtil.isNotEmpty(unionId)){
 				//根据unionId查询数据库是否存在
-				WxUnionIdOpenId wxUnionIdOpenId = wxUnionIdOpenIdClient.getWxUnionId(userMap.get("unionid"));
+				WxUnionIdOpenId wxUnionIdOpenId = wxUnionIdOpenIdClient.getWxUnionId(unionId);
 				if (ObjectUtil.isEmpty(wxUnionIdOpenId)){//不存在 新增
-					wxUnionIdOpenId.setOpenId(openId);
-					wxUnionIdOpenId.setUnionId(unionId);
-					wxUnionIdOpenIdClient.insertWxUO(wxUnionIdOpenId);
+					WxUnionIdOpenId item = new WxUnionIdOpenId();
+					item.setOpenId(openId);
+					item.setUnionId(unionId);
+					wxUnionIdOpenIdClient.insertWxUO(item);
 				}else {//存在 则更新
 					wxUnionIdOpenId.setOpenId(openId);
 					wxUnionIdOpenIdClient.updateWxUO(wxUnionIdOpenId);

blade-service/blade-client/src/main/java/org/springblade/client/wechat/feign/WxUnionIdOpenIdClient.java → blade-service/blade-user/src/main/java/org/springblade/system/user/feign/WxUnionIdOpenIdClient.java

@@ -1,12 +1,11 @@
-package org.springblade.client.wechat.feign;
+package org.springblade.system.user.feign;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.client.entity.WxUnionIdOpenId;
-import org.springblade.client.feign.IWxUnionIdOpenIdClient;
-import org.springblade.client.wechat.service.IWxUnionIdOpenIdService;
 import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.system.user.entity.WxUnionIdOpenId;
+import org.springblade.system.user.service.IWxUnionIdOpenIdService;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -21,7 +20,7 @@ public class WxUnionIdOpenIdClient implements IWxUnionIdOpenIdClient {
 
 	@Override
 	public WxUnionIdOpenId getWxUnionId(String unionId) {
-		return wxUnionIdOpenIdService.getOne(new QueryWrapper<WxUnionIdOpenId>().eq("unionId", unionId));
+		return wxUnionIdOpenIdService.getOne(new QueryWrapper<WxUnionIdOpenId>().eq("union_id", unionId));
 	}
 
 	@Override

blade-service/blade-client/src/main/java/org/springblade/client/wechat/mapper/WxUnionIdOpenIdMapper.java → blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/WxUnionIdOpenIdMapper.java

@@ -1,7 +1,7 @@
-package org.springblade.client.wechat.mapper;
+package org.springblade.system.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.client.entity.WxUnionIdOpenId;
+import org.springblade.system.user.entity.WxUnionIdOpenId;
 
 /**
  * 微信公众号信息表 Mapper 接口

blade-service/blade-client/src/main/java/org/springblade/client/wechat/mapper/WxUnionIdOpenIdMapper.xml → blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/WxUnionIdOpenIdMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.client.wechat.mapper.WxUnionIdOpenIdMapper">
+<mapper namespace="org.springblade.system.user.mapper.WxUnionIdOpenIdMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="bidingItemsResultMap" type="org.springblade.client.entity.WxUnionIdOpenId">
+    <resultMap id="bidingItemsResultMap" type="org.springblade.system.user.entity.WxUnionIdOpenId">
         <id column="id" property="id"/>
         <result column="open_id" property="openId"/>
         <result column="union_id" property="unionId"/>

blade-service/blade-client/src/main/java/org/springblade/client/wechat/service/IWxUnionIdOpenIdService.java → blade-service/blade-user/src/main/java/org/springblade/system/user/service/IWxUnionIdOpenIdService.java

@@ -1,7 +1,7 @@
-package org.springblade.client.wechat.service;
+package org.springblade.system.user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.client.entity.WxUnionIdOpenId;
+import org.springblade.system.user.entity.WxUnionIdOpenId;
 
 /**
  * 微信信息 服务类

blade-service/blade-client/src/main/java/org/springblade/client/wechat/service/impl/WxUnionIdOpenIdServiceImpl.java → blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/WxUnionIdOpenIdServiceImpl.java

@@ -1,11 +1,11 @@
-package org.springblade.client.wechat.service.impl;
+package org.springblade.system.user.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
-import org.springblade.client.entity.WxUnionIdOpenId;
-import org.springblade.client.wechat.mapper.WxUnionIdOpenIdMapper;
-import org.springblade.client.wechat.service.IWxUnionIdOpenIdService;
+import org.springblade.system.user.entity.WxUnionIdOpenId;
+import org.springblade.system.user.mapper.WxUnionIdOpenIdMapper;
+import org.springblade.system.user.service.IWxUnionIdOpenIdService;
 import org.springframework.stereotype.Service;
 
 /**