diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/GiftController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/GiftController.java index 0dfb7c7a..45f281d2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/GiftController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/GiftController.java @@ -43,7 +43,7 @@ public class GiftController extends BaseController { @GetMapping("/list") public TableDataInfo list(Gift bo, PageQuery pageQuery) { Page page = giftService.page(pageQuery.build(), - Wrappers.lambdaQuery(bo).orderByAsc(Gift::getPrice)); + Wrappers.lambdaQuery(bo).orderByAsc(Gift::getSort)); return TableDataInfo.build(page); } diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 4b53ceae..77de05be 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -95,9 +95,9 @@ redisson: mail: enabled: false agora: - app-id: 58ff3a37d91d48c7a8ef7a56fb8f62d0 - key: 0cca1a53262c4c74b0a8c653a9b7540e - secret: 4a4f734285f34aea86cef63b2a186f27 + app-id: 74356fa58b3f4c0a8d0e61a7ebf7eb45 + key: db072546267c4077ae4c5921905d36df + secret: df67ecc59f8645b890e2448377e4d1ba yunxin: app-key: f81cdf7dd5a1cd76ddb7bf1513bd0380 app-secret: cb17e285f56b diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index d480e3d3..b441f0fe 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -93,12 +93,12 @@ redisson: mail: enabled: false agora: - app-id: 58ff3a37d91d48c7a8ef7a56fb8f62d0 - key: 0cca1a53262c4c74b0a8c653a9b7540e - secret: 4a4f734285f34aea86cef63b2a186f27 + app-id: 74356fa58b3f4c0a8d0e61a7ebf7eb45 + key: db072546267c4077ae4c5921905d36df + secret: df67ecc59f8645b890e2448377e4d1ba yunxin: - app-key: 0aaefeb8a80a9889987c5346244b58e21234 - app-secret: 470345ca28321234 + app-key: f81cdf7dd5a1cd76ddb7bf1513bd0380 + app-secret: cb17e285f56b cai: enable-api-encryption: true open-pay-proxy: false diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 727176bf..29a57790 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -243,8 +243,8 @@ lock4j: cai: enable-api-encryption: true websocket: false - coin-name: 黄钻 - home-name: 恋香 + coin-name: 花钻 + home-name: 花语 --- # Actuator 监控端点的配置项 management: endpoints: diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java index e06dba64..69267ccc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java @@ -25,6 +25,7 @@ import com.ruoyi.system.domain.vo.SysOssVo; import com.ruoyi.system.mapper.SysOssMapper; import com.ruoyi.system.service.ISysOssService; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.cache.annotation.Cacheable; import org.springframework.http.MediaType; import org.springframework.stereotype.Service; @@ -47,6 +48,7 @@ import java.util.stream.Collectors; */ @RequiredArgsConstructor @Service +@Slf4j public class SysOssServiceImpl implements ISysOssService, OssService { private final SysOssMapper baseMapper;