1.举报日期优化

2.短信模版更换

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -128,7 +128,7 @@ public class CaptchaController {
         }
 
         //2.发送验证码
-        SendSms.sendMsg("重庆爱时空次元科技", "SMS_474620142", phoneNumber, String.valueOf(code));
+        SendSms.sendMsg("次元时代", "SMS_491395317", phoneNumber, String.valueOf(code));
         //3.存入redis
 
         redisCache.setCacheObject(verifyKey, code, 120, TimeUnit.MINUTES);

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -182,6 +182,7 @@ public class SysUser extends BaseEntity {
      * 封禁时间
      */
     @Excel(name = "封禁时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date reportTime;
 
     public SysUser() {

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityArticleController.java

@@ -217,7 +217,7 @@ public class CommunityArticleController extends BaseController {
             boolean isWaterMark = communityArticle.isWaterMark();
             boolean isFillWater = communityArticle.isFillWater();
             log.info("isWaterMark:{},isFillWater:{},Images:{}", isWaterMark, isFillWater, communityArticle.getImages());
-            if (isWaterMark && null != communityArticle.getImages()) {
+            if (isWaterMark && null != communityArticle.getImages() && !communityArticle.getImages().isEmpty()) {
                 for (CommunityImagesVo image : communityArticle.getImages()) {
                     if (null == image) {
                         throw new RuntimeException("图片上传失败!");

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityReportController.java

@@ -199,7 +199,7 @@ public class CommunityReportController {
             Date reportTime = sysUser.getReportTime();
             Date date = DateUtils.parseDate(DateUtils.getTime());
             if (reportTime != null && reportTime.after(date)) {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-dd-MM HH:mm:ss");  // 修改日期格式
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");  // 修改日期格式
                 String formattedReportTime = sdf.format(reportTime); // 格式化日期
                 if ("1".equals(userState)) {
                     return AjaxResult.success("该用户已经被封号! 截止日期为：" + formattedReportTime);