ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -553,7 +553,6 @@ SysUser one = userService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, user.getPhonenumber()).eq(SysUser::getDelFlag, "0") .eq(SysUser::getStatus, "0").eq(SysUser::getRoleType, 2).eq(SysUser::getAppUserId, user.getAppUserId())); if(null == one){ user.setObjectId(null); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); userService.save(user); //添加用户角色数据 ruoyi-service/ruoyi-account/pom.xml
@@ -125,6 +125,13 @@ <groupId>com.github.pagehelper</groupId> <artifactId>pagehelper-spring-boot-starter</artifactId> </dependency> <!-- oos对象存储 --> <dependency> <groupId>com.aliyun.oss</groupId> <artifactId>aliyun-sdk-oss</artifactId> <version>3.8.0</version> </dependency> </dependencies> <build> ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -16,6 +16,7 @@ import com.ruoyi.account.api.model.*; import com.ruoyi.account.dto.DangerInfoDto; import com.ruoyi.account.service.*; import com.ruoyi.account.util.OssUploadUtil; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.bean.BeanUtils; import com.ruoyi.common.core.web.domain.AjaxResult; @@ -34,6 +35,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.io.IOException; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; @@ -45,6 +47,7 @@ import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.page.TableDataInfo; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; /** * <p> @@ -692,6 +695,10 @@ BigDecimal add = commissionDate.getNormalCommission().add(commissionDate.getGoldCommission()).add(commissionDate.getDiamondCommission()).add(commissionDate.getAgentCommission()) .add(commissionDate.getSuperAgentCommission()).add(commissionDate.getTopAgentCommission()).add(commissionDate.getPartnerCommission()); commissionDate.setTotalCommission(add); // commissionDate.setServiceChargeCommission(); // commissionDate.setAssociatedUserCommission(); // commissionDate.setBindLowerLevelStoresCommission(); return commissionDate; }) .collect(Collectors.toList()); @@ -700,8 +707,22 @@ return R.ok(commissionDetail); } /** * 上传图片 * @param file * @return */ @PostMapping("/upload") public String upload(MultipartFile file){ String s = null; try { s = OssUploadUtil.ossUpload(file); } catch (IOException e) { throw new RuntimeException(e); } return s; } }
@@ -97,7 +97,8 @@ @Resource private UserPointService userPointService; @Autowired @Resource private AppUserMapper appUserMapper; @Resource ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/OssUploadUtil.java
New file @@ -0,0 +1,56 @@ package com.ruoyi.account.util; import com.aliyun.oss.OSSClient; import com.aliyun.oss.model.ObjectMetadata; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.io.InputStream; import java.util.UUID; public class OssUploadUtil { //OSS图片访问域名 public static String oss_domain = "http://qijishenghuiyuan.obs.cn-southwest-2.myhuaweicloud.com/"; public static String accessKeyId = "F95RSIZQ1B77MGRTPWSU"; public static String accessKeySecret = "rMhmXnuDGPwI5ptq0jGCZ6QwaoUDQ5ZJm3RFrZuy"; public static String bucketName="qijishenghuiyuan"; public static String endpoint = "obs.cn-southwest-2.myhuaweicloud.com"; public static OSSClient ossClient = new OSSClient(endpoint, accessKeyId,accessKeySecret); public static String ossUpload(HttpServletRequest request, MultipartFile file) throws IOException{ String fileName = ""; if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){ InputStream content = file.getInputStream();//获得指定文件的输入流 ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata meta.setContentLength(file.getSize()); // 必须设置ContentLength String originalFilename = file.getOriginalFilename(); fileName = UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length()); ossClient.putObject(bucketName,"img/"+fileName,content,meta);// 上传Object. if(fileName != null && !"".equals(fileName)){ System.out.println(fileName); fileName = oss_domain+"img/"+fileName; } } return fileName; } public static String ossUpload(MultipartFile file) throws IOException{ //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile; String fileName = ""; if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){ InputStream content = file.getInputStream();//获得指定文件的输入流 ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata meta.setContentLength(file.getSize()); // 必须设置ContentLength String originalFilename = file.getOriginalFilename(); fileName = UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length()); ossClient.putObject(bucketName,"img/"+fileName,content,meta);// 上传Object. if(fileName != null && !"".equals(fileName)){ System.out.println(fileName); fileName = oss_domain+"img/"+fileName; } } return fileName; } } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionDate.java
@@ -50,4 +50,19 @@ * 用户分佣总金额 */ private BigDecimal totalCommission; /** * 门店服务费分佣 */ private BigDecimal serviceChargeCommission; /** * 关联用户分佣 */ private BigDecimal associatedUserCommission; /** * 关联用户分佣 */ private BigDecimal bindLowerLevelStoresCommission; } ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionDetail.java
@@ -72,4 +72,5 @@ private BigDecimal totalPartnerCommission; private List<CommissionDate> commissionDateList; }
