完善用户信息功能

flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteAuthService.java

@@ -1,13 +1,11 @@
 package com.flossom.system.api;
 
-import com.flossom.common.core.constant.SecurityConstants;
 import com.flossom.common.core.constant.ServiceNameConstants;
+import com.flossom.common.core.domain.LoginBody;
 import com.flossom.common.core.domain.R;
-import com.flossom.system.api.domain.LoginBody;
+import com.flossom.common.core.domain.RegisterBody;
-import com.flossom.system.api.domain.RegisterBody;
+import com.flossom.common.core.domain.entity.WxUserMember;
-import com.flossom.system.api.domain.SysUser;
 import com.flossom.system.api.factory.RemoteUserFallbackFactory;
-import com.flossom.system.api.model.LoginUser;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,6 +23,9 @@ public interface RemoteAuthService
     @PostMapping("login")
     public R<Map<String, String>> login(@RequestBody LoginBody form);
 
+    @PostMapping("wxLogin")
+    public R<Map<String, String>> wxLogin(@RequestBody WxUserMember form);
+
     @PostMapping("register")
     public R<?> register(@RequestBody RegisterBody registerBody);
 

flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteFileService.java

@@ -1,5 +1,6 @@
 package com.flossom.system.api;
 
+import com.flossom.common.core.domain.SysFile;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -7,7 +8,6 @@ import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 import com.flossom.common.core.constant.ServiceNameConstants;
 import com.flossom.common.core.domain.R;
-import com.flossom.system.api.domain.SysFile;
 import com.flossom.system.api.factory.RemoteFileFallbackFactory;
 
 /**

flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteLogService.java

@@ -1,5 +1,7 @@
 package com.flossom.system.api;
 
+import com.flossom.common.core.domain.entity.SysLogininfor;
+import com.flossom.common.core.domain.entity.SysOperLog;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -7,8 +9,6 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import com.flossom.common.core.constant.SecurityConstants;
 import com.flossom.common.core.constant.ServiceNameConstants;
 import com.flossom.common.core.domain.R;
-import com.flossom.system.api.domain.SysLogininfor;
-import com.flossom.system.api.domain.SysOperLog;
 import com.flossom.system.api.factory.RemoteLogFallbackFactory;
 
 /**

flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/RemoteUserService.java

@@ -1,5 +1,6 @@
 package com.flossom.system.api;
 
+import com.flossom.common.core.domain.entity.SysUser;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -9,7 +10,6 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import com.flossom.common.core.constant.SecurityConstants;
 import com.flossom.common.core.constant.ServiceNameConstants;
 import com.flossom.common.core.domain.R;
-import com.flossom.system.api.domain.SysUser;
 import com.flossom.system.api.factory.RemoteUserFallbackFactory;
 import com.flossom.system.api.model.LoginUser;
 

flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteAuthFallbackFactory.java

@@ -1,12 +1,10 @@
 package com.flossom.system.api.factory;
 
+import com.flossom.common.core.domain.LoginBody;
 import com.flossom.common.core.domain.R;
+import com.flossom.common.core.domain.RegisterBody;
+import com.flossom.common.core.domain.entity.WxUserMember;
 import com.flossom.system.api.RemoteAuthService;
-import com.flossom.system.api.RemoteUserService;
-import com.flossom.system.api.domain.LoginBody;
-import com.flossom.system.api.domain.RegisterBody;
-import com.flossom.system.api.domain.SysUser;
-import com.flossom.system.api.model.LoginUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
@@ -33,6 +31,11 @@ public class RemoteAuthFallbackFactory implements FallbackFactory<RemoteAuthServ
                 return R.fail("用户登录失败:" + throwable.getMessage());
             }
 
+            @Override
+            public R<Map<String, String>> wxLogin(WxUserMember form) {
+                return R.fail("用户登录失败:" + throwable.getMessage());
+            }
+
             @Override
             public R<?> register(RegisterBody registerBody) {
                 return R.fail("用户注册失败:" + throwable.getMessage());

flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteFileFallbackFactory.java

@@ -1,7 +1,7 @@
 package com.flossom.system.api.factory;
 
+import com.flossom.common.core.domain.SysFile;
 import com.flossom.system.api.RemoteFileService;
-import com.flossom.system.api.domain.SysFile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;

flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteLogFallbackFactory.java

@@ -1,8 +1,8 @@
 package com.flossom.system.api.factory;
 
+import com.flossom.common.core.domain.entity.SysLogininfor;
+import com.flossom.common.core.domain.entity.SysOperLog;
 import com.flossom.system.api.RemoteLogService;
-import com.flossom.system.api.domain.SysLogininfor;
-import com.flossom.system.api.domain.SysOperLog;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;

flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/factory/RemoteUserFallbackFactory.java

@@ -1,7 +1,7 @@
 package com.flossom.system.api.factory;
 
+import com.flossom.common.core.domain.entity.SysUser;
 import com.flossom.system.api.RemoteUserService;
-import com.flossom.system.api.domain.SysUser;
 import com.flossom.system.api.model.LoginUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

flossom-api/flossom-api-system/src/main/java/com/flossom/system/api/model/LoginUser.java

@@ -2,7 +2,9 @@ package com.flossom.system.api.model;
 
 import java.io.Serializable;
 import java.util.Set;
-import com.flossom.system.api.domain.SysUser;
+
+import com.flossom.common.core.domain.entity.SysUser;
+import com.flossom.common.core.domain.entity.WxUserMember;
 
 /**
  * 用户信息
@@ -23,11 +25,21 @@ public class LoginUser implements Serializable
      */
     private Long userid;
 
+    /**
+     * 微信用户名id
+     */
+    private Long wxUserid;
+
     /**
      * 用户名
      */
     private String username;
 
+    /**
+     * 微信用户名
+     */
+    private String wxUsername;
+
     /**
      * 登录时间
      */
@@ -58,6 +70,11 @@ public class LoginUser implements Serializable
      */
     private SysUser sysUser;
 
+    /**
+     * 微信用户信息
+     */
+    private WxUserMember wxUserMember;
+
     public String getToken()
     {
         return token;
@@ -147,4 +164,29 @@ public class LoginUser implements Serializable
     {
         this.sysUser = sysUser;
     }
+
+
+    public Long getWxUserid() {
+        return wxUserid;
+    }
+
+    public void setWxUserid(Long wxUserid) {
+        this.wxUserid = wxUserid;
+    }
+
+    public String getWxUsername() {
+        return wxUsername;
+    }
+
+    public void setWxUsername(String wxUsername) {
+        this.wxUsername = wxUsername;
+    }
+
+    public WxUserMember getWxUserMember() {
+        return wxUserMember;
+    }
+
+    public void setWxUserMember(WxUserMember wxUser) {
+        this.wxUserMember = wxUser;
+    }
 }

flossom-auth/src/main/java/com/flossom/auth/controller/TokenController.java

@@ -4,7 +4,9 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.flossom.auth.form.LoginBody;
 import com.flossom.auth.form.RegisterBody;
+import com.flossom.auth.form.WxLoginBody;
 import com.flossom.auth.service.SysLoginService;
+import com.flossom.common.core.constant.UserConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -41,6 +43,17 @@ public class TokenController
         return R.ok(tokenService.createToken(userInfo));
     }
 
+    @PostMapping("wxLogin")
+    public R<?> wxLogin(@RequestBody WxLoginBody form)
+    {
+        // 用户登录
+        LoginUser userInfo = sysLoginService.login(form.getOpenid(), UserConstants.WX_SYSTEM_USER_PASSWORD);
+        // 设置微信用户信息
+        userInfo.setWxUserMember(form);
+        // 获取登录token
+        return R.ok(tokenService.createToken(userInfo));
+    }
+
     @DeleteMapping("logout")
     public R<?> logout(HttpServletRequest request)
     {

flossom-auth/src/main/java/com/flossom/auth/form/WxLoginBody.java

@@ -0,0 +1,13 @@
+package com.flossom.auth.form;
+
+
+import com.flossom.common.core.domain.entity.WxUserMember;
+
+/**
+ * 微信用户登录对象
+ *
+ * @author flossom
+ */
+public class WxLoginBody extends WxUserMember {
+
+}

flossom-auth/src/main/java/com/flossom/auth/service/SysLoginService.java

@@ -1,5 +1,6 @@
 package com.flossom.auth.service;
 
+import com.flossom.common.core.domain.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.flossom.common.core.constant.CacheConstants;
@@ -15,7 +16,6 @@ import com.flossom.common.core.utils.ip.IpUtils;
 import com.flossom.common.redis.service.RedisService;
 import com.flossom.common.security.utils.SecurityUtils;
 import com.flossom.system.api.RemoteUserService;
-import com.flossom.system.api.domain.SysUser;
 import com.flossom.system.api.model.LoginUser;
 
 /**

flossom-auth/src/main/java/com/flossom/auth/service/SysPasswordService.java

@@ -1,6 +1,8 @@
 package com.flossom.auth.service;
 
 import java.util.concurrent.TimeUnit;
+
+import com.flossom.common.core.domain.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.flossom.common.core.constant.CacheConstants;
@@ -8,7 +10,6 @@ import com.flossom.common.core.constant.Constants;
 import com.flossom.common.core.exception.ServiceException;
 import com.flossom.common.redis.service.RedisService;
 import com.flossom.common.security.utils.SecurityUtils;
-import com.flossom.system.api.domain.SysUser;
 
 /**
  * 登录密码方法

flossom-auth/src/main/java/com/flossom/auth/service/SysRecordLogService.java

@@ -1,5 +1,6 @@
 package com.flossom.auth.service;
 
+import com.flossom.common.core.domain.entity.SysLogininfor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.flossom.common.core.constant.Constants;
@@ -7,7 +8,6 @@ import com.flossom.common.core.constant.SecurityConstants;
 import com.flossom.common.core.utils.StringUtils;
 import com.flossom.common.core.utils.ip.IpUtils;
 import com.flossom.system.api.RemoteLogService;
-import com.flossom.system.api.domain.SysLogininfor;
 
 /**
  * 记录日志方法

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/constant/SecurityConstants.java

@@ -12,11 +12,21 @@ public class SecurityConstants
      */
     public static final String DETAILS_USER_ID = "user_id";
 
+    /**
+     * 微信用户ID字段
+     */
+    public static final String WX_DETAILS_USER_ID = "wx_user_id";
+
     /**
      * 用户名字段
      */
     public static final String DETAILS_USERNAME = "username";
 
+    /**
+     * 微信用户名字段
+     */
+    public static final String WX_DETAILS_USERNAME = "wx_username";
+
     /**
      * 授权信息字段
      */
@@ -42,6 +52,11 @@ public class SecurityConstants
      */
     public static final String LOGIN_USER = "login_user";
 
+    /**
+     * 登录用户
+     */
+    public static final String WX_LOGIN_USER = "wx_login_user";
+
     /**
      * 角色权限
      */

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/constant/UserConstants.java

@@ -79,9 +79,7 @@ public class UserConstants
     public static final int PASSWORD_MAX_LENGTH = 20;
 
     /**
-     * 微信用户的后台账号
+     * 微信用户的后台密碼
      */
-    public static final String WX_SYSTEM_USER_USERNAME = "wxhz";
+    public static final String WX_SYSTEM_USER_PASSWORD = "hzUserName.nonymous.@123";
-
-    public static final String WX_SYSTEM_USER_PASSWORD = "hzAnonymous9090.@";
 }

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/context/SecurityContextHolder.java

@@ -56,21 +56,41 @@ public class SecurityContextHolder
         return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), 0L);
     }
 
+    public static Long getWxUserId()
+    {
+        return Convert.toLong(get(SecurityConstants.WX_DETAILS_USER_ID), 0L);
+    }
+
     public static void setUserId(String account)
     {
         set(SecurityConstants.DETAILS_USER_ID, account);
     }
 
+    public static void setWxUserId(String account)
+    {
+        set(SecurityConstants.WX_DETAILS_USER_ID, account);
+    }
+
     public static String getUserName()
     {
         return get(SecurityConstants.DETAILS_USERNAME);
     }
 
+    public static String getWxUserName()
+    {
+        return get(SecurityConstants.WX_DETAILS_USERNAME);
+    }
+
     public static void setUserName(String username)
     {
         set(SecurityConstants.DETAILS_USERNAME, username);
     }
 
+    public static void setWxUserName(String username)
+    {
+        set(SecurityConstants.WX_DETAILS_USERNAME, username);
+    }
+
     public static String getUserKey()
     {
         return get(SecurityConstants.USER_KEY);

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/LoginBody.java

@@ -1,4 +1,4 @@
-package com.flossom.system.api.domain;
+package com.flossom.common.core.domain;
 
 /**
  * 用户登录对象

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/RegisterBody.java

@@ -1,4 +1,4 @@
-package com.flossom.system.api.domain;
+package com.flossom.common.core.domain;
 
 /**
  * 用户注册对象

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/SysFile.java

@@ -1,4 +1,4 @@
-package com.flossom.system.api.domain;
+package com.flossom.common.core.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/SysFiringInfo.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.domain;
+package com.flossom.common.core.domain;
 
 import com.flossom.common.core.annotation.Excel;
 import com.flossom.common.core.web.domain.BaseEntity;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/SysUserOnline.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.domain;
+package com.flossom.common.core.domain;
 
 /**
  * 当前在线会话

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/CtLeaveMessage.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.domain;
+package com.flossom.common.core.domain.entity;
 
 import com.flossom.common.core.annotation.Excel;
 import com.flossom.common.core.web.domain.BaseEntity;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/IntegralGlobal.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.domain;
+package com.flossom.common.core.domain.entity;
 
 import com.flossom.common.core.annotation.Excel;
 import com.flossom.common.core.web.domain.BaseEntity;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysConfig.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.domain;
+package com.flossom.common.core.domain.entity;
 
 import com.flossom.common.core.annotation.Excel;
 import com.flossom.common.core.annotation.Excel.ColumnType;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysDept.java

@@ -1,14 +1,15 @@
-package com.flossom.system.api.domain;
+package com.flossom.common.core.domain.entity;
+
+import com.flossom.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import java.util.ArrayList;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import java.util.List;
-import com.flossom.common.core.web.domain.BaseEntity;
 
 /**
  * 部门表 sys_dept

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysDictData.java

@@ -1,13 +1,14 @@
-package com.flossom.system.api.domain;
+package com.flossom.common.core.domain.entity;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.flossom.common.core.annotation.Excel;
 import com.flossom.common.core.annotation.Excel.ColumnType;
 import com.flossom.common.core.constant.UserConstants;
 import com.flossom.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 
 /**
  * 字典数据表 sys_dict_data

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysDictType.java

@@ -1,13 +1,14 @@
-package com.flossom.system.api.domain;
+package com.flossom.common.core.domain.entity;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.flossom.common.core.annotation.Excel;
 import com.flossom.common.core.annotation.Excel.ColumnType;
 import com.flossom.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
 
 /**
  * 字典类型表 sys_dict_type

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysLogininfor.java

@@ -1,11 +1,12 @@
-package com.flossom.system.api.domain;
+package com.flossom.common.core.domain.entity;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.flossom.common.core.annotation.Excel;
 import com.flossom.common.core.annotation.Excel.ColumnType;
 import com.flossom.common.core.web.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 系统访问记录表 sys_logininfor
  *

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysMenu.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.domain;
+package com.flossom.common.core.domain.entity;
 
 import com.flossom.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysNotice.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.domain;
+package com.flossom.common.core.domain.entity;
 
 import com.flossom.common.core.web.domain.BaseEntity;
 import com.flossom.common.core.xss.Xss;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysOperLog.java

@@ -1,11 +1,12 @@
-package com.flossom.system.api.domain;
+package com.flossom.common.core.domain.entity;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.flossom.common.core.annotation.Excel;
 import com.flossom.common.core.annotation.Excel.ColumnType;
 import com.flossom.common.core.web.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 操作日志记录表 oper_log
  *

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysPost.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.domain;
+package com.flossom.common.core.domain.entity;
 
 import com.flossom.common.core.annotation.Excel;
 import com.flossom.common.core.annotation.Excel.ColumnType;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysRegion.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.domain;
+package com.flossom.common.core.domain.entity;
 
 import com.flossom.common.core.annotation.Excel;
 import com.flossom.common.core.web.domain.BaseEntity;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysRole.java

@@ -1,14 +1,15 @@
-package com.flossom.system.api.domain;
+package com.flossom.common.core.domain.entity;
 
-import java.util.Set;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.flossom.common.core.annotation.Excel;
 import com.flossom.common.core.annotation.Excel.ColumnType;
 import com.flossom.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.Set;
 
 /**
  * 角色表 sys_role

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysRoleDept.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.domain;
+package com.flossom.common.core.domain.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysRoleMenu.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.domain;
+package com.flossom.common.core.domain.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysUser.java

@@ -1,16 +1,19 @@
-package com.flossom.system.api.domain;
+package com.flossom.common.core.domain.entity;
 
-import java.util.Date;
-import java.util.List;
-import javax.validation.constraints.*;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.flossom.common.core.annotation.Excel;
 import com.flossom.common.core.annotation.Excel.ColumnType;
 import com.flossom.common.core.annotation.Excel.Type;
 import com.flossom.common.core.annotation.Excels;
 import com.flossom.common.core.web.domain.BaseEntity;
 import com.flossom.common.core.xss.Xss;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 用户对象 sys_user

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysUserPost.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.domain;
+package com.flossom.common.core.domain.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/SysUserRole.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.domain;
+package com.flossom.common.core.domain.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxSystemSetting.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.domain;
+package com.flossom.common.core.domain.entity;
 
 import com.flossom.common.core.annotation.Excel;
 import com.flossom.common.core.web.domain.BaseEntity;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserMember.java

@@ -1,10 +1,8 @@
-package com.flossom.hzMapper.domain;
+package com.flossom.common.core.domain.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.flossom.common.core.annotation.Excel;
 import com.flossom.common.core.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.math.BigDecimal;
 import java.util.Date;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/MetaVo.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.domain.vo;
+package com.flossom.common.core.domain.vo;
 
 import com.flossom.common.core.utils.StringUtils;
 

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/RouterVo.java

@@ -1,4 +1,4 @@
-package com.flossom.hzMapper.domain.vo;
+package com.flossom.common.core.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/vo/TreeSelect.java

@@ -1,8 +1,8 @@
-package com.flossom.hzMapper.domain.vo;
+package com.flossom.common.core.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.flossom.hzMapper.domain.SysMenu;
+import com.flossom.common.core.domain.entity.SysDept;
-import com.flossom.system.api.domain.SysDept;
+import com.flossom.common.core.domain.entity.SysMenu;
 
 import java.io.Serializable;
 import java.util.List;

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/utils/JwtUtils.java

@@ -87,6 +87,17 @@ public class JwtUtils
         return getValue(claims, SecurityConstants.DETAILS_USER_ID);
     }
 
+    /**
+     * 根据身份信息获取微信用户ID
+     *
+     * @param claims 身份信息
+     * @return 用户ID
+     */
+    public static String getWxUserId(Claims claims)
+    {
+        return getValue(claims, SecurityConstants.WX_DETAILS_USER_ID);
+    }
+
     /**
      * 根据令牌获取用户名
      *
@@ -110,6 +121,17 @@ public class JwtUtils
         return getValue(claims, SecurityConstants.DETAILS_USERNAME);
     }
 
+    /**
+     * 根据身份信息获取微信用户名
+     *
+     * @param claims 身份信息
+     * @return 用户名
+     */
+    public static String getWxUserName(Claims claims)
+    {
+        return getValue(claims, SecurityConstants.WX_DETAILS_USERNAME);
+    }
+
     /**
      * 根据身份信息获取键值
      *

flossom-common/flossom-common-datascope/src/main/java/com/flossom/common/datascope/aspect/DataScopeAspect.java

@@ -2,6 +2,9 @@ package com.flossom.common.datascope.aspect;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import com.flossom.common.core.domain.entity.SysRole;
+import com.flossom.common.core.domain.entity.SysUser;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
@@ -12,8 +15,6 @@ import com.flossom.common.core.utils.StringUtils;
 import com.flossom.common.core.web.domain.BaseEntity;
 import com.flossom.common.datascope.annotation.DataScope;
 import com.flossom.common.security.utils.SecurityUtils;
-import com.flossom.system.api.domain.SysRole;
-import com.flossom.system.api.domain.SysUser;
 import com.flossom.system.api.model.LoginUser;
 
 /**

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/CtLeaveMessageMapper.java

@@ -1,6 +1,7 @@
 package com.flossom.hzMapper.mapper;
 
-import com.flossom.hzMapper.domain.CtLeaveMessage;
+
+import com.flossom.common.core.domain.entity.CtLeaveMessage;
 
 import java.util.List;
 

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/IntegralGlobalMapper.java

@@ -1,6 +1,7 @@
 package com.flossom.hzMapper.mapper;
 
-import com.flossom.hzMapper.domain.IntegralGlobal;
+
+import com.flossom.common.core.domain.entity.IntegralGlobal;
 
 import java.util.List;
 

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysConfigMapper.java

@@ -1,7 +1,8 @@
 package com.flossom.hzMapper.mapper;
 
 
-import com.flossom.hzMapper.domain.SysConfig;
+
+import com.flossom.common.core.domain.entity.SysConfig;
 
 import java.util.List;
 

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDeptMapper.java

@@ -1,6 +1,6 @@
 package com.flossom.hzMapper.mapper;
 
-import com.flossom.system.api.domain.SysDept;
+import com.flossom.common.core.domain.entity.SysDept;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictDataMapper.java

@@ -1,6 +1,6 @@
 package com.flossom.hzMapper.mapper;
 
-import com.flossom.system.api.domain.SysDictData;
+import com.flossom.common.core.domain.entity.SysDictData;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysDictTypeMapper.java

@@ -1,6 +1,7 @@
 package com.flossom.hzMapper.mapper;
 
-import com.flossom.system.api.domain.SysDictType;
+
+import com.flossom.common.core.domain.entity.SysDictType;
 
 import java.util.List;
 

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysFiringInfoMapper.java

@@ -1,7 +1,8 @@
 package com.flossom.hzMapper.mapper;
 
 
-import com.flossom.hzMapper.domain.SysFiringInfo;
+
+import com.flossom.common.core.domain.SysFiringInfo;
 
 import java.util.List;
 

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysLogininforMapper.java

@@ -1,6 +1,7 @@
 package com.flossom.hzMapper.mapper;
 
-import com.flossom.system.api.domain.SysLogininfor;
+
+import com.flossom.common.core.domain.entity.SysLogininfor;
 
 import java.util.List;
 

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysMenuMapper.java

@@ -1,6 +1,6 @@
 package com.flossom.hzMapper.mapper;
 
-import com.flossom.hzMapper.domain.SysMenu;
+import com.flossom.common.core.domain.entity.SysMenu;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysNoticeMapper.java

@@ -1,7 +1,8 @@
 package com.flossom.hzMapper.mapper;
 
 
-import com.flossom.hzMapper.domain.SysNotice;
+
+import com.flossom.common.core.domain.entity.SysNotice;
 
 import java.util.List;
 

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysOperLogMapper.java

@@ -1,6 +1,7 @@
 package com.flossom.hzMapper.mapper;
 
-import com.flossom.system.api.domain.SysOperLog;
+
+import com.flossom.common.core.domain.entity.SysOperLog;
 
 import java.util.List;
 

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysPostMapper.java

@@ -1,7 +1,8 @@
 package com.flossom.hzMapper.mapper;
 
 
-import com.flossom.hzMapper.domain.SysPost;
+
+import com.flossom.common.core.domain.entity.SysPost;
 
 import java.util.List;
 

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRegionMapper.java

@@ -1,6 +1,6 @@
 package com.flossom.hzMapper.mapper;
 
-import com.flossom.hzMapper.domain.SysRegion;
+import com.flossom.common.core.domain.entity.SysRegion;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleDeptMapper.java

@@ -1,7 +1,7 @@
 package com.flossom.hzMapper.mapper;
 
 
-import com.flossom.hzMapper.domain.SysRoleDept;
+import com.flossom.common.core.domain.entity.SysRoleDept;
 
 import java.util.List;
 

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMapper.java

@@ -1,6 +1,6 @@
 package com.flossom.hzMapper.mapper;
 
-import com.flossom.system.api.domain.SysRole;
+import com.flossom.common.core.domain.entity.SysRole;
 
 import java.util.List;
 

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysRoleMenuMapper.java

@@ -1,7 +1,8 @@
 package com.flossom.hzMapper.mapper;
 
 
-import com.flossom.hzMapper.domain.SysRoleMenu;
+
+import com.flossom.common.core.domain.entity.SysRoleMenu;
 
 import java.util.List;
 

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserMapper.java

@@ -1,6 +1,6 @@
 package com.flossom.hzMapper.mapper;
 
-import com.flossom.system.api.domain.SysUser;
+import com.flossom.common.core.domain.entity.SysUser;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserPostMapper.java

@@ -1,7 +1,8 @@
 package com.flossom.hzMapper.mapper;
 
 
-import com.flossom.hzMapper.domain.SysUserPost;
+
+import com.flossom.common.core.domain.entity.SysUserPost;
 
 import java.util.List;
 

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/SysUserRoleMapper.java

@@ -1,6 +1,6 @@
 package com.flossom.hzMapper.mapper;
 
-import com.flossom.hzMapper.domain.SysUserRole;
+import com.flossom.common.core.domain.entity.SysUserRole;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxSystemSettingMapper.java

@@ -1,6 +1,7 @@
 package com.flossom.hzMapper.mapper;
 
-import com.flossom.hzMapper.domain.WxSystemSetting;
+
+import com.flossom.common.core.domain.entity.WxSystemSetting;
 
 import java.util.List;
 

flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/WxUserMemberMapper.java

@@ -1,7 +1,7 @@
 package com.flossom.hzMapper.mapper;
 
 
-import com.flossom.hzMapper.domain.WxUserMember;
+import com.flossom.common.core.domain.entity.WxUserMember;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -71,5 +71,5 @@ public interface WxUserMemberMapper {
 
     WxUserMember selectWxUserMemberByOpenId(@Param("openid") String openid);
 
-    void upgradeMember(@Param("phoneNumber") String phoneNumber, @Param("id") String id);
+    void upgradeMember(@Param("phoneNumber") String phoneNumber, @Param("id") Integer id);
 }

flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/SysRegionMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
-    <select id="selectSysAreaByPid" resultType="com.flossom.hzMapper.domain.SysRegion">
+    <select id="selectSysAreaByPid" resultType="SysRegion">
         <include refid="selectSysRegionVo"/>
         WHERE
             parent_id = #{pid}

flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/WxUserMemberMapper.xml

@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectWxUserMemberVo"/>
         where id = #{id}
     </select>
-    <select id="selectWxUserMemberByOpenId" parameterType="String" resultType="com.flossom.hzMapper.domain.WxUserMember">
+    <select id="selectWxUserMemberByOpenId" parameterType="String" resultType="WxUserMember">
         <include refid="selectWxUserMemberVo"/>
         WHERE openid = #{openid}
     </select>

flossom-common/flossom-common-log/src/main/java/com/flossom/common/log/aspect/LogAspect.java

@@ -5,6 +5,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.flossom.common.core.domain.entity.SysOperLog;
 import com.flossom.common.log.enums.BusinessStatus;
 import org.apache.commons.lang3.ArrayUtils;
 import org.aspectj.lang.JoinPoint;
@@ -28,7 +29,6 @@ import com.flossom.common.log.annotation.Log;
 import com.flossom.common.log.filter.PropertyPreExcludeFilter;
 import com.flossom.common.log.service.AsyncLogService;
 import com.flossom.common.security.utils.SecurityUtils;
-import com.flossom.system.api.domain.SysOperLog;
 
 /**
  * 操作日志记录处理

flossom-common/flossom-common-log/src/main/java/com/flossom/common/log/service/AsyncLogService.java

@@ -1,11 +1,11 @@
 package com.flossom.common.log.service;
 
+import com.flossom.common.core.domain.entity.SysOperLog;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.flossom.common.core.constant.SecurityConstants;
 import com.flossom.system.api.RemoteLogService;
-import com.flossom.system.api.domain.SysOperLog;
 
 /**
  * 异步调用日志服务

flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/interceptor/HeaderInterceptor.java

@@ -2,6 +2,7 @@ package com.flossom.common.security.interceptor;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 import com.flossom.common.core.constant.SecurityConstants;
@@ -18,26 +19,23 @@ import com.flossom.system.api.model.LoginUser;
  *
  * @author flossom
  */
-public class HeaderInterceptor implements AsyncHandlerInterceptor
+public class HeaderInterceptor implements AsyncHandlerInterceptor {
-{
     @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-    {
+        if (!(handler instanceof HandlerMethod)) {
-        if (!(handler instanceof HandlerMethod))
-        {
             return true;
         }
 
         SecurityContextHolder.setUserId(ServletUtils.getHeader(request, SecurityConstants.DETAILS_USER_ID));
         SecurityContextHolder.setUserName(ServletUtils.getHeader(request, SecurityConstants.DETAILS_USERNAME));
+        SecurityContextHolder.setWxUserId(ServletUtils.getHeader(request, SecurityConstants.WX_DETAILS_USER_ID));
+        SecurityContextHolder.setWxUserName(ServletUtils.getHeader(request, SecurityConstants.WX_DETAILS_USERNAME));
         SecurityContextHolder.setUserKey(ServletUtils.getHeader(request, SecurityConstants.USER_KEY));
 
         String token = SecurityUtils.getToken();
-        if (StringUtils.isNotEmpty(token))
+        if (StringUtils.isNotEmpty(token)) {
-        {
             LoginUser loginUser = AuthUtil.getLoginUser(token);
-            if (StringUtils.isNotNull(loginUser))
+            if (StringUtils.isNotNull(loginUser)) {
-            {
                 AuthUtil.verifyLoginUserExpire(loginUser);
                 SecurityContextHolder.set(SecurityConstants.LOGIN_USER, loginUser);
             }
@@ -47,8 +45,7 @@ public class HeaderInterceptor implements AsyncHandlerInterceptor
 
     @Override
     public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
-            throws Exception
+            throws Exception {
-    {
         SecurityContextHolder.remove();
     }
 }

flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/utils/DictUtils.java

@@ -4,10 +4,10 @@ import java.util.Collection;
 import java.util.List;
 import com.alibaba.fastjson2.JSONArray;
 import com.flossom.common.core.constant.CacheConstants;
+import com.flossom.common.core.domain.entity.SysDictData;
 import com.flossom.common.core.utils.SpringUtils;
 import com.flossom.common.core.utils.StringUtils;
 import com.flossom.common.redis.service.RedisService;
-import com.flossom.system.api.domain.SysDictData;
 
 /**
  * 字典工具类

flossom-common/flossom-common-security/src/main/java/com/flossom/common/security/utils/SecurityUtils.java

@@ -24,6 +24,14 @@ public class SecurityUtils
         return SecurityContextHolder.getUserId();
     }
 
+    /**
+     * 获取用户ID
+     */
+    public static Long getWxUserId()
+    {
+        return SecurityContextHolder.getWxUserId();
+    }
+
     /**
      * 获取用户名称
      */
@@ -32,6 +40,14 @@ public class SecurityUtils
         return SecurityContextHolder.getUserName();
     }
 
+    /**
+     * 获取用户名称
+     */
+    public static String getWxUsername()
+    {
+        return SecurityContextHolder.getWxUserName();
+    }
+
     /**
      * 获取用户key
      */

flossom-gateway/src/main/java/com/flossom/gateway/filter/AuthFilter.java

@@ -78,6 +78,13 @@ public class AuthFilter implements GlobalFilter, Ordered
         addHeader(mutate, SecurityConstants.USER_KEY, userkey);
         addHeader(mutate, SecurityConstants.DETAILS_USER_ID, userid);
         addHeader(mutate, SecurityConstants.DETAILS_USERNAME, username);
+        if(StringUtils.isNotBlank(JwtUtils.getWxUserId(claims))) {
+            addHeader(mutate, SecurityConstants.WX_DETAILS_USER_ID, JwtUtils.getWxUserId(claims));
+        }
+        if(StringUtils.isNotBlank(JwtUtils.getWxUserName(claims))) {
+            addHeader(mutate, SecurityConstants.WX_DETAILS_USERNAME, JwtUtils.getWxUserName(claims));
+        }
+
         // 内部请求来源参数清除
         removeHeader(mutate, SecurityConstants.FROM_SOURCE);
         return chain.filter(exchange.mutate().request(mutate.build()).build());

flossom-modules/flossom-file/src/main/java/com/flossom/file/controller/SysFileController.java

@@ -1,5 +1,6 @@
 package com.flossom.file.controller;
 
+import com.flossom.common.core.domain.SysFile;
 import com.flossom.file.service.ISysFileService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,7 +10,6 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import com.flossom.common.core.domain.R;
 import com.flossom.common.core.utils.file.FileUtils;
-import com.flossom.system.api.domain.SysFile;
 
 /**
  * 文件请求处理

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/CtleaveMessageApiController.java

@@ -1,11 +1,11 @@
 package com.flossom.miniProgram.controller;
 
+import com.flossom.common.core.domain.entity.CtLeaveMessage;
 import com.flossom.common.core.web.controller.BaseController;
 import com.flossom.common.core.web.domain.AjaxResult;
 import com.flossom.common.log.annotation.Log;
 import com.flossom.common.log.enums.BusinessType;
 import com.flossom.common.security.annotation.RequiresPermissions;
-import com.flossom.hzMapper.domain.CtLeaveMessage;
 import com.flossom.miniProgram.service.ICtleaveMeassageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/LoginUserVo.java

@@ -1,6 +1,6 @@
 package com.flossom.miniProgram.domain.vo;
 
-import com.flossom.hzMapper.domain.WxUserMember;
+import com.flossom.common.core.domain.entity.WxUserMember;
 
 public class LoginUserVo extends WxUserMember {
 

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ICtleaveMeassageService.java

@@ -1,6 +1,7 @@
 package com.flossom.miniProgram.service;
 
-import com.flossom.hzMapper.domain.CtLeaveMessage;
+
+import com.flossom.common.core.domain.entity.CtLeaveMessage;
 
 public interface ICtleaveMeassageService {
     /**

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISysRegionService.java

@@ -1,6 +1,7 @@
 package com.flossom.miniProgram.service;
 
-import com.flossom.hzMapper.domain.SysRegion;
+
+import com.flossom.common.core.domain.entity.SysRegion;
 
 import java.util.List;
 

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/ISystemSettingService.java

@@ -1,6 +1,7 @@
 package com.flossom.miniProgram.service;
 
-import com.flossom.hzMapper.domain.WxSystemSetting;
+
+import com.flossom.common.core.domain.entity.WxSystemSetting;
 
 public interface ISystemSettingService {
 

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxUserMemberService.java

@@ -1,7 +1,6 @@
 package com.flossom.miniProgram.service;
 
 import com.flossom.common.core.web.domain.AjaxResult;
-import com.flossom.hzMapper.domain.WxUserMember;
 import com.flossom.miniProgram.domain.vo.LoginUserVo;
 import com.flossom.miniProgram.domain.vo.UserMemberUpdateVo;
 

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java

@@ -1,7 +1,7 @@
 package com.flossom.miniProgram.service.impl;
 
+import com.flossom.common.core.domain.entity.CtLeaveMessage;
 import com.flossom.hzMapper.Enums.CtLeaveMessageEnum;
-import com.flossom.hzMapper.domain.CtLeaveMessage;
 import com.flossom.hzMapper.mapper.CtLeaveMessageMapper;
 import com.flossom.miniProgram.service.ICtleaveMeassageService;
 import org.springframework.beans.factory.annotation.Autowired;

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SysRegionServiceImpl.java

@@ -1,6 +1,6 @@
 package com.flossom.miniProgram.service.impl;
 
-import com.flossom.hzMapper.domain.SysRegion;
+import com.flossom.common.core.domain.entity.SysRegion;
 import com.flossom.hzMapper.mapper.SysRegionMapper;
 import com.flossom.miniProgram.service.ISysRegionService;
 import org.springframework.beans.factory.annotation.Autowired;

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/SystemSettingServiceImpl.java

@@ -1,7 +1,7 @@
 package com.flossom.miniProgram.service.impl;
 
+import com.flossom.common.core.domain.entity.WxSystemSetting;
 import com.flossom.hzMapper.Enums.SystemSettingKeyEnum;
-import com.flossom.hzMapper.domain.WxSystemSetting;
 import com.flossom.hzMapper.mapper.WxSystemSettingMapper;
 import com.flossom.miniProgram.service.ISystemSettingService;
 import org.springframework.beans.factory.annotation.Autowired;

flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java

@@ -4,12 +4,14 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.flossom.common.core.constant.CacheConstants;
 import com.flossom.common.core.constant.UserConstants;
+import com.flossom.common.core.domain.LoginBody;
 import com.flossom.common.core.domain.R;
+import com.flossom.common.core.domain.RegisterBody;
+import com.flossom.common.core.domain.entity.WxUserMember;
 import com.flossom.common.core.exception.ServiceException;
 import com.flossom.common.core.web.domain.AjaxResult;
 import com.flossom.common.redis.service.RedisService;
 import com.flossom.common.security.utils.SecurityUtils;
-import com.flossom.hzMapper.domain.WxUserMember;
 import com.flossom.hzMapper.mapper.WxUserMemberMapper;
 import com.flossom.miniProgram.domain.vo.LoginUserVo;
 import com.flossom.miniProgram.domain.vo.UserMemberUpdateVo;
@@ -19,8 +21,6 @@ import com.flossom.miniProgram.service.IWxUserMemberService;
 import com.flossom.miniProgram.utils.MiniProgramUtils;
 import com.flossom.system.api.RemoteAuthService;
 import com.flossom.system.api.RemoteUserService;
-import com.flossom.system.api.domain.LoginBody;
-import com.flossom.system.api.domain.RegisterBody;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -61,7 +61,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
             wxUserMemberMapper.insertTouristUser(wxUserMember);
             // 系统表注册
             RegisterBody registerBody = new RegisterBody();
-            registerBody.setUsername(UserConstants.WX_SYSTEM_USER_USERNAME + wxUserMember.getId());
+//            registerBody.setUsername(UserConstants.WX_SYSTEM_USER_USERNAME + wxUserMember.getId());
             registerBody.setPassword(UserConstants.WX_SYSTEM_USER_PASSWORD);
             R<?> registerResult = remoteAuthService.register(registerBody);
             if (R.FAIL == registerResult.getCode()) {
@@ -71,7 +71,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
 
         // 获取token
         LoginBody loginBody = new LoginBody();
-        loginBody.setUsername(UserConstants.WX_SYSTEM_USER_USERNAME + wxUserMember.getId());
+//        loginBody.setUsername(UserConstants.WX_SYSTEM_USER_USERNAME + wxUserMember.getId());
         loginBody.setPassword(UserConstants.WX_SYSTEM_USER_PASSWORD);
         R<Map<String, String>> loginResult = remoteAuthService.login(loginBody);
         if (loginResult.getCode() == R.FAIL) {
@@ -131,7 +131,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
             wxUserMemberMapper.insertWxUserMember(wxUserMember);
             // 3.3、系统表注册
             RegisterBody registerBody = new RegisterBody();
-            registerBody.setUsername(UserConstants.WX_SYSTEM_USER_USERNAME + wxUserMember.getId());
+            registerBody.setUsername(wxUserMember.getOpenid());
             registerBody.setPassword(UserConstants.WX_SYSTEM_USER_PASSWORD);
             R<?> registerResult = remoteAuthService.register(registerBody);
             if (R.FAIL == registerResult.getCode()) {
@@ -140,10 +140,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
         }
 
         // 4、获取 token
-        LoginBody loginBody = new LoginBody();
+        R<Map<String, String>> loginResult = remoteAuthService.wxLogin(wxUserMember);
-        loginBody.setUsername(UserConstants.WX_SYSTEM_USER_USERNAME + wxUserMember.getId());
-        loginBody.setPassword(UserConstants.WX_SYSTEM_USER_PASSWORD);
-        R<Map<String, String>> loginResult = remoteAuthService.login(loginBody);
         if (loginResult.getCode() == R.FAIL) {
             throw new ServiceException(loginResult.getMsg());
         }
@@ -168,8 +165,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
             logger.error("获取用户信息失败");
             return AjaxResult.error("获取用户信息失败");
         }
-        String id = username.replace(UserConstants.WX_SYSTEM_USER_USERNAME, "");
+        wxUserMemberMapper.upgradeMember(wxCode2PhoneRet.getPhoneInfo().getPhoneNumber(), SecurityUtils.getWxUserId().intValue());
-        wxUserMemberMapper.upgradeMember(wxCode2PhoneRet.getPhoneInfo().getPhoneNumber(), id);
         return AjaxResult.success();
     }
 

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
+import com.flossom.common.core.domain.entity.CtLeaveMessage;
 import com.flossom.common.core.utils.poi.ExcelUtil;
 import com.flossom.common.core.web.controller.BaseController;
 import com.flossom.common.core.web.domain.AjaxResult;
@@ -11,7 +12,6 @@ import com.flossom.common.core.web.page.TableDataInfo;
 import com.flossom.common.log.annotation.Log;
 import com.flossom.common.log.enums.BusinessType;
 import com.flossom.common.security.annotation.RequiresPermissions;
-import com.flossom.hzMapper.domain.CtLeaveMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/IntegralGlobalController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
+import com.flossom.common.core.domain.entity.IntegralGlobal;
 import com.flossom.common.core.utils.poi.ExcelUtil;
 import com.flossom.common.core.web.controller.BaseController;
 import com.flossom.common.core.web.domain.AjaxResult;
@@ -11,7 +12,6 @@ import com.flossom.common.core.web.page.TableDataInfo;
 import com.flossom.common.log.annotation.Log;
 import com.flossom.common.log.enums.BusinessType;
 import com.flossom.common.security.annotation.RequiresPermissions;
-import com.flossom.hzMapper.domain.IntegralGlobal;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysConfigController.java

@@ -3,7 +3,7 @@ package com.flossom.system.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.flossom.hzMapper.domain.SysConfig;
+import com.flossom.common.core.domain.entity.SysConfig;
 import com.flossom.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysDeptController.java

@@ -1,6 +1,8 @@
 package com.flossom.system.controller;
 
 import java.util.List;
+
+import com.flossom.common.core.domain.entity.SysDept;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -20,7 +22,6 @@ import com.flossom.common.log.annotation.Log;
 import com.flossom.common.log.enums.BusinessType;
 import com.flossom.common.security.annotation.RequiresPermissions;
 import com.flossom.common.security.utils.SecurityUtils;
-import com.flossom.system.api.domain.SysDept;
 import com.flossom.system.service.ISysDeptService;
 
 /**

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysDictDataController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.flossom.common.core.domain.entity.SysDictData;
 import com.flossom.system.service.ISysDictDataService;
 import com.flossom.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +26,6 @@ import com.flossom.common.log.annotation.Log;
 import com.flossom.common.log.enums.BusinessType;
 import com.flossom.common.security.annotation.RequiresPermissions;
 import com.flossom.common.security.utils.SecurityUtils;
-import com.flossom.system.api.domain.SysDictData;
 
 /**
  * 数据字典信息

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysDictTypeController.java

@@ -3,6 +3,7 @@ package com.flossom.system.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.flossom.common.core.domain.entity.SysDictType;
 import com.flossom.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -22,7 +23,6 @@ import com.flossom.common.log.annotation.Log;
 import com.flossom.common.log.enums.BusinessType;
 import com.flossom.common.security.annotation.RequiresPermissions;
 import com.flossom.common.security.utils.SecurityUtils;
-import com.flossom.system.api.domain.SysDictType;
 
 /**
  * 数据字典信息

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysFiringInfoController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
+import com.flossom.common.core.domain.SysFiringInfo;
 import com.flossom.common.core.utils.poi.ExcelUtil;
 import com.flossom.common.core.web.controller.BaseController;
 import com.flossom.common.core.web.domain.AjaxResult;
@@ -11,7 +12,6 @@ import com.flossom.common.core.web.page.TableDataInfo;
 import com.flossom.common.log.annotation.Log;
 import com.flossom.common.log.enums.BusinessType;
 import com.flossom.common.security.annotation.RequiresPermissions;
-import com.flossom.hzMapper.domain.SysFiringInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysLogininforController.java

@@ -3,6 +3,7 @@ package com.flossom.system.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.flossom.common.core.domain.entity.SysLogininfor;
 import com.flossom.system.service.ISysLogininforService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -22,7 +23,6 @@ import com.flossom.common.log.enums.BusinessType;
 import com.flossom.common.redis.service.RedisService;
 import com.flossom.common.security.annotation.InnerAuth;
 import com.flossom.common.security.annotation.RequiresPermissions;
-import com.flossom.system.api.domain.SysLogininfor;
 
 /**
  * 系统访问记录

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysMenuController.java

@@ -2,7 +2,7 @@ package com.flossom.system.controller;
 
 import java.util.List;
 
-import com.flossom.hzMapper.domain.SysMenu;
+import com.flossom.common.core.domain.entity.SysMenu;
 import com.flossom.system.service.ISysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysNoticeController.java

@@ -2,7 +2,7 @@ package com.flossom.system.controller;
 
 import java.util.List;
 
-import com.flossom.hzMapper.domain.SysNotice;
+import com.flossom.common.core.domain.entity.SysNotice;
 import com.flossom.system.service.ISysNoticeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysOperlogController.java

@@ -3,6 +3,7 @@ package com.flossom.system.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.flossom.common.core.domain.entity.SysOperLog;
 import com.flossom.system.service.ISysOperLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -20,7 +21,6 @@ import com.flossom.common.log.annotation.Log;
 import com.flossom.common.log.enums.BusinessType;
 import com.flossom.common.security.annotation.InnerAuth;
 import com.flossom.common.security.annotation.RequiresPermissions;
-import com.flossom.system.api.domain.SysOperLog;
 
 /**
  * 操作日志记录

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysPostController.java

@@ -3,7 +3,7 @@ package com.flossom.system.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.flossom.hzMapper.domain.SysPost;
+import com.flossom.common.core.domain.entity.SysPost;
 import com.flossom.system.service.ISysPostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/SysProfileController.java

@@ -2,6 +2,8 @@ package com.flossom.system.controller;
 
 import java.util.Arrays;
 
+import com.flossom.common.core.domain.SysFile;
+import com.flossom.common.core.domain.entity.SysUser;
 import com.flossom.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,8 +25,6 @@ import com.flossom.common.log.enums.BusinessType;
 import com.flossom.common.security.service.TokenService;
 import com.flossom.common.security.utils.SecurityUtils;
 import com.flossom.system.api.RemoteFileService;
-import com.flossom.system.api.domain.SysFile;
-import com.flossom.system.api.domain.SysUser;
 import com.flossom.system.api.model.LoginUser;
 
 /**