diff --git a/cash-api/account-server/src/main/java/com/czg/controller/CommonController.java b/cash-api/account-server/src/main/java/com/czg/controller/CommonController.java index 2bbed504..2d3a4360 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/CommonController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/CommonController.java @@ -2,11 +2,16 @@ package com.czg.controller; import com.czg.account.service.CommonService; import com.czg.resp.CzgResult; +import com.czg.service.account.util.AliOssUtil; import jakarta.annotation.Resource; +import org.apache.commons.io.FilenameUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; /** * 公共接口 @@ -17,6 +22,8 @@ import org.springframework.web.bind.annotation.RestController; public class CommonController { @Resource private CommonService commonService; + @Resource + private AliOssUtil aliOssUtil; /** * 发送验证码 @@ -27,4 +34,14 @@ public class CommonController { public CzgResult sendSms(@RequestParam String type) { return CzgResult.success(commonService.sendSms(type)); } + + /** + * 文件上传 + * @param file 文件对象 + * @return 文件地址 + */ + @PostMapping("/upload") + public CzgResult upload(@RequestParam MultipartFile file) throws Exception { + return CzgResult.success(aliOssUtil.uploadSuffix(file.getBytes(), FilenameUtils.getExtension(file.getOriginalFilename()))); + } } diff --git a/cash-dependencies/pom.xml b/cash-dependencies/pom.xml index e4997375..aa120a79 100644 --- a/cash-dependencies/pom.xml +++ b/cash-dependencies/pom.xml @@ -34,6 +34,7 @@ 3.3.3 4.40.54.ALL 2.0.24 + 2.8.3 @@ -44,6 +45,13 @@ ${project.version} + + + com.aliyun.oss + aliyun-sdk-oss + ${aliyun.oss.version} + + com.aliyun diff --git a/cash-service/account-service/pom.xml b/cash-service/account-service/pom.xml index 356fd59a..69b920ce 100644 --- a/cash-service/account-service/pom.xml +++ b/cash-service/account-service/pom.xml @@ -38,6 +38,11 @@ + + com.aliyun.oss + aliyun-sdk-oss + + diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java index 31f869de..29af7951 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java @@ -6,10 +6,8 @@ import com.czg.account.dto.staff.ShopStaffAddDTO; import com.czg.account.dto.staff.ShopStaffEditDTO; import com.czg.account.dto.staff.ShopStaffRemoveDTO; import com.czg.account.entity.ShopStaff; -import com.czg.account.entity.SysRole; import com.czg.account.entity.SysUser; import com.czg.account.service.ShopStaffService; -import com.czg.account.service.SysRoleService; import com.czg.account.service.SysUserService; import com.czg.account.service.SysUsersRolesService; import com.czg.exception.ApiNotPrintException; @@ -33,8 +31,6 @@ public class ShopStaffServiceImpl extends ServiceImpl select c.* from sys_users_roles as a - left join sys_roles_menus as b on a.role_id = b.role_id - left join sys_menu as c on c.menu_id = b.menu_id + left join sys_roles_menus as b on a.role_id = b.role_id + left join sys_menu as c on c.menu_id = b.menu_id where a.user_id = #{userId} and c.type=#{type}