挪位置

qmjszx-business/pom.xml

@@ -42,12 +42,6 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
-        <!-- 核心模块-->
-        <dependency>
-            <groupId>qmjszx</groupId>
-            <artifactId>qmjszx-framework</artifactId>
-        </dependency>
-
         <!-- 定时任务-->
         <dependency>
             <groupId>qmjszx</groupId>

qmjszx-admin/src/main/java/beilv/web/controller/system/AppAuthController.java

@@ -1,10 +1,8 @@
-package beilv.web.controller.system;
+package beilv.applogin.controller;
 
+import beilv.applogin.domain.vo.AppAuthWeixinMiniAppLoginReqVO;
 import beilv.common.core.domain.AjaxResult;
-import beilv.system.domain.SysMember;
-import beilv.system.domain.vo.AppAuthWeixinMiniAppLoginReqVO;
-import beilv.system.service.IAppAuthService;
-import beilv.system.service.ISysMemberService;
+import beilv.applogin.service.IAppAuthService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -12,7 +10,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
 

qmjszx-system/src/main/java/beilv/system/domain/vo/AppAuthLoginRespVO.java

@@ -1,4 +1,4 @@
-package beilv.system.domain.vo;
+package beilv.applogin.domain.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

qmjszx-system/src/main/java/beilv/system/domain/vo/AppAuthWeixinMiniAppLoginReqVO.java

@@ -1,4 +1,4 @@
-package beilv.system.domain.vo;
+package beilv.applogin.domain.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

qmjszx-system/src/main/java/beilv/system/service/IAppAuthService.java

@@ -1,10 +1,8 @@
-package beilv.system.service;
+package beilv.applogin.service;
 
 
-import beilv.system.domain.SysMember;
-import beilv.system.domain.vo.AppAuthLoginRespVO;
-import beilv.system.domain.vo.AppAuthWeixinMiniAppLoginReqVO;
-
+import beilv.applogin.domain.vo.AppAuthLoginRespVO;
+import beilv.applogin.domain.vo.AppAuthWeixinMiniAppLoginReqVO;
 
 /**
  * 会员的认证 Service 接口

qmjszx-system/src/main/java/beilv/system/service/impl/AppAuthServiceImpl.java

@@ -1,12 +1,12 @@
-package beilv.system.service.impl;
+package beilv.applogin.service.impl;
 
+import beilv.applogin.domain.vo.AppAuthLoginRespVO;
+import beilv.applogin.domain.vo.AppAuthWeixinMiniAppLoginReqVO;
+import beilv.applogin.service.IAppAuthService;
 import beilv.common.enums.LoginTypeEnum;
 import beilv.common.utils.rsa.RsaUtil;
-import beilv.system.domain.SysMember;
-import beilv.system.domain.vo.AppAuthLoginRespVO;
-import beilv.system.domain.vo.AppAuthWeixinMiniAppLoginReqVO;
-import beilv.system.mapper.SysMemberMapper;
-import beilv.system.service.IAppAuthService;
+import beilv.member.domain.SysMember;
+import beilv.member.mapper.SysMemberMapper;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;

qmjszx-admin/src/main/java/beilv/web/controller/system/SysMemberController.java

@@ -1,4 +1,4 @@
-package beilv.web.controller.system;
+package beilv.member.controller;
 
 import beilv.common.annotation.Log;
 import beilv.common.core.controller.BaseController;
@@ -6,9 +6,9 @@ import beilv.common.core.domain.AjaxResult;
 import beilv.common.core.page.TableDataInfo;
 import beilv.common.enums.BusinessType;
 import beilv.common.utils.poi.ExcelUtil;
-import beilv.system.domain.SysMember;
-import beilv.system.domain.dto.SysMemberDTO;
-import beilv.system.service.ISysMemberService;
+import beilv.member.domain.SysMember;
+import beilv.member.domain.dto.SysMemberDTO;
+import beilv.member.service.ISysMemberService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

qmjszx-system/src/main/java/beilv/system/domain/SysMember.java

@@ -1,8 +1,7 @@
-package beilv.system.domain;
+package beilv.member.domain;
 
 import beilv.common.annotation.Excel;
 import beilv.common.core.domain.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

qmjszx-system/src/main/java/beilv/system/domain/dto/SysMemberDTO.java

@@ -1,4 +1,4 @@
-package beilv.system.domain.dto;
+package beilv.member.domain.dto;
 
 import beilv.common.annotation.Excel;
 import beilv.common.core.domain.BaseEntity;

qmjszx-system/src/main/java/beilv/system/mapper/SysMemberMapper.java

@@ -1,6 +1,7 @@
-package beilv.system.mapper;
+package beilv.member.mapper;
 
-import beilv.system.domain.SysMember;
+
+import beilv.member.domain.SysMember;
 
 import java.util.List;
 

qmjszx-system/src/main/java/beilv/system/service/ISysMemberService.java

@@ -1,7 +1,7 @@
-package beilv.system.service;
+package beilv.member.service;
 
-import beilv.system.domain.SysMember;
-import beilv.system.domain.dto.SysMemberDTO;
+import beilv.member.domain.SysMember;
+import beilv.member.domain.dto.SysMemberDTO;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;

qmjszx-system/src/main/java/beilv/system/service/impl/SysMemberServiceImpl.java

@@ -1,18 +1,18 @@
-package beilv.system.service.impl;
+package beilv.member.service.impl;
 
 import beilv.common.core.text.Convert;
 import beilv.common.utils.DateUtils;
 import beilv.common.utils.rsa.RsaUtil;
-import beilv.system.domain.SysMember;
-import beilv.system.domain.dto.SysMemberDTO;
-import beilv.system.mapper.SysMemberMapper;
-import beilv.system.service.ISysMemberService;
-import beilv.system.service.ISysUserBillService;
+
+import beilv.member.domain.SysMember;
+import beilv.member.domain.dto.SysMemberDTO;
+import beilv.member.mapper.SysMemberMapper;
+import beilv.member.service.ISysMemberService;
+import beilv.userbill.service.ISysUserBillService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;

qmjszx-system/src/main/resources/mapper/system/SysMemberMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="beilv.system.mapper.SysMemberMapper">
+<mapper namespace="beilv.member.mapper.SysMemberMapper">
     
     <resultMap type="SysMember" id="SysMemberResult">
         <result property="id"    column="id"    />

qmjszx-framework/pom.xml

@@ -77,6 +77,10 @@
             <artifactId>qmjszx-system</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>qmjszx</groupId>
+            <artifactId>qmjszx-business</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

qmjszx-framework/src/main/java/beilv/framework/shiro/web/filter/wxMiniAppAccessControlFilter/WxMiniAppAccessControlFilter.java

@@ -1,8 +1,8 @@
 package beilv.framework.shiro.web.filter.wxMiniAppAccessControlFilter;
 
 import beilv.common.utils.rsa.RsaUtil;
-import beilv.system.domain.SysMember;
-import beilv.system.mapper.SysMemberMapper;
+import beilv.member.domain.SysMember;
+import beilv.member.mapper.SysMemberMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.shiro.web.filter.AccessControlFilter;

qmjszx-pay/pom.xml

@@ -42,12 +42,6 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
-        <!-- 核心模块-->
-        <dependency>
-            <groupId>qmjszx</groupId>
-            <artifactId>qmjszx-framework</artifactId>
-        </dependency>
-
         <!-- 定时任务-->
         <dependency>
             <groupId>qmjszx</groupId>