二次认证邮件模版修改

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

@@ -79,7 +79,6 @@ public class SysConfig extends BaseEntity
     }
 
     @NotBlank(message = "パラメータキー値を空にすることはできません")
-    @Size(min = 0, max = 500, message = "パラメータキーの長さは500文字以内")
     public String getConfigValue()
     {
         return configValue;

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

@@ -78,6 +78,7 @@ public class AuthService {
         // 認証コードを送信する
         BssUserAuthCodeMailBo bssUserAuthCodeMailBo = new BssUserAuthCodeMailBo();
         bssUserAuthCodeMailBo.setUserId(userDetails.getFarmerId());
+        bssUserAuthCodeMailBo.setUserName(userDetails.getFarmerName());
         bssUserAuthCodeMailBo.setMailAddress(userDetails.getMailAddress());
         bssUserAuthCodeMailBo.setType(BssUserCertificationType.FRAMER);
         bssUserAuthCodeMailBo.setPgId(SankinPgIdEnum.N001.getCode());
@@ -160,6 +161,7 @@ public class AuthService {
         // 認証コードを送信する
         BssUserAuthCodeMailBo bssUserAuthCodeMailBo = new BssUserAuthCodeMailBo();
         bssUserAuthCodeMailBo.setUserId(user.getFarmerId());
+        bssUserAuthCodeMailBo.setUserName(user.getFarmerName());
         bssUserAuthCodeMailBo.setMailAddress(user.getMailAddress());
         bssUserAuthCodeMailBo.setType(BssUserCertificationType.FRAMER);
         bssUserAuthCodeMailBo.setPgId(SankinPgIdEnum.N002.getCode());
@@ -186,6 +188,7 @@ public class AuthService {
         // 認証コードを再送信する
         BssUserAuthCodeMailBo bssUserAuthCodeMailBo = new BssUserAuthCodeMailBo();
         bssUserAuthCodeMailBo.setUserId(userDetails.getFarmerId());
+        bssUserAuthCodeMailBo.setUserName(userDetails.getFarmerName());
         bssUserAuthCodeMailBo.setMailAddress(userDetails.getMailAddress());
         bssUserAuthCodeMailBo.setType(BssUserCertificationType.FRAMER);
         bssUserAuthCodeMailBo.setPgId(SankinPgIdEnum.N003.getCode());

farm-sankin-biz/src/main/java/jp/yamoto/farm/sankin/biz/domain/bo/BssUserAuthCodeMailBo.java

@@ -17,6 +17,11 @@ public class BssUserAuthCodeMailBo {
     private String userId;
 
     /**
+     * ユーザー
+     */
+    private String userName;
+
+    /**
      * メールアドレス
      */
     private String mailAddress;

farm-sankin-biz/src/main/java/jp/yamoto/farm/sankin/biz/service/impl/BssUserCertificationServiceImpl.java

@@ -96,6 +96,8 @@ public class BssUserCertificationServiceImpl implements IBssUserCertificationSer
         bssUserCertificationEntity.setCertificationCode(this.generateCode());
         bssUserCertificationEntity.setDiscontinuedFlg(DelFlgEnum.OFF.getCode());
 
+        // 分間有効
+        int minutes = ConvertUtils.toInt(sysConfigService.selectConfigByKey(FarmConstants.SANKIN_AUTH_CODE_EXPIRE_MINUTES), 10);
         // 開始時間
         long startTime = System.currentTimeMillis();
         // 有効終了時間
@@ -108,8 +110,9 @@ public class BssUserCertificationServiceImpl implements IBssUserCertificationSer
 
         // Email 送信
         String mailInfo =StringUtils.format(sysConfigService.selectConfigByKey(FarmConstants.SANKIN_AUTH_CODE_LOGIN_EMAIL_CONTENT)
+                , params.getUserName()
                 , bssUserCertificationEntity.getCertificationCode()
-                , bssUserCertificationEntity.getEndTime());
+                , minutes);
         String mailTitle = sysConfigService.selectConfigByKey(FarmConstants.SANKIN_AUTH_CODE_LOGIN_EMAIL_TITLE);
         String mailAddress = DecryptUtils.decryptAES(params.getMailAddress());