czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
GYJ
2024-08-08 10:41:35 +08:00
parent b218436a1c 3d43f5f114
commit 260d6eb7d7
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eladmin-logging/src/main/java/cn/ysk/cashier/service/impl/LogServiceImpl.java
View File

@@ -96,8 +96,7 @@ public class LogServiceImpl implements LogService {
String value = SpelUtil.generateKeyBySpEL(split[1], joinPoint); String value = SpelUtil.generateKeyBySpEL(split[1], joinPoint);
// 描述 // 描述
log.setDescription(split[0] + ":" + value); log.setDescription(split[0] + ":" + value);
} } else if (split.length == 3) {
if (split.length == 3) {
// String v1 = SpelUtil.generateKeyBySpEL(split[1], joinPoint); // String v1 = SpelUtil.generateKeyBySpEL(split[1], joinPoint);
String v2 = SpelUtil.generateKeyBySpEL(split[2], joinPoint); String v2 = SpelUtil.generateKeyBySpEL(split[2], joinPoint);
if (methodName.contains("createOutAndONOperate")) { if (methodName.contains("createOutAndONOperate")) {

4
eladmin-tools/src/main/java/cn/ysk/cashier/rest/QiniuController.java
View File

@@ -77,7 +77,7 @@ public class QiniuController {
return new ResponseEntity<>(qiNiuService.queryAll(criteria,pageable),HttpStatus.OK); return new ResponseEntity<>(qiNiuService.queryAll(criteria,pageable),HttpStatus.OK);
} }
@Log("上传文件") // @Log("上传文件")
@ApiOperation("上传文件") @ApiOperation("上传文件")
@AnonymousPostMapping @AnonymousPostMapping
public ResponseEntity<Object> uploadQiNiu(@RequestParam MultipartFile file){ public ResponseEntity<Object> uploadQiNiu(@RequestParam MultipartFile file){
@@ -90,7 +90,7 @@ public class QiniuController {
} }
@Log("上传文件") // @Log("上传文件")
@ApiOperation("上传文件") @ApiOperation("上传文件")
@PostMapping(value = "updloadFile") @PostMapping(value = "updloadFile")
public ResponseEntity<Object> updloadFile(@RequestParam MultipartFile file){ public ResponseEntity<Object> updloadFile(@RequestParam MultipartFile file){