unionid切换openid

admin/src/main/java/com/kym/admin/config/SaTokenConfigure.java

@@ -21,6 +21,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                 .addPathPatterns("/**")
                 // login接口不鉴权
                 .excludePathPatterns(
+                        "/wx/*",
                         "/**/login",
                         "/**/error",
                         "/**/pullEnStations",

admin/src/main/java/com/kym/admin/controller/WxKanbanController.java

@@ -59,9 +59,9 @@ public class WxKanbanController extends IController {
         return resp(()->adminUserService.wxLogin(user));
     }
 
-    @PostMapping("loginByUnion")
+    @PostMapping("loginByOpenId")
     public R<?> loginByUnion(@RequestBody AdminUser  user) {
-        return resp(()->adminUserService.loginByUnion(user));
+        return resp(()->adminUserService.loginByOpenId(user));
     }
 
 

admin/src/main/resources/application-dev.yml

@@ -38,8 +38,8 @@ wechat:
 
 #运营看板小程序
   kanban:
-    appid: wx369fcff95d387bde
-    secret: e36560b99afd5f744754cd09e8f6cc2a
+    appid: wx35b22037ccbc7b3f
+    secret: b59ff1b7d160b5c0efe33570a2f3fdf2
     token:
 
   fapiao:

database/4.sql

@@ -0,0 +1,2 @@
+alter table t_admin_user
+    add open_id varchar(128) null comment '微信号' after mobile_phone;

entity/src/main/java/com/kym/entity/admin/AdminUser.java

@@ -74,8 +74,8 @@ public class AdminUser extends BaseEntity implements Serializable {
 
 
     /**
-     * 微信小程序unionid
+     * 微信小程序open id
      */
-    private String unionId;
+    private String openId;
 
 }

mapper/src/main/resources/mappers/admin/AdminUserMapper.xml

@@ -10,7 +10,7 @@
         <result column="password" property="password" />
         <result column="nickname" property="nickname" />
         <result column="mobile_phone" property="mobilePhone" />
-        <result column="union_id" property="unionId" />
+        <result column="open_id" property="openId" />
         <result column="avatar" property="avatar" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -35,7 +35,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_id, username, password, nickname, mobile_phone,union_id, avatar, status, create_time, update_time, last_login_time
+        id, company_id, username, password, nickname, mobile_phone,open_id, avatar, status, create_time, update_time, last_login_time
     </sql>
 
     <select id="listUserPermissions" resultMap="AdminUserVoMap" parameterType="java.lang.Long">

service/src/main/java/com/kym/service/admin/AdminUserService.java

@@ -42,5 +42,5 @@ public interface AdminUserService extends MPJBaseService<AdminUser> {
 
     Object wxLogin(AdminUser user);
 
-    Object loginByUnion(AdminUser user);
+    Object loginByOpenId(AdminUser user);
 }

service/src/main/java/com/kym/service/admin/impl/AdminUserServiceImpl.java

@@ -32,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -176,10 +177,10 @@ public class AdminUserServiceImpl extends MPJBaseServiceImpl<AdminUserMapper, Ad
 
     @Override
     public Object wxLogin(AdminUser user) {
-        CommUtil.asserts(CommUtil.isNotEmptyAndNull(user.getUnionId()), "微信账户信息错误");
+        CommUtil.asserts(CommUtil.isNotEmptyAndNull(user.getOpenId()), "微信账户信息错误");
 
         var adminUser = lambdaQuery()
-                .eq(AdminUser::getUnionId, user.getUnionId())
+                .eq(AdminUser::getOpenId, user.getOpenId())
                 .eq(AdminUser::getMobilePhone, user.getMobilePhone())
                 .eq(AdminUser::getStatus, AdminUser.STATUS_启用).one();
         if (null == adminUser) {
@@ -188,13 +189,13 @@ public class AdminUserServiceImpl extends MPJBaseServiceImpl<AdminUserMapper, Ad
                     .eq(AdminUser::getMobilePhone, user.getMobilePhone())
                     .eq(AdminUser::getStatus, AdminUser.STATUS_启用).one();
             if (null != adminUser) {
-                adminUser.setUnionId(user.getUnionId());
+                adminUser.setOpenId(user.getOpenId());
             } else {
                 //自动注册
                 CommUtil.asserts(CommUtil.isNotEmptyAndNull(user.getMobilePhone()), "手机号不能为空");
                 adminUser = new AdminUser();
                 adminUser.setId(IDGenerator.INS().nextId());
-                adminUser.setUnionId(user.getUnionId());
+                adminUser.setOpenId(user.getOpenId());
                 adminUser.setStatus(AdminUser.STATUS_启用);
                 adminUser.setMobilePhone(user.getMobilePhone());
                 adminUser.setUsername(user.getMobilePhone());
@@ -210,21 +211,21 @@ public class AdminUserServiceImpl extends MPJBaseServiceImpl<AdminUserMapper, Ad
         user.setLastLoginTime(LocalDateTime.now());
         user.setMobilePhone(user.getMobilePhone());
         this.updateById(adminUser);
-        LOGGER.info("微信用户union:{},name:{},phone:{},id:{}登录", adminUser.getUnionId(), adminUser.getUsername(), adminUser.getMobilePhone(), adminUser.getId());
+        LOGGER.info("微信用户union:{},name:{},phone:{},id:{}登录", adminUser.getOpenId(), adminUser.getUsername(), adminUser.getMobilePhone(), adminUser.getId());
         // token在cookie中有隐式返回，这里多做显式返回
         user.setPassword(null);
-        user.setUnionId(null);
+        user.setOpenId(null);
         return Map.of("user", user, "satoken", StpUtil.getTokenValue());
     }
 
     @Override
-    public Object loginByUnion(AdminUser user) {
-        CommUtil.asserts(CommUtil.isNotEmptyAndNull(user.getUnionId()), "微信账户信息错误");
+    public Object loginByOpenId(AdminUser user) {
+        CommUtil.asserts(CommUtil.isNotEmptyAndNull(user.getOpenId()), "微信账户信息错误");
         var adminUser = lambdaQuery()
-                .eq(AdminUser::getUnionId, user.getUnionId())
+                .eq(AdminUser::getOpenId, user.getOpenId())
                 .eq(AdminUser::getStatus, AdminUser.STATUS_启用).one();
         if(null==adminUser){
-            return Map.of("user", adminUser);
+            return Collections.emptyMap();
         }else{
             StpUtil.login(adminUser.getId());
             // 用户名存入session，统一日志读取使用
@@ -234,7 +235,7 @@ public class AdminUserServiceImpl extends MPJBaseServiceImpl<AdminUserMapper, Ad
             user.setMobilePhone(user.getMobilePhone());
             this.updateById(adminUser);
             user.setPassword(null);
-            user.setUnionId(null);
+            user.setOpenId(null);
             return Map.of("user", user, "satoken", StpUtil.getTokenValue());
         }
     }