Quellcode durchsuchen

重构sys接口

tsurumure vor 9 Monaten
Ursprung
Commit
230dc15a0c
32 geänderte Dateien mit 223 neuen und 47 gelöschten Zeilen
  1. 0 2
      src/main/java/com/backendsys/mapper/System/SysMobileAreaCodeMapper.xml
  2. 37 0
      src/main/java/com/backendsys/modules/system/controller/SysAuthV2Controller.java
  3. 2 0
      src/main/java/com/backendsys/modules/system/controller/SysUserRoleModuleV2Controller.java
  4. 2 0
      src/main/java/com/backendsys/modules/system/controller/SysUserRoleV2Controller.java
  5. 1 1
      src/main/java/com/backendsys/modules/system/controller/SysUserV2Controller.java
  6. 13 0
      src/main/java/com/backendsys/modules/system/dao/SysMobileAreaDao.java
  7. 2 4
      src/main/java/com/backendsys/modules/system/dao/SysUserDao.java
  8. 2 3
      src/main/java/com/backendsys/modules/system/dao/SysUserInfoDao.java
  9. 1 2
      src/main/java/com/backendsys/modules/system/dao/SysUserRoleDao.java
  10. 2 2
      src/main/java/com/backendsys/modules/system/dao/SysUserRoleModuleDao.java
  11. 1 1
      src/main/java/com/backendsys/modules/system/dao/SysUserRoleModuleRelationDao.java
  12. 1 1
      src/main/java/com/backendsys/modules/system/dao/SysUserRoleRelationDao.java
  13. 13 0
      src/main/java/com/backendsys/modules/system/entity/SysMobileArea.java
  14. 1 1
      src/main/java/com/backendsys/modules/system/entity/SysUser.java
  15. 1 1
      src/main/java/com/backendsys/modules/system/entity/SysUserDTO.java
  16. 1 1
      src/main/java/com/backendsys/modules/system/entity/SysUserInfo.java
  17. 1 1
      src/main/java/com/backendsys/modules/system/entity/SysUserRole.java
  18. 1 1
      src/main/java/com/backendsys/modules/system/entity/SysUserRoleModule.java
  19. 1 1
      src/main/java/com/backendsys/modules/system/entity/SysUserRoleModuleRelation.java
  20. 1 1
      src/main/java/com/backendsys/modules/system/entity/SysUserRoleRelation.java
  21. 15 0
      src/main/java/com/backendsys/modules/system/service/SysAuthV2Service.java
  22. 1 1
      src/main/java/com/backendsys/modules/system/service/SysUserRoleModuleV2Service.java
  23. 1 2
      src/main/java/com/backendsys/modules/system/service/SysUserRoleV2Service.java
  24. 3 3
      src/main/java/com/backendsys/modules/system/service/SysUserV2Service.java
  25. 71 0
      src/main/java/com/backendsys/modules/system/service/impl/SysAuthV2ServiceImpl.java
  26. 2 4
      src/main/java/com/backendsys/modules/system/service/impl/SysUserRoleModuleV2ServiceImpl.java
  27. 3 7
      src/main/java/com/backendsys/modules/system/service/impl/SysUserRoleV2ServiceImpl.java
  28. 4 5
      src/main/java/com/backendsys/modules/system/service/impl/SysUserV2ServiceImpl.java
  29. 4 0
      src/main/resources/application.yml
  30. 33 0
      src/main/resources/mapper/system/SysMobileAreaDao.xml
  31. 1 1
      src/main/resources/mapper/system/SysUserInfoDao.xml
  32. 1 1
      src/main/resources/mapper/system/SysUserRoleModuleDao.xml

+ 0 - 2
src/main/java/com/backendsys/mapper/System/SysMobileAreaCodeMapper.xml

@@ -8,14 +8,12 @@
         COALESCE(area_name_abbr, '') area_name_abbr,
         area_code
     </sql>
-
     <resultMap id="resultMapMobileAreaCode" type="java.util.LinkedHashMap">
         <id property="id" column="id" jdbcType="BIGINT" />
         <result property="area_name" column="area_name" />
         <result property="area_name_abbr" column="area_name_abbr" />
         <result property="area_code" column="area_code" javaType="java.lang.Integer" />
     </resultMap>
-
     <!-- 查询 列表 -->
     <select id="queryMobileAreaCodeList" resultMap="resultMapMobileAreaCode">
         SELECT <include refid="includeMobileAreaCode" />

+ 37 - 0
src/main/java/com/backendsys/modules/system/controller/SysAuthV2Controller.java

@@ -0,0 +1,37 @@
+package com.backendsys.modules.system.controller;
+
+import com.backendsys.modules.common.utils.Result;
+import com.backendsys.modules.system.entity.SysMobileArea;
+import com.backendsys.modules.system.service.SysAuthV2Service;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+
+@Validated
+@RestController
+@Tag(name = "系统登录")
+public class SysAuthV2Controller {
+
+    @Autowired
+    private SysAuthV2Service sysAuthV2Service;
+
+    @Operation(summary = "获取图形验证码")
+    @GetMapping("/api/v2/system/auth/getCaptcha")
+    public void getCaptcha(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        sysAuthV2Service.renderCaptcha(request, response);
+    }
+
+    @Operation(summary = "获取手机号地区列表")
+    @GetMapping("/api/v2/public/system/getMobileAreaCode")
+    public Result getMobileAreaCode(@Validated SysMobileArea sysMobileArea) {
+        return Result.success().put("data", sysAuthV2Service.getMobileAreaList(sysMobileArea));
+    }
+
+}

+ 2 - 0
src/main/java/com/backendsys/modules/system/controller/SysUserRoleModuleV2Controller.java

@@ -3,6 +3,7 @@ package com.backendsys.modules.system.controller;
 import com.backendsys.modules.common.utils.Result;
 import com.backendsys.modules.system.service.SysUserRoleModuleV2Service;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @Validated
 @RestController
+@Tag(name = "系统用户角色模块")
 public class SysUserRoleModuleV2Controller {
 
     @Autowired

+ 2 - 0
src/main/java/com/backendsys/modules/system/controller/SysUserRoleV2Controller.java

@@ -5,6 +5,7 @@ import com.backendsys.modules.common.utils.Result;
 import com.backendsys.entity.System.SysUserRoleDTO;
 import com.backendsys.modules.system.service.SysUserRoleV2Service;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -16,6 +17,7 @@ import java.util.Arrays;
  */
 @Validated
 @RestController
+@Tag(name = "系统用户角色")
 public class SysUserRoleV2Controller {
 
     @Autowired

+ 1 - 1
src/main/java/com/backendsys/modules/system/controller/SysUserV2Controller.java

@@ -5,7 +5,7 @@ import com.backendsys.exception.CustException;
 import com.backendsys.modules.common.config.security.enums.SecurityEnum;
 import com.backendsys.modules.common.config.security.utils.SecurityUtil;
 import com.backendsys.modules.common.utils.Result;
-import com.backendsys.modules.system.entity.SysUser.SysUserDTO;
+import com.backendsys.modules.system.entity.SysUserDTO;
 import com.backendsys.modules.system.service.SysUserV2Service;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

+ 13 - 0
src/main/java/com/backendsys/modules/system/dao/SysMobileAreaDao.java

@@ -0,0 +1,13 @@
+package com.backendsys.modules.system.dao;
+
+import com.backendsys.modules.system.entity.SysMobileArea;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SysMobileAreaDao extends BaseMapper<SysMobileArea> {
+    List<SysMobileArea> selectMobileAreaList(SysMobileArea sysMobileArea);
+
+}

+ 2 - 4
src/main/java/com/backendsys/modules/system/dao/SysUserDao.java

@@ -1,12 +1,10 @@
 package com.backendsys.modules.system.dao;
 
-import com.backendsys.modules.system.entity.SysUser.SysUser;
-import com.backendsys.modules.system.entity.SysUser.SysUserDTO;
+import com.backendsys.modules.system.entity.SysUser;
+import com.backendsys.modules.system.entity.SysUserDTO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
-
 @Mapper
 public interface SysUserDao extends BaseMapper<SysUser> {
     int insertUser(SysUserDTO sysUserDTO);

+ 2 - 3
src/main/java/com/backendsys/modules/system/dao/SysUserInfoDao.java

@@ -1,12 +1,11 @@
 package com.backendsys.modules.system.dao;
 
-import com.backendsys.modules.system.entity.SysUser.SysUserDTO;
-import com.backendsys.modules.system.entity.SysUser.SysUserInfo;
+import com.backendsys.modules.system.entity.SysUserDTO;
+import com.backendsys.modules.system.entity.SysUserInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
-import java.util.Set;
 
 @Mapper
 public interface SysUserInfoDao extends BaseMapper<SysUserInfo> {

+ 1 - 2
src/main/java/com/backendsys/modules/system/dao/SysUserRoleDao.java

@@ -1,8 +1,7 @@
 package com.backendsys.modules.system.dao;
 
 import com.backendsys.entity.System.SysUserRoleDTO;
-import com.backendsys.modules.system.entity.SysUser.SysUserInfo;
-import com.backendsys.modules.system.entity.SysUser.SysUserRole;
+import com.backendsys.modules.system.entity.SysUserRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 2 - 2
src/main/java/com/backendsys/modules/system/dao/SysUserRoleModuleDao.java

@@ -1,6 +1,6 @@
 package com.backendsys.modules.system.dao;
 
-import com.backendsys.modules.system.entity.SysUser.SysUserRoleModule;
+import com.backendsys.modules.system.entity.SysUserRoleModule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -10,6 +10,6 @@ import java.util.Map;
 @Mapper
 public interface SysUserRoleModuleDao extends BaseMapper<SysUserRoleModule> {
 
-    List<Map<String, Object>> getUserRoleModule();
+    List<Map<String, Object>> selectUserRoleModule();
 
 }

+ 1 - 1
src/main/java/com/backendsys/modules/system/dao/SysUserRoleModuleRelationDao.java

@@ -1,6 +1,6 @@
 package com.backendsys.modules.system.dao;
 
-import com.backendsys.modules.system.entity.SysUser.SysUserRoleModuleRelation;
+import com.backendsys.modules.system.entity.SysUserRoleModuleRelation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 1 - 1
src/main/java/com/backendsys/modules/system/dao/SysUserRoleRelationDao.java

@@ -1,6 +1,6 @@
 package com.backendsys.modules.system.dao;
 
-import com.backendsys.modules.system.entity.SysUser.SysUserRoleRelation;
+import com.backendsys.modules.system.entity.SysUserRoleRelation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 13 - 0
src/main/java/com/backendsys/modules/system/entity/SysMobileArea.java

@@ -0,0 +1,13 @@
+package com.backendsys.modules.system.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("sys_mobile_area_code")
+public class SysMobileArea {
+    private Long id;
+    private String area_name;
+    private String area_name_abbr;
+    private String area_code;
+}

+ 1 - 1
src/main/java/com/backendsys/modules/system/entity/SysUser/SysUser.java → src/main/java/com/backendsys/modules/system/entity/SysUser.java

@@ -1,4 +1,4 @@
-package com.backendsys.modules.system.entity.SysUser;
+package com.backendsys.modules.system.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
src/main/java/com/backendsys/modules/system/entity/SysUser/SysUserDTO.java → src/main/java/com/backendsys/modules/system/entity/SysUserDTO.java

@@ -1,4 +1,4 @@
-package com.backendsys.modules.system.entity.SysUser;
+package com.backendsys.modules.system.entity;
 
 import com.backendsys.entity.validator.Phone;
 import com.backendsys.entity.validator.RangeArray;

+ 1 - 1
src/main/java/com/backendsys/modules/system/entity/SysUser/SysUserInfo.java → src/main/java/com/backendsys/modules/system/entity/SysUserInfo.java

@@ -1,4 +1,4 @@
-package com.backendsys.modules.system.entity.SysUser;
+package com.backendsys.modules.system.entity;
 
 import com.backendsys.entity.System.SysUserDTO;
 import com.baomidou.mybatisplus.annotation.IdType;

+ 1 - 1
src/main/java/com/backendsys/modules/system/entity/SysUser/SysUserRole.java → src/main/java/com/backendsys/modules/system/entity/SysUserRole.java

@@ -1,4 +1,4 @@
-package com.backendsys.modules.system.entity.SysUser;
+package com.backendsys.modules.system.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
src/main/java/com/backendsys/modules/system/entity/SysUser/SysUserRoleModule.java → src/main/java/com/backendsys/modules/system/entity/SysUserRoleModule.java

@@ -1,4 +1,4 @@
-package com.backendsys.modules.system.entity.SysUser;
+package com.backendsys.modules.system.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
src/main/java/com/backendsys/modules/system/entity/SysUser/SysUserRoleModuleRelation.java → src/main/java/com/backendsys/modules/system/entity/SysUserRoleModuleRelation.java

@@ -1,4 +1,4 @@
-package com.backendsys.modules.system.entity.SysUser;
+package com.backendsys.modules.system.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
src/main/java/com/backendsys/modules/system/entity/SysUser/SysUserRoleRelation.java → src/main/java/com/backendsys/modules/system/entity/SysUserRoleRelation.java

@@ -1,4 +1,4 @@
-package com.backendsys.modules.system.entity.SysUser;
+package com.backendsys.modules.system.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 15 - 0
src/main/java/com/backendsys/modules/system/service/SysAuthV2Service.java

@@ -0,0 +1,15 @@
+package com.backendsys.modules.system.service;
+
+import com.backendsys.modules.system.entity.SysMobileArea;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+import java.util.List;
+
+public interface SysAuthV2Service {
+
+    void renderCaptcha(HttpServletRequest request, HttpServletResponse response) throws IOException;
+    List<SysMobileArea> getMobileAreaList(SysMobileArea sysMobileArea);
+
+}

+ 1 - 1
src/main/java/com/backendsys/modules/system/service/SysUserRoleModuleV2Service.java

@@ -1,6 +1,6 @@
 package com.backendsys.modules.system.service;
 
-import com.backendsys.modules.system.entity.SysUser.SysUserRoleModule;
+import com.backendsys.modules.system.entity.SysUserRoleModule;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;

+ 1 - 2
src/main/java/com/backendsys/modules/system/service/SysUserRoleV2Service.java

@@ -1,11 +1,10 @@
 package com.backendsys.modules.system.service;
 
 import com.backendsys.entity.System.SysUserRoleDTO;
-import com.backendsys.modules.system.entity.SysUser.SysUserRole;
+import com.backendsys.modules.system.entity.SysUserRole;
 import com.backendsys.utils.response.PageEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
 import java.util.Map;
 
 public interface SysUserRoleV2Service extends IService<SysUserRole> {

+ 3 - 3
src/main/java/com/backendsys/modules/system/service/SysUserV2Service.java

@@ -1,8 +1,8 @@
 package com.backendsys.modules.system.service;
 
-import com.backendsys.modules.system.entity.SysUser.SysUser;
-import com.backendsys.modules.system.entity.SysUser.SysUserDTO;
-import com.backendsys.modules.system.entity.SysUser.SysUserInfo;
+import com.backendsys.modules.system.entity.SysUser;
+import com.backendsys.modules.system.entity.SysUserDTO;
+import com.backendsys.modules.system.entity.SysUserInfo;
 import com.backendsys.utils.response.PageEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 

+ 71 - 0
src/main/java/com/backendsys/modules/system/service/impl/SysAuthV2ServiceImpl.java

@@ -0,0 +1,71 @@
+package com.backendsys.modules.system.service.impl;
+
+import com.backendsys.config.Kaptcha.KaptchaUtil;
+import com.backendsys.modules.common.config.redis.utils.RedisUtil;
+import com.backendsys.modules.system.dao.SysMobileAreaDao;
+import com.backendsys.modules.system.entity.SysMobileArea;
+import com.backendsys.modules.system.service.SysAuthV2Service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.code.kaptcha.Producer;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+@Service
+public class SysAuthV2ServiceImpl implements SysAuthV2Service {
+
+    @Autowired
+    private RedisUtil redisUtil;
+    @Autowired
+    private Producer captchaProducer;
+    @Value("${CAPTCHA_DURATION}")
+    private Integer CAPTCHA_DURATION;
+
+    @Autowired
+    private SysMobileAreaDao sysMobileAreaDao;
+
+    @Override
+    public void renderCaptcha(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        byte[] captchaChallengeAsJpeg;
+        ByteArrayOutputStream jpegOutputStream = new ByteArrayOutputStream();
+        try {
+            String createText = captchaProducer.createText();
+            // 获得当前 (UA + IP) 生成的 Key
+            String captchaRedisKey = KaptchaUtil.getKaptchaKey(request);
+            // 保存 验证码字符串 到 redis 中
+            redisUtil.setCacheObject(captchaRedisKey, createText, this.CAPTCHA_DURATION, TimeUnit.MILLISECONDS);
+            // 返回 BufferedImage 对象并转为 byte 写入到 byte 数组中
+            BufferedImage challenge = captchaProducer.createImage(createText);
+            ImageIO.write(challenge, "jpg", jpegOutputStream);
+        } catch (Exception e) {
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+        }
+        // 定义response输出类型为image/jpeg类型,使用response输出流输出图片的byte数组
+        captchaChallengeAsJpeg = jpegOutputStream.toByteArray();
+        response.setHeader("Cache-Control", "no-store");
+        response.setHeader("Pragma", "no-cache");
+        response.setDateHeader("Expires", 0);
+        response.setContentType("image/jpeg");
+        ServletOutputStream responseOutputStream = response.getOutputStream();
+        responseOutputStream.write(captchaChallengeAsJpeg);
+        responseOutputStream.flush();
+        responseOutputStream.close();
+    }
+
+    @Override
+    public List<SysMobileArea> getMobileAreaList(SysMobileArea sysMobileArea) {
+        return sysMobileAreaDao.selectMobileAreaList(sysMobileArea);
+    }
+
+}

+ 2 - 4
src/main/java/com/backendsys/modules/system/service/impl/SysUserRoleModuleV2ServiceImpl.java

@@ -1,10 +1,8 @@
 package com.backendsys.modules.system.service.impl;
 
-import com.backendsys.modules.common.utils.Result;
 import com.backendsys.modules.system.dao.SysUserRoleModuleDao;
-import com.backendsys.modules.system.entity.SysUser.SysUserRoleModule;
+import com.backendsys.modules.system.entity.SysUserRoleModule;
 import com.backendsys.modules.system.service.SysUserRoleModuleV2Service;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,7 +18,7 @@ public class SysUserRoleModuleV2ServiceImpl extends ServiceImpl<SysUserRoleModul
 
     @Override
     public List<Map<String, Object>> getUserRoleModule() {
-        return sysUserRoleModuleDao.getUserRoleModule();
+        return sysUserRoleModuleDao.selectUserRoleModule();
     }
 
 }

+ 3 - 7
src/main/java/com/backendsys/modules/system/service/impl/SysUserRoleV2ServiceImpl.java

@@ -1,24 +1,20 @@
 package com.backendsys.modules.system.service.impl;
 
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.backendsys.entity.System.SysUserRoleDTO;
 import com.backendsys.exception.CustException;
 import com.backendsys.modules.system.dao.SysUserRoleDao;
 import com.backendsys.modules.system.dao.SysUserRoleModuleRelationDao;
 import com.backendsys.modules.system.dao.SysUserRoleRelationDao;
-import com.backendsys.modules.system.entity.SysUser.SysUserRole;
-import com.backendsys.modules.system.entity.SysUser.SysUserRoleModuleRelation;
-import com.backendsys.modules.system.entity.SysUser.SysUserRoleRelation;
+import com.backendsys.modules.system.entity.SysUserRole;
+import com.backendsys.modules.system.entity.SysUserRoleModuleRelation;
+import com.backendsys.modules.system.entity.SysUserRoleRelation;
 import com.backendsys.modules.system.service.SysUserRoleV2Service;
 import com.backendsys.utils.response.PageEntity;
 import com.backendsys.utils.response.PageInfoResult;
 import com.backendsys.utils.v2.PageUtils;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 4 - 5
src/main/java/com/backendsys/modules/system/service/impl/SysUserV2ServiceImpl.java

@@ -6,18 +6,17 @@ import com.backendsys.exception.CustException;
 import com.backendsys.modules.common.config.redis.utils.RedisUtil;
 import com.backendsys.modules.common.utils.MybatisUtil;
 import com.backendsys.modules.system.dao.*;
-import com.backendsys.modules.system.entity.SysUser.*;
+import com.backendsys.modules.system.entity.SysUser;
+import com.backendsys.modules.system.entity.SysUserDTO;
+import com.backendsys.modules.system.entity.SysUserInfo;
+import com.backendsys.modules.system.entity.SysUserRoleRelation;
 import com.backendsys.modules.system.service.SysUserV2Service;
 import com.backendsys.utils.response.PageEntity;
 import com.backendsys.utils.response.PageInfoResult;
-import com.backendsys.utils.response.Result;
-import com.backendsys.utils.response.ResultEnum;
 import com.backendsys.utils.v2.PageUtils;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;

+ 4 - 0
src/main/resources/application.yml

@@ -96,7 +96,11 @@ whitelist:
   jwt:
     /api/webhook,
     /api/public/**,
+    /api/v2/public/**,
+    
     /api/system/auth/**,
+    /api/v2/system/auth/**,
+    
     /api/b2c/member/auth/**,
     /api/test/**,
     /ws/**,

+ 33 - 0
src/main/resources/mapper/system/SysMobileAreaDao.xml

@@ -0,0 +1,33 @@
+<?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="com.backendsys.modules.system.dao.SysMobileAreaDao">
+
+    <sql id="includeMobileAreaCode">
+        id,
+        area_name,
+        COALESCE(area_name_abbr, '') area_name_abbr,
+        area_code
+    </sql>
+    <resultMap id="resultMapMobileAreaCode" type="java.util.LinkedHashMap">
+        <id property="id" column="id" jdbcType="BIGINT" />
+        <result property="area_name" column="area_name" />
+        <result property="area_name_abbr" column="area_name_abbr" />
+        <result property="area_code" column="area_code" javaType="java.lang.Integer" />
+    </resultMap>
+    <select id="selectMobileAreaList" resultMap="resultMapMobileAreaCode">
+        SELECT <include refid="includeMobileAreaCode" />
+        FROM sys_mobile_area_code
+        <where>
+            <if test="area_name != null and area_name != ''">
+                AND area_name = #{area_name}
+            </if>
+            <if test="area_name_abbr != null and area_name_abbr != ''">
+                AND area_name_abbr = #{area_name_abbr}
+            </if>
+            <if test="area_code != null and area_code != ''">
+                AND area_code = #{area_code}
+            </if>
+        </where>
+    </select>
+
+</mapper>

+ 1 - 1
src/main/resources/mapper/system/SysUserInfoDao.xml

@@ -96,7 +96,7 @@
     </select>
 
 <!--    <resultMap id="resultMapUserDetail" type="java.util.LinkedHashMap">-->
-<!--    <resultMap id="resultMapUserDetail" type="com.backendsys.modules.system.entity.SysUser.SysUserDTO">-->
+<!--    <resultMap id="resultMapUserDetail" type="com.backendsys.modules.system.entity.SysUserDTO">-->
 <!--        <id property="id" column="id" jdbcType="BIGINT" />-->
 <!--        <result property="user_id" column="user_id" />-->
 <!--        <result property="username" column="username" />-->

+ 1 - 1
src/main/resources/mapper/system/SysUserRoleModuleDao.xml

@@ -8,7 +8,7 @@
         <result property="module_name" column="module_name" />
     </resultMap>
 
-    <select id="getUserRoleModule" resultMap="resultMapUserRoleModule">
+    <select id="selectUserRoleModule" resultMap="resultMapUserRoleModule">
         SELECT id, parent_id, module_name, sort FROM sys_user_role_module ORDER BY sort ASC
     </select>