diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index ee8666b..4ddee14 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -9,7 +9,7 @@ 4.0.0 jar - ruoyi-admin + xgt-admin web服务入口 diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 4dc5979..6351f55 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -148,9 +148,9 @@ mail: # 是否需要用户名密码验证 auth: true # 发送方,遵循RFC-822标准 - from: xgt778899@163.com + from: admin@163.com # 用户名(注意:如果使用foxmail邮箱,此处user为qq号) - user: xgt778899@163.com + user: admin@163.com # 密码(注意,某些邮箱需要为SMTP服务单独设置密码,详情查看相关帮助) pass: LGj5ingctYT2SNJS # 使用 STARTTLS安全连接,STARTTLS是对纯文本通信协议的扩展。 diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 6ab3956..4cea4bc 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -148,9 +148,9 @@ mail: # 是否需要用户名密码验证 auth: true # 发送方,遵循RFC-822标准 - from: xgt778899@163.com + from: admin@163.com # 用户名(注意:如果使用foxmail邮箱,此处user为qq号) - user: xgt778899@163.com + user: admin@163.com # 密码(注意,某些邮箱需要为SMTP服务单独设置密码,详情查看相关帮助) pass: LGj5ingctYT2SNJS # 使用 STARTTLS安全连接,STARTTLS是对纯文本通信协议的扩展。 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPictureServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPictureServiceImpl.java index f768edc..ca20c97 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPictureServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPictureServiceImpl.java @@ -99,7 +99,7 @@ public class SysPictureServiceImpl implements ISysPictureService { lqw.in(bo.getFlags() != null, SysPicture::getFlag, Arrays.asList(bo.getFlags().split(","))); lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, SysPicture::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); - lqw.orderByDesc(SysPicture::getSort, SysPicture::getCreateTime); + lqw.orderByDesc(SysPicture::getCreateTime, SysPicture::getSort); return lqw; }