shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1231123

Browse Source
This commit is contained in:
77
2024-07-12 22:52:36 +08:00
parent 8c8a4a268d
commit e86e61cd7b
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/GiftController.java
View File

@@ -43,7 +43,7 @@ public class GiftController extends BaseController {
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<Gift> list(Gift bo, PageQuery pageQuery) { public TableDataInfo<Gift> list(Gift bo, PageQuery pageQuery) {
Page<Gift> page = giftService.page(pageQuery.build(), Page<Gift> page = giftService.page(pageQuery.build(),
Wrappers.lambdaQuery(bo).orderByAsc(Gift::getPrice)); Wrappers.lambdaQuery(bo).orderByAsc(Gift::getSort));
return TableDataInfo.build(page); return TableDataInfo.build(page);
} }

6
ruoyi-admin/src/main/resources/application-dev.yml
View File

@@ -95,9 +95,9 @@ redisson:
mail: mail:
enabled: false enabled: false
agora: agora:
app-id: 58ff3a37d91d48c7a8ef7a56fb8f62d0 app-id: 74356fa58b3f4c0a8d0e61a7ebf7eb45
key: 0cca1a53262c4c74b0a8c653a9b7540e key: db072546267c4077ae4c5921905d36df
secret: 4a4f734285f34aea86cef63b2a186f27 secret: df67ecc59f8645b890e2448377e4d1ba
yunxin: yunxin:
app-key: f81cdf7dd5a1cd76ddb7bf1513bd0380 app-key: f81cdf7dd5a1cd76ddb7bf1513bd0380
app-secret: cb17e285f56b app-secret: cb17e285f56b

10
ruoyi-admin/src/main/resources/application-prod.yml
View File

@@ -93,12 +93,12 @@ redisson:
mail: mail:
enabled: false enabled: false
agora: agora:
app-id: 58ff3a37d91d48c7a8ef7a56fb8f62d0 app-id: 74356fa58b3f4c0a8d0e61a7ebf7eb45
key: 0cca1a53262c4c74b0a8c653a9b7540e key: db072546267c4077ae4c5921905d36df
secret: 4a4f734285f34aea86cef63b2a186f27 secret: df67ecc59f8645b890e2448377e4d1ba
yunxin: yunxin:
app-key: 0aaefeb8a80a9889987c5346244b58e21234 app-key: f81cdf7dd5a1cd76ddb7bf1513bd0380
app-secret: 470345ca28321234 app-secret: cb17e285f56b
cai: cai:
enable-api-encryption: true enable-api-encryption: true
open-pay-proxy: false open-pay-proxy: false

4
ruoyi-admin/src/main/resources/application.yml
View File

@@ -243,8 +243,8 @@ lock4j:
cai: cai:
enable-api-encryption: true enable-api-encryption: true
websocket: false websocket: false
coin-name: 黄钻 coin-name: 花钻
home-name: 恋香 home-name: 花语
--- # Actuator 监控端点的配置项 --- # Actuator 监控端点的配置项
management: management:
endpoints: endpoints:

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java
View File

@@ -25,6 +25,7 @@ import com.ruoyi.system.domain.vo.SysOssVo;
import com.ruoyi.system.mapper.SysOssMapper; import com.ruoyi.system.mapper.SysOssMapper;
import com.ruoyi.system.service.ISysOssService; import com.ruoyi.system.service.ISysOssService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.annotation.Cacheable;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -47,6 +48,7 @@ import java.util.stream.Collectors;
*/ */
@RequiredArgsConstructor @RequiredArgsConstructor
@Service @Service
@Slf4j
public class SysOssServiceImpl implements ISysOssService, OssService { public class SysOssServiceImpl implements ISysOssService, OssService {
private final SysOssMapper baseMapper; private final SysOssMapper baseMapper;