mybatis plus delete

farm-common-biz/src/main/java/jp/yamoto/farm/common/biz/domain/entity/MastItemEntity.java

@@ -1,88 +0,0 @@
-package jp.yamoto.farm.common.biz.domain.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import jp.yamoto.farm.common.core.domain.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldNameConstants;
-
-import java.math.BigDecimal;
-
-/**
- * 商品マスタ
- */
-@Data
-@FieldNameConstants
-@EqualsAndHashCode(callSuper = true)
-@TableName("mast_item")
-public class MastItemEntity extends BaseEntity<MastItemEntity> {
-
-    @TableId(value = "id", type = IdType.INPUT)
-    private String id;
-
-    private String itemId;
-
-    private String itemCode;
-
-    private String itemName;
-
-    // JANコード
-    private String janCode;
-
-    // スマレジ商品ID
-    private String sumarejiItemId;
-
-    // システム商品番号
-    private String sysItemCode;
-
-    // 商品カテゴリ(大)
-    private String category1;
-
-    //商品カテゴリ(中)
-    private String category2;
-
-    // 軽減税率対象
-    private String reducedTaxFlg;
-
-    // 消費税設定
-    private String salesTaxFlg;
-
-    // 販売価格
-    private BigDecimal salesPrice;
-
-    // 通常価格
-    private BigDecimal normalPrice;
-
-    // 会員価格
-    private BigDecimal memberPrice;
-
-    // 便種
-    private String shippingFlg;
-
-    //宅急便サイズ
-    private String takkyubinSizeFlg;
-
-    //梱包まとめ
-    private String ackagingFlg;
-
-    //荷扱い1
-    private String handlingType1Flg;
-
-    //荷扱い2
-    private String handlingType2Flg;
-
-    //商品ページ公開フラグ
-    private String itemPagePublicFlg;
-
-    //農家ID
-    private String farmerId;
-
-    @Version
-    private Integer version;
-
-    /**
-     * 1:廃止 0:有効 （有効無効フラグ）
-     */
-    @TableLogic
-    private Integer discontinuedFlg;
-}

farm-common-biz/src/main/java/jp/yamoto/farm/common/biz/mapper/MastItemMapper.java

@@ -1,16 +0,0 @@
-package jp.yamoto.farm.common.biz.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jp.yamoto.farm.common.biz.domain.bo.MastItemQueryBo;
-import jp.yamoto.farm.common.biz.domain.entity.MastItemEntity;
-import jp.yamoto.farm.common.biz.domain.vo.MastItemVo;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-@Mapper
-public interface MastItemMapper extends BaseMapper<MastItemEntity> {
-
-    IPage<MastItemVo> getListPage(Page page, @Param("query") MastItemQueryBo queryBo);
-}

farm-common-biz/src/main/java/jp/yamoto/farm/common/biz/service/IMastItemService.java

@@ -1,14 +0,0 @@
-package jp.yamoto.farm.common.biz.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import jp.yamoto.farm.common.biz.domain.bo.MastItemQueryBo;
-import jp.yamoto.farm.common.biz.domain.entity.MastItemEntity;
-
-public interface IMastItemService extends IService<MastItemEntity> {
-
-    IPage getListPage(Page page, MastItemQueryBo queryBo);
-
-    public void save();
-}

farm-common-biz/src/main/java/jp/yamoto/farm/common/biz/service/impl/MastItemServiceImpl.java

@@ -1,33 +0,0 @@
-package jp.yamoto.farm.common.biz.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jp.yamoto.farm.common.biz.domain.bo.MastItemQueryBo;
-import jp.yamoto.farm.common.biz.domain.entity.MastItemEntity;
-import jp.yamoto.farm.common.biz.mapper.MastItemMapper;
-import jp.yamoto.farm.common.biz.service.IMastItemService;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-@Service
-@AllArgsConstructor
-@Slf4j
-public class MastItemServiceImpl extends ServiceImpl<MastItemMapper, MastItemEntity> implements IMastItemService {
-
-    @Override
-    public IPage getListPage(Page page, MastItemQueryBo queryBo) {
-        return baseMapper.getListPage(page, queryBo);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    public void save(){
-        baseMapper.deleteById("1");
-        MastItemEntity mastItem = new MastItemEntity();
-        mastItem.setItemCode("test01");
-        mastItem.setItemName("test000001");
-        baseMapper.insert(mastItem);
-    }
-}

farm-common/pom.xml

@@ -37,8 +37,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
         </dependency>
 
         <!-- kaptcha -->

farm-common/src/main/java/jp/yamoto/farm/common/core/domain/BaseEntity.java

@@ -5,8 +5,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -16,13 +14,12 @@ import com.fasterxml.jackson.annotation.JsonInclude;
  * 
  * @author nextosd
  */
-public class BaseEntity<T> extends Model implements Serializable
+public class BaseEntity implements Serializable
 {
     private static final long serialVersionUID = 1L;
 
     /** 検索値 */
     @JsonIgnore
-    @TableField(exist = false)
     private String searchValue;
 
     /** 作成者 */
@@ -51,7 +48,6 @@ public class BaseEntity<T> extends Model implements Serializable
 
     /** パラメータ */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    @TableField(exist = false)
     private Map<String, Object> params;
 
     public String getSearchValue()

farm-common/src/main/java/jp/yamoto/farm/common/exception/user/AuthVerifyCodeNotMatchException.java

@@ -0,0 +1,16 @@
+package jp.yamoto.farm.common.exception.user;
+
+/**
+ * ユーザー認証コードが正しくないか、仕様に一致していない例外クラス
+ * 
+ * @author nextosd
+ */
+public class AuthVerifyCodeNotMatchException extends UserException
+{
+    private static final long serialVersionUID = 1L;
+
+    public AuthVerifyCodeNotMatchException()
+    {
+        super("E0063", null);
+    }
+}

farm-common/src/main/java/jp/yamoto/farm/common/mybatis/MyBatisConfig.java

@@ -34,11 +34,11 @@ import java.util.List;
  *
  * @author nextosd
  */
-//@Configuration
+@Configuration
 public class MyBatisConfig {
     static final String DEFAULT_RESOURCE_PATTERN = "**/*.class";
     
-    //@Autowired
+    @Autowired
     private Environment env;
 
     public static String setTypeAliasesPackage(String typeAliasesPackage) {

farm-common/src/main/java/jp/yamoto/farm/common/mybatis/MyBatisPlusConfig.java

@@ -1,85 +0,0 @@
-package jp.yamoto.farm.common.mybatis;
-
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import jp.yamoto.farm.common.core.domain.model.LoginUser;
-import jp.yamoto.farm.common.mybatis.resolver.SqlFilterArgumentResolver;
-import jp.yamoto.farm.common.utils.SecurityUtils;
-import org.apache.ibatis.reflection.MetaObject;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.core.Authentication;
-import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * Mybatis plus の*マッチングスキャンパッケージサポート
- */
-@Configuration
-public class MyBatisPlusConfig implements WebMvcConfigurer {
-
-    @Bean
-    public MybatisPlusInterceptor mybatisPlusInterceptor() {
-        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.POSTGRE_SQL));
-        return interceptor;
-    }
-
-    @Override
-    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
-        argumentResolvers.add(new SqlFilterArgumentResolver());
-    }
-
-    /**
-     * このインターセプターは、INSERT または UPDATE 操作を実行する際に、作成日時、更新日時、作成ユーザー、更新ユーザーなどのフィールドを自動的に設定します。
-     */
-    @Bean
-    public MetaObjectHandler metaObjectHandler() {
-        return new MetaObjectHandler() {
-            @Override
-            public void insertFill(MetaObject metaObject) {
-                this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now());
-                this.strictInsertFill(metaObject, "createBy", String.class, this.getLoginUserId());
-                this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now());
-                this.strictInsertFill(metaObject, "updateBy", String.class, this.getLoginUserId());
-            }
-
-            @Override
-            public void updateFill(MetaObject metaObject) {
-                this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now());
-                this.strictInsertFill(metaObject, "updateBy", String.class, this.getLoginUserId());
-            }
-
-            /**
-             * 現在のログインユーザーのIDを取得します。
-             * 認証情報が取得できない場合は、デフォルト値 "System" を返します。
-             *
-             * @return 現在のログインユーザーのID
-             */
-            private String getLoginUserId() {
-                String loginUserId = "System";
-                try {
-                    Authentication authentication = SecurityUtils.getAuthentication();
-                    if (authentication == null) {
-                        return loginUserId;
-                    }
-                    Object principal = authentication.getPrincipal();
-                    if (principal != null && principal instanceof LoginUser) {
-                        LoginUser loginUser = (LoginUser) authentication.getPrincipal();
-                        if (loginUser != null) {
-                            loginUserId = loginUser.getUserId();
-                        }
-                    }
-                    return loginUserId;
-                } catch (Exception ex) {
-                    return loginUserId;
-                }
-            }
-        };
-    }
-}

farm-common/src/main/java/jp/yamoto/farm/common/mybatis/resolver/SqlFilterArgumentResolver.java

@@ -1,69 +0,0 @@
-package jp.yamoto.farm.common.mybatis.resolver;
-
-
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.core.toolkit.sql.SqlInjectionUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.servlet.http.HttpServletRequest;
-import jp.yamoto.farm.common.utils.ValueUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.MethodParameter;
-import org.springframework.web.bind.support.WebDataBinderFactory;
-import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.method.support.ModelAndViewContainer;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-/**
- * Mybatis Plus Order By SQL
- */
-@Slf4j
-public class SqlFilterArgumentResolver implements HandlerMethodArgumentResolver {
-
-    @Override
-    public boolean supportsParameter(MethodParameter parameter) {
-        return parameter.getParameterType().equals(Page.class);
-    }
-
-    @Override
-    public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
-                                  NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
-
-        HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class);
-
-        String[] ascs = request.getParameterValues("ascs");
-        String[] descs = request.getParameterValues("descs");
-        String current = request.getParameter("current");
-        String size = request.getParameter("size");
-
-        Page<?> page = new Page<>();
-        if (ValueUtils.isNotEmpty(current)) {
-            page.setCurrent(Long.parseLong(current));
-        }
-
-        if (ValueUtils.isNotEmpty(size)) {
-            page.setSize(Long.parseLong(size));
-        }
-
-        List<OrderItem> orderItemList = new ArrayList<>();
-        Optional.ofNullable(ascs)
-                .ifPresent(s -> orderItemList.addAll(Arrays.stream(s)
-                        .filter(asc -> !SqlInjectionUtils.check(asc))
-                        .map(OrderItem::asc)
-                        .collect(Collectors.toList())));
-        Optional.ofNullable(descs)
-                .ifPresent(s -> orderItemList.addAll(Arrays.stream(s)
-                        .filter(desc -> !SqlInjectionUtils.check(desc))
-                        .map(OrderItem::desc)
-                        .collect(Collectors.toList())));
-        page.addOrder(orderItemList);
-
-        return page;
-    }
-
-}

farm-crm/src/main/java/jp/yamoto/farm/FarmCrmApplication.java

@@ -15,7 +15,6 @@ import java.util.TimeZone;
  * @author nextosd
  */
 @SpringBootApplication
-@MapperScan({"jp.yamoto.farm.crm.biz.*.mapper", "jp.yamoto.farm.common.biz.mapper"})
 public class FarmCrmApplication
 {
     public static void main(String[] args)

farm-crm/src/main/resources/application.yml

@@ -151,24 +151,6 @@ mybatis:
   # グローバルなプロファイルのロード
   configLocation: classpath:mybatis/mybatis-config.xml
 
-# mybatis-plus config
-mybatis-plus:
-  # 指定されたパッケージ別名の検索
-  type-aliases-package: jp.yamoto.farm.**.domain
-  mapper-locations: classpath*:/mapper/**/*.xml # mapper xml file
-  global-config:
-    banner: false # is print mybatis-plus banner
-    db-config:
-      id-type: auto
-      where-strategy: not_empty
-      insert-strategy: not_empty
-      update-strategy: not_null
-  type-handlers-package: jp.yamoto.farm.common.mybatis.handler # package
-  configuration:
-    jdbc-type-for-null: 'null'
-    call-setters-on-nulls: true
-    shrink-whitespaces-in-sql: true
-
 # PageHelper ページングプラグイン
 pagehelper:
   helperDialect: postgresql

farm-sankin-biz/src/main/java/jp/yamoto/farm/sankin/biz/auth/domain/AuthReSendVerifyCodeBo.java

@@ -10,9 +10,9 @@ import lombok.Data;
 public class AuthReSendVerifyCodeBo {
 
     /**
-     * EMail
+     * tempToken
      */
-    @LmNotBlank(params = {"{emailAddress}"})
-    private String emailAddress;
+    @LmNotBlank(params = {"{tempToken}"})
+    private String tempToken;
 
 }

farm-sankin-biz/src/main/java/jp/yamoto/farm/sankin/biz/auth/domain/AuthSecondVerifyBo.java

@@ -11,10 +11,10 @@ import lombok.Data;
 public class AuthSecondVerifyBo {
 
     /**
-     * EMail
+     * tempToken
      */
-    @LmNotBlank(params = {"{mailAddress}"})
-    private String mailAddress;
+    @LmNotBlank(params = {"{tempToken}"})
+    private String tempToken;
 
     /**
      * 認証コード

farm-sankin-biz/src/main/java/jp/yamoto/farm/sankin/biz/auth/domain/AuthTempTokenBo.java

@@ -0,0 +1,20 @@
+package jp.yamoto.farm.sankin.biz.auth.domain;
+
+import lombok.Data;
+
+/**
+ * 一時トークン
+ */
+@Data
+public class AuthTempTokenBo {
+
+    /**
+     * 認証コードを送信 ID
+     */
+    private String sendVerifyCodeId;
+
+    /**
+     * EMail
+     */
+    private String mailAddess;
+}

farm-sankin-biz/src/main/java/jp/yamoto/farm/sankin/biz/auth/service/AuthService.java

@@ -11,6 +11,7 @@ import jp.yamoto.farm.common.core.service.TokenService;
 import jp.yamoto.farm.common.enums.AuthStatusEnum;
 import jp.yamoto.farm.common.enums.UserStatus;
 import jp.yamoto.farm.common.exception.ServiceException;
+import jp.yamoto.farm.common.exception.user.AuthVerifyCodeNotMatchException;
 import jp.yamoto.farm.common.exception.user.UserNotExistsException;
 import jp.yamoto.farm.common.exception.user.UserPasswordNotMatchException;
 import jp.yamoto.farm.common.manager.AsyncManager;
@@ -18,10 +19,7 @@ import jp.yamoto.farm.common.manager.factory.AsyncFactory;
 import jp.yamoto.farm.common.security.context.AuthenticationContextHolder;
 import jp.yamoto.farm.common.utils.*;
 import jp.yamoto.farm.common.utils.ip.IpUtils;
-import jp.yamoto.farm.sankin.biz.auth.domain.AuthReSendVerifyCodeBo;
-import jp.yamoto.farm.sankin.biz.auth.domain.AuthResetPwdBo;
-import jp.yamoto.farm.sankin.biz.auth.domain.AuthSecondVerifyBo;
-import jp.yamoto.farm.sankin.biz.auth.domain.AuthSendVerifyCodeBo;
+import jp.yamoto.farm.sankin.biz.auth.domain.*;
 import jp.yamoto.farm.sankin.biz.mapper.FarmerUserMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,6 +34,9 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+import java.util.Map;
+
 /**
  * 農家 認証
  * 
@@ -74,8 +75,10 @@ public class AuthService {
             throw new UserPasswordNotMatchException();
         }
 
-        // email
-        return userDetails.getMailAddress();
+        // 認証コードを送信する
+        String sendId = "123";
+
+        return this.createTempToken(sendId, userDetails.getMailAddress());
     }
 
     /**
@@ -91,8 +94,9 @@ public class AuthService {
 
         try
         {
+            AuthTempTokenBo authTempTokenBo = getTempToken(authSecondBo.getTempToken());
             // ユーザー
-            userDetails = this.selectUserByMailAddress(authSecondBo.getMailAddress());
+            userDetails = this.selectUserByMailAddress(authTempTokenBo.getMailAddess());
             UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(userDetails.getFarmerId(), authSecondBo.getVerifyCode());
             AuthenticationContextHolder.setContext(authenticationToken);
             authentication = authenticationManager.authenticate(authenticationToken);
@@ -101,8 +105,8 @@ public class AuthService {
         {
             if (e instanceof BadCredentialsException)
             {
-                AsyncManager.me().execute(AsyncFactory.recordLogininfor(appConfig.getName(), userDetails.getFarmerId(), Constants.LOGIN_FAIL, MessageUtils.message("E0004")));
-                throw new UserPasswordNotMatchException();
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(appConfig.getName(), userDetails.getFarmerId(), Constants.LOGIN_FAIL, MessageUtils.message("E0063")));
+                throw new AuthVerifyCodeNotMatchException();
             }
             else
             {
@@ -114,7 +118,8 @@ public class AuthService {
         {
             AuthenticationContextHolder.clearContext();
         }
-        AsyncManager.me().execute(AsyncFactory.recordLogininfor(appConfig.getName(), userDetails.getFarmerId(), Constants.LOGIN_SUCCESS, MessageUtils.message("I0008")));
+        // I0011=二次認証に成功しました。
+        AsyncManager.me().execute(AsyncFactory.recordLogininfor(appConfig.getName(), userDetails.getFarmerId(), Constants.LOGIN_SUCCESS, MessageUtils.message("I0011")));
 
         LoginUser<FarmerUserInfo> loginUser = (LoginUser) authentication.getPrincipal();
 
@@ -127,13 +132,18 @@ public class AuthService {
     /**
      * 認証コードを再送信する
      */
-    public void resendAuthCode(AuthReSendVerifyCodeBo authReSendVerifyCodeBo) throws Exception {
+    public String resendAuthCode(AuthReSendVerifyCodeBo authReSendVerifyCodeBo) throws Exception {
+
+        AuthTempTokenBo authTempTokenBo = getTempToken(authReSendVerifyCodeBo.getTempToken());
 
         // ユーザー
-        FarmerUserInfo userDetails = this.selectUserByMailAddress(authReSendVerifyCodeBo.getEmailAddress());
+        FarmerUserInfo userDetails = this.selectUserByMailAddress(authTempTokenBo.getMailAddess());
 
         // TODO 認証コードを再送信する
        // emailService.generateAndSendVerificationCode(user.getEmail());
+        String sendId = "5698";
+
+        return this.createTempToken(sendId, userDetails.getMailAddress());
     }
 
     /**
@@ -223,8 +233,60 @@ public class AuthService {
      *
      * @param user ユーザ
      */
-    public void recordLoginInfo(FarmerUserInfo user)
+    private void recordLoginInfo(FarmerUserInfo user)
     {
         farmerMapper.updateLoginInfo(user);
     }
+
+    /**
+     * 認証トークンの生成
+     *
+     * @param sendAuthVerifyCodeId セッション管理ID
+     * @param email              メールアドレス
+     * @return 認証トークン
+     */
+    private String createTempToken(String sendAuthVerifyCodeId, String email) {
+        String resultToken = StringUtils.EMPTY;
+        try {
+            Map<String, Object> encryptMap = Map.of(
+                    "sendId", sendAuthVerifyCodeId,
+                    "email", email);
+            String tokenFormat = JsonUtil.toJsonStr(encryptMap);
+            resultToken = DecryptUtils.decryptAES(tokenFormat);
+        } catch (Exception ex) {
+            log.error("【認証ユーザー異常】一時トークンの生成に失敗しました。", ex);
+            throw new ServiceException("一時トークン生成失敗しますので、管理者を連絡してください。");
+        }
+        return resultToken;
+    }
+
+    private AuthTempTokenBo getTempToken(String tempToken){
+        AuthTempTokenBo result = new AuthTempTokenBo();
+        String decryptTokenStr;
+        try {
+            // 認証トークンの復号化
+            decryptTokenStr = DecryptUtils.decryptAES(tempToken);
+        } catch (Exception e) {
+            log.error("【認証ユーザー異常】認証トークンの復号化に失敗しました。 {}", e);
+            throw new ServiceException( "認証トークンが無効です。");
+        }
+
+        if (StringUtils.isEmpty(decryptTokenStr)) {
+            log.error("【認証ユーザー異常】認証ユーザー情報を取得する。復号化情報は空白");
+            throw new ServiceException("認証トークンが無効です。");
+        } else if (!JsonUtil.isJsonStr(decryptTokenStr)) {
+            log.error("【認証ユーザー異常】認証ユーザー情報を取得する。復号化情報はJSON形式以外です。");
+            throw new ServiceException("認証トークンが無効です。");
+        }
+
+        // 復号化のトーケン情報
+        Map<String, Object> tokenMap = JsonUtil.parseObject(decryptTokenStr, Map.class);
+
+        if (null != tokenMap && tokenMap.containsKey("sendId") && StringUtils.isNotNull(tokenMap.get("sendId"))) {
+            result.setSendVerifyCodeId(String.valueOf(tokenMap.get("sendId")));
+            result.setMailAddess(String.valueOf(tokenMap.get("email")));
+        }
+
+        return result;
+    }
 }

farm-sankin/src/main/java/jp/yamoto/farm/FarmSankinApplication.java

@@ -14,7 +14,6 @@ import java.util.TimeZone;
  * @author nextosd
  */
 @SpringBootApplication
-@MapperScan({"jp.yamoto.farm.sankin.biz.mapper", "jp.yamoto.farm.common.biz.mapper"})
 public class FarmSankinApplication
 {
     public static void main(String[] args)

farm-sankin/src/main/java/jp/yamoto/farm/sankin/web/controller/AuthController.java

@@ -1,6 +1,5 @@
 package jp.yamoto.farm.sankin.web.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jp.yamoto.farm.common.biz.domain.vo.UserInfoVo;
 import jp.yamoto.farm.common.core.domain.AjaxResult;
 import jp.yamoto.farm.common.core.domain.entity.FarmerUserInfo;
@@ -12,10 +11,7 @@ import jp.yamoto.farm.sankin.biz.auth.domain.AuthSecondVerifyBo;
 import jp.yamoto.farm.sankin.biz.auth.domain.AuthResetPwdBo;
 import jp.yamoto.farm.sankin.biz.auth.domain.AuthSendVerifyCodeBo;
 import jp.yamoto.farm.sankin.biz.auth.service.AuthService;
-import jp.yamoto.farm.common.biz.domain.bo.MastItemQueryBo;
-import jp.yamoto.farm.common.biz.service.IMastItemService;
 import lombok.RequiredArgsConstructor;
-import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -33,9 +29,6 @@ public class AuthController
     @Autowired
     private AuthService authService;
 
-    @Autowired
-    private IMastItemService mastItemService;
-
     /**
      * ログイン方法
      *
@@ -52,20 +45,6 @@ public class AuthController
     }
 
     /**
-     * 分页查询用户
-     * @param page 参数集
-     * @param queryBo 查询参数列表
-     * @return 用户集合
-     */
-    @GetMapping("/item/page")
-    public AjaxResult getUserPage(@ParameterObject Page page, @ParameterObject MastItemQueryBo queryBo) {
-
-        mastItemService.getById("1");
-
-        return AjaxResult.success(mastItemService.getListPage(page, queryBo));
-    }
-
-    /**
      * 二次認証
      */
     @PostMapping("/loginByCode")

farm-sankin/src/main/resources/application.yml

@@ -165,21 +165,3 @@ mybatis:
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # グローバルなプロファイルのロード
   configLocation: classpath:mybatis/mybatis-config.xml
-
-# mybatis-plus config
-mybatis-plus:
-  # 指定されたパッケージ別名の検索
-  type-aliases-package: jp.yamoto.farm.**.domain
-  mapper-locations: classpath*:/mapper/**/*.xml # mapper xml file
-  global-config:
-    banner: false # is print mybatis-plus banner
-    db-config:
-      id-type: auto
-      where-strategy: not_empty
-      insert-strategy: not_empty
-      update-strategy: not_null
-  type-handlers-package: jp.yamoto.farm.common.mybatis.handler # package
-  configuration:
-    jdbc-type-for-null: 'null'
-    call-setters-on-nulls: true
-    shrink-whitespaces-in-sql: true

farm-sankin/src/main/resources/i18n/messages.properties

@@ -60,6 +60,7 @@ E0059=\u8A72\u5F53\u691C\u5B9A\u7A2E\u985E\u306F\u65E2\u306B\u7D10\u4ED8\u3051\u
 E0060=\u8A8D\u8A3C\u9805\u76EE\u30DE\u30B9\u30BF\u306B\u304A\u3051\u308B\u8A8D\u8A3C\u9805\u76EE\u306E\u500B\u6570\u304C\u5909\u66F4\u3055\u308C\u305F\u305F\u3081\u3001<br>\u7D10\u4ED8\u3051\u3092\u884C\u3046\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
 E0061=\u6B8B\u5FF5\u306A\u304C\u3089\u3001\u30A2\u30AF\u30BB\u30B9IP\u306F\u30B7\u30B9\u30C6\u30E0\u30D6\u30E9\u30C3\u30AF\u30EA\u30B9\u30C8\u306B\u767B\u9332\u3055\u308C\u3066\u3044\u307E\u3059.
 E0062=\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u30E6\u30FC\u30B6\u30FC\uFF1A{0}\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
+E0063=\u8A8D\u8A3C\u30B3\u30FC\u30C9\u304C\u7121\u52B9\u3067\u3059\u3002
 
 EM001=\u6587\u5B57\u6570\u306F1\uFF5E64\u3067\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 EM002=\u4E26\u3073\u9806\u306F1\uFF5E10\u3067\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
@@ -75,6 +76,7 @@ I0004=\u53D6\u8FBC\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
 I0008=\u30ED\u30B0\u30A4\u30F3\u3057\u307E\u3057\u305F\u3002
 I0009=\u30ED\u30B0\u30A2\u30A6\u30C8\u3057\u307E\u3057\u305F\u3002
 I0010=\u8A8D\u8A3C\u30B3\u30FC\u30C9\u3092\u9001\u4FE1\u3057\u307E\u3057\u305F\u3002
+I0011=\u4E8C\u6B21\u8A8D\u8A3C\u306B\u6210\u529F\u3057\u307E\u3057\u305F\u3002
 
 label.nokaMei=\u8FB2\u5BB6\u540D
 label.nokaMeiKn=\u8FB2\u5BB6\u540D\uFF08\u30AB\u30CA\uFF09
@@ -116,4 +118,4 @@ label.authenticateError=\u8A8D\u8A3C\u30A8\u30E9\u30FC
 label.newAdd=\u65B0\u898F\u767B\u9332
 label.edit=\u7DE8\u96C6
 label.verifyCode=\u8A8D\u8A3C\u30B3\u30FC\u30C9
-label.tempToken=\u4E00\u6642\u7684\u30C8\u30FC\u30AF\u30F3
+label.tempToken=\u4E00\u6642\u30C8\u30FC\u30AF\u30F3

pom.xml

@@ -18,7 +18,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>21</java.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-        <mybatis-plus-spring-boot3.version>3.5.8</mybatis-plus-spring-boot3.version>
+        <mybatis-spring-boot.version>3.0.4</mybatis-spring-boot.version>
         <druid.version>1.2.27</druid.version>
         <bitwalker.version>1.21</bitwalker.version>
         <swagger.version>3.0.0</swagger.version>
@@ -72,9 +72,9 @@
             </dependency>
 
             <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
-                <version>${mybatis-plus-spring-boot3.version}</version>
+                <groupId>org.mybatis.spring.boot</groupId>
+                <artifactId>mybatis-spring-boot-starter</artifactId>
+                <version>${mybatis-spring-boot.version}</version>
             </dependency>
 
             <!-- Postgresql -->