结构调整2

backend/src/main/java/com/jiayue/pfr/mapper/SysMenuMapper.java → backend/src/main/java/com/jiayue/pfr/mapper/cmf/SysMenuMapper.java

@@ -1,12 +1,12 @@
-package com.jiayue.pfr.mapper;
-
-import java.util.List;
+package com.jiayue.pfr.mapper.cmf;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jiayue.pfr.entity.SysMenu;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  *  菜单管理Mapper
  *

backend/src/main/java/com/jiayue/pfr/mapper/SysParameterMapper.java → backend/src/main/java/com/jiayue/pfr/mapper/cmf/SysParameterMapper.java

@@ -1,10 +1,9 @@
-package com.jiayue.pfr.mapper;
+package com.jiayue.pfr.mapper.cmf;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jiayue.pfr.entity.SysParameter;
 import org.apache.ibatis.annotations.Mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 /**
  *  参数管理Mapper
  *

backend/src/main/java/com/jiayue/pfr/mapper/SysPolicyMapper.java → backend/src/main/java/com/jiayue/pfr/mapper/cmf/SysPolicyMapper.java

@@ -1,4 +1,4 @@
-package com.jiayue.pfr.mapper;
+package com.jiayue.pfr.mapper.cmf;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jiayue.pfr.entity.SysPolicy;

backend/src/main/java/com/jiayue/pfr/mapper/SysRoleMapper.java → backend/src/main/java/com/jiayue/pfr/mapper/cmf/SysRoleMapper.java

@@ -1,4 +1,4 @@
-package com.jiayue.pfr.mapper;
+package com.jiayue.pfr.mapper.cmf;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jiayue.pfr.entity.SysRole;

backend/src/main/java/com/jiayue/pfr/mapper/SysRoleMenuMapper.java → backend/src/main/java/com/jiayue/pfr/mapper/cmf/SysRoleMenuMapper.java

@@ -1,4 +1,4 @@
-package com.jiayue.pfr.mapper;
+package com.jiayue.pfr.mapper.cmf;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jiayue.pfr.entity.SysRole;

backend/src/main/java/com/jiayue/pfr/mapper/SysUserMapper.java → backend/src/main/java/com/jiayue/pfr/mapper/cmf/SysUserMapper.java

@@ -1,7 +1,7 @@
-package com.jiayue.pfr.mapper;
+package com.jiayue.pfr.mapper.cmf;
 
-import com.jiayue.pfr.entity.SysUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jiayue.pfr.entity.SysUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Update;
 

backend/src/main/java/com/jiayue/pfr/mapper/SysUserRoleMapper.java → backend/src/main/java/com/jiayue/pfr/mapper/cmf/SysUserRoleMapper.java

@@ -1,4 +1,4 @@
-package com.jiayue.pfr.mapper;
+package com.jiayue.pfr.mapper.cmf;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jiayue.pfr.entity.SysUserRole;

backend/src/main/java/com/jiayue/pfr/service/cmf/impl/SysMenuServiceImpl.java

@@ -10,9 +10,9 @@ import com.jiayue.pfr.entity.SysRole;
 import com.jiayue.pfr.entity.TreeSelect;
 import com.jiayue.pfr.entity.vo.MetaVo;
 import com.jiayue.pfr.entity.vo.RouterVo;
-import com.jiayue.pfr.mapper.SysMenuMapper;
-import com.jiayue.pfr.mapper.SysRoleMapper;
-import com.jiayue.pfr.mapper.SysRoleMenuMapper;
+import com.jiayue.pfr.mapper.cmf.SysMenuMapper;
+import com.jiayue.pfr.mapper.cmf.SysRoleMapper;
+import com.jiayue.pfr.mapper.cmf.SysRoleMenuMapper;
 import com.jiayue.pfr.service.cmf.SysMenuService;
 import com.jiayue.pfr.util.RyStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

backend/src/main/java/com/jiayue/pfr/service/cmf/impl/SysParameterServiceImpl.java

@@ -3,7 +3,8 @@ package com.jiayue.pfr.service.cmf.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jiayue.pfr.entity.SysParameter;
-import com.jiayue.pfr.mapper.SysParameterMapper;
+
+import com.jiayue.pfr.mapper.cmf.SysParameterMapper;
 import com.jiayue.pfr.service.cmf.SysParameterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

backend/src/main/java/com/jiayue/pfr/service/cmf/impl/SysPolicyServiceImpl.java

@@ -2,7 +2,8 @@ package com.jiayue.pfr.service.cmf.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jiayue.pfr.entity.SysPolicy;
-import com.jiayue.pfr.mapper.SysPolicyMapper;
+
+import com.jiayue.pfr.mapper.cmf.SysPolicyMapper;
 import com.jiayue.pfr.service.cmf.SysPolicyService;
 import org.springframework.stereotype.Service;
 

backend/src/main/java/com/jiayue/pfr/service/cmf/impl/SysRoleServiceImpl.java

@@ -5,9 +5,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jiayue.pfr.constant.UserConstants;
 import com.jiayue.pfr.entity.SysRole;
 import com.jiayue.pfr.entity.SysRoleMenu;
-import com.jiayue.pfr.mapper.SysRoleMapper;
-import com.jiayue.pfr.mapper.SysRoleMenuMapper;
-import com.jiayue.pfr.mapper.SysUserRoleMapper;
+;
+import com.jiayue.pfr.mapper.cmf.SysRoleMapper;
+import com.jiayue.pfr.mapper.cmf.SysRoleMenuMapper;
+import com.jiayue.pfr.mapper.cmf.SysUserRoleMapper;
 import com.jiayue.pfr.service.cmf.SysRoleService;
 import com.jiayue.pfr.util.RyStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

backend/src/main/java/com/jiayue/pfr/service/cmf/impl/SysUserRoleServiceImpl.java

@@ -2,7 +2,8 @@ package com.jiayue.pfr.service.cmf.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jiayue.pfr.entity.SysUserRole;
-import com.jiayue.pfr.mapper.SysUserRoleMapper;
+
+import com.jiayue.pfr.mapper.cmf.SysUserRoleMapper;
 import com.jiayue.pfr.service.cmf.SysUserRoleService;
 import org.springframework.stereotype.Service;
 

backend/src/main/java/com/jiayue/pfr/service/cmf/impl/SysUserServiceImpl.java

@@ -7,8 +7,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jiayue.pfr.constant.SecretKeyConstants;
 import com.jiayue.pfr.entity.SysUser;
 import com.jiayue.pfr.entity.SysUserRole;
-import com.jiayue.pfr.mapper.SysUserMapper;
-import com.jiayue.pfr.mapper.SysUserRoleMapper;
+
+import com.jiayue.pfr.mapper.cmf.SysUserMapper;
+import com.jiayue.pfr.mapper.cmf.SysUserRoleMapper;
 import com.jiayue.pfr.service.cmf.SysUserService;
 import com.jiayue.pfr.util.SM2CryptUtils;
 import org.springframework.beans.factory.annotation.Autowired;

backend/src/main/java/com/jiayue/pfr/service/cmf/impl/UmsAdminServiceImpl.java

@@ -6,7 +6,8 @@ import cn.hutool.crypto.SmUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jiayue.pfr.constant.SecretKeyConstants;
 import com.jiayue.pfr.entity.SysUser;
-import com.jiayue.pfr.mapper.SysUserMapper;
+
+import com.jiayue.pfr.mapper.cmf.SysUserMapper;
 import com.jiayue.pfr.service.cmf.SysPolicyService;
 import com.jiayue.pfr.service.cmf.UmsAdminService;
 import com.jiayue.pfr.util.SM2CryptUtils;

backend/src/main/resources/application.yml

@@ -12,7 +12,7 @@ server:
        http-only: true
        secure: true
 logging:
-  config: classpath:logback-ssi.xml
+  config: classpath:logback-pfr.xml
 
 #设置提供的服务名
 spring:
@@ -33,7 +33,7 @@ mybatis-plus:
   configuration:
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
-  mapper-locations: classpath:mapper/system/*.xml
+  mapper-locations: classpath:mapper/cmf/*.xml,classpath:mapper/di/*.xml,classpath:mapper/alg/*.xml
   global-config:
     db-column-underline: true
     logic-delete-field: del_flag

backend/src/main/resources/mapper/system/SysMenuMapper.xml → backend/src/main/resources/mapper.cmf/SysMenuMapper.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="com.jiayue.pfr.mapper.SysMenuMapper">
+<mapper namespace="com.jiayue.pfr.mapper.cmf.SysMenuMapper">
 
 	<resultMap type="SysMenu" id="SysMenuResult">
 		<id     property="menuId"         column="menu_id"        />

backend/src/main/resources/mapper/system/SysRoleMapper.xml → backend/src/main/resources/mapper.cmf/SysRoleMapper.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="com.jiayue.pfr.mapper.SysRoleMapper">
+<mapper namespace="com.jiayue.pfr.mapper.cmf.SysRoleMapper">
 
 	<resultMap type="SysRole" id="SysRoleResult">
 		<id     property="roleId"             column="role_id"               />

backend/src/main/resources/mapper/system/SysRoleMenuMapper.xml → backend/src/main/resources/mapper.cmf/SysRoleMenuMapper.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="com.jiayue.pfr.mapper.SysRoleMenuMapper">
+<mapper namespace="com.jiayue.pfr.mapper.cmf.SysRoleMenuMapper">
 
 	<resultMap type="SysRoleMenu" id="SysRoleMenuResult">
 		<result property="roleId"     column="role_id"      />

backend/src/main/resources/mapper/system/SysUserMapper.xml → backend/src/main/resources/mapper.cmf/SysUserMapper.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="com.jiayue.pfr.mapper.SysUserMapper">
+<mapper namespace="com.jiayue.pfr.mapper.cmf.SysUserMapper">
 
     <resultMap type="SysUser" id="SysUserResult">
         <id     property="id"       column="id"      />

backend/src/main/resources/mapper/system/SysUserRoleMapper.xml → backend/src/main/resources/mapper.cmf/SysUserRoleMapper.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="com.jiayue.pfr.mapper.SysUserRoleMapper">
+<mapper namespace="com.jiayue.pfr.mapper.cmf.SysUserRoleMapper">
 
 	<resultMap type="SysUserRole" id="SysUserRoleResult">
 		<result property="userId"     column="user_id"      />