[fix]修改各个模块的结构,启动项目

This commit is contained in:
王庆祥 2025-06-03 18:38:14 +08:00
parent fe3e8cbb9f
commit 13453dfd3b
15 changed files with 56 additions and 249 deletions

View File

@ -3,6 +3,7 @@ package org.dromara;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
import org.springframework.context.annotation.ComponentScan;
/**
* 启动程序
@ -11,6 +12,7 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
*/
@SpringBootApplication
@ComponentScan(basePackages = {"org.dromara", "com.wzj.soopin"})
public class DromaraApplication {
public static void main(String[] args) {

View File

@ -1,34 +0,0 @@
package com.wzj.soopin.content.config;
import com.wzj.soopin.content.utils.MinIOUtils;
import lombok.Data;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
@Data
public class MinIOConfig {
@Value("${minio.endpoint}")
private String endpoint;
@Value("${minio.fileHost}")
private String fileHost;
@Value("${minio.bucketName}")
private String bucketName;
@Value("${minio.accessKey}")
private String accessKey;
@Value("${minio.secretKey}")
private String secretKey;
@Value("${minio.imgSize}")
private Integer imgSize;
@Value("${minio.fileSize}")
private Integer fileSize;
@Bean
public MinIOUtils creatMinioClient() {
return new MinIOUtils(endpoint, bucketName, accessKey, secretKey, imgSize, fileSize);
}
}

View File

@ -1,55 +0,0 @@
package com.wzj.soopin.content.config;
import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RedissonClient;
import org.redisson.spring.data.connection.RedissonConnectionFactory;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.data.redis.serializer.StringRedisSerializer;
@Slf4j
@Configuration
@ConditionalOnClass(RedissonClient.class)
public class RedisConfig {
private static final RedisSerializer<String> STRING_SERIALIZER = new StringRedisSerializer();
@Bean
RedissonConnectionFactory redisConnectionFactory(RedissonClient redisson) {
log.info("------------->>>配置自定义RedissonConnectionFactory");
return new RedissonConnectionFactory(redisson);
}
@Bean
RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
log.info("------------->>>配置自定义RedisTemplate");
return buildRedisTemplate(redisConnectionFactory);
}
/**
* 配置redisTemplate
*
* @param redisConnectionFactory
* @return
*/
private RedisTemplate<String, Object> buildRedisTemplate(RedisConnectionFactory redisConnectionFactory) {
// 配置redisTemplate
RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
redisTemplate.setConnectionFactory(redisConnectionFactory);
// key序列化
redisTemplate.setKeySerializer(STRING_SERIALIZER);
// value序列化
redisTemplate.setValueSerializer(STRING_SERIALIZER);
// Hash key序列化
redisTemplate.setHashKeySerializer(STRING_SERIALIZER);
// Hash value序列化
redisTemplate.setHashValueSerializer(STRING_SERIALIZER);
// 初始化RedisTemplate
redisTemplate.afterPropertiesSet();
return redisTemplate;
}
}

View File

@ -1,11 +1,8 @@
package com.wzj.soopin.content.controller;
import com.wzj.soopin.content.config.MinIOConfig;
import com.wzj.soopin.content.result.GraceJSONResult;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
@ -20,8 +17,6 @@ import java.io.OutputStream;
@RestController
public class FileController {
@Autowired
private MinIOConfig minIOConfig;
@PostMapping("upload")
public GraceJSONResult upload(MultipartFile file) throws Exception {

View File

@ -1,7 +1,6 @@
package com.wzj.soopin.content.controller;
import com.wzj.soopin.content.config.MinIOConfig;
import com.wzj.soopin.content.domain.base.BaseInfoProperties;
import com.wzj.soopin.content.domain.bo.UpdatedUserBO;
import com.wzj.soopin.content.domain.po.Users;
@ -90,8 +89,6 @@ public class UserInfoController extends BaseInfoProperties {
return GraceJSONResult.ok(newUserInfo);
}
@Autowired
private MinIOConfig minIOConfig;
@PostMapping("modifyImage")
public GraceJSONResult modifyImage(@RequestParam String userId,
@ -104,26 +101,26 @@ public class UserInfoController extends BaseInfoProperties {
String fileName = file.getOriginalFilename();
MinIOUtils.uploadFile(minIOConfig.getBucketName(),
fileName,
file.getInputStream());
String imgUrl = minIOConfig.getFileHost()
+ "/"
+ minIOConfig.getBucketName()
+ "/"
+ fileName;
// MinIOUtils.uploadFile(minIOConfig.getBucketName(),
// fileName,
// file.getInputStream());
//
// String imgUrl = minIOConfig.getFileHost()
// + "/"
// + minIOConfig.getBucketName()
// + "/"
// + fileName;
// 修改图片地址到数据库
UpdatedUserBO updatedUserBO = new UpdatedUserBO();
updatedUserBO.setId(userId);
if (type == FileTypeEnum.BGIMG.type) {
updatedUserBO.setBgImg(imgUrl);
} else {
updatedUserBO.setFace(imgUrl);
}
// if (type == FileTypeEnum.BGIMG.type) {
// updatedUserBO.setBgImg(imgUrl);
// } else {
// updatedUserBO.setFace(imgUrl);
// }
Users users = userService.updateUserInfo(updatedUserBO);
return GraceJSONResult.ok(users);

View File

@ -2,7 +2,6 @@ package com.wzj.soopin.content.controller;
import com.wzj.soopin.content.config.MinIOConfig;
import com.wzj.soopin.content.domain.base.BaseInfoProperties;
import com.wzj.soopin.content.domain.bo.VlogBO;
import com.wzj.soopin.content.enums.YesOrNo;
@ -31,8 +30,6 @@ public class VlogController extends BaseInfoProperties {
private VlogService vlogService;
@Autowired
private QcCloud qcCloud;
@Autowired
private MinIOConfig minIOConfig;
@PostMapping("vodCallBack")
public GraceJSONResult vodCallBack(@RequestBody Map<String, Object> callbackData) {
@ -277,8 +274,7 @@ public class VlogController extends BaseInfoProperties {
return GraceJSONResult.ok(gridResult);
}
@Value(("${nacos.counts}"))
private Integer nacosConuts;
private Integer nacosConuts=0;
@PostMapping("like")

View File

@ -9,6 +9,7 @@ import com.wzj.soopin.content.domain.base.BaseInfoProperties;
import com.wzj.soopin.content.domain.bo.UpdatedUserBO;
import com.wzj.soopin.content.domain.exceptions.GraceException;
import com.wzj.soopin.content.domain.mo.Token;
import com.wzj.soopin.content.domain.po.Fans;
import com.wzj.soopin.content.domain.po.UserMember;
import com.wzj.soopin.content.domain.po.Users;
import com.wzj.soopin.content.domain.result.ResponseStatusEnum;
@ -53,11 +54,6 @@ public class UserServiceImpl extends BaseInfoProperties implements UserService {
private UsersMapper usersMapper;
@Autowired
private FansMapperCustom fansMapperCustom;
@Autowired
private FansService fansService;
// @Resource
// private PasswordEncoder passwordEncoder;
@Autowired
private UserMemberMapper userMemberMapper;
@ -307,9 +303,14 @@ public class UserServiceImpl extends BaseInfoProperties implements UserService {
BeanUtils.copyProperties(u, userVO);
// 查询当前用户是否关注了该用户
boolean doIFollowVloger = fansService.queryDoIFollowVloger(currentUserId, u.getId());
userVO.setFollowed(doIFollowVloger);
LambdaQueryWrapper<Fans> fansWrapper = new LambdaQueryWrapper<>();
fansWrapper.eq(Fans::getVlogerId, u.getId())
.eq(Fans::getFanId, currentUserId);
Fans fans= fansMapper.selectOne(fansWrapper);
if(fans!=null) {
userVO.setFollowed(true);
}
return userVO;
}).collect(Collectors.toList());

View File

@ -31,10 +31,8 @@ public final class RestTemplateUtil {
private static RestTemplate TEMPLATE_IGNORE_SSL;
@Resource(name = "restTemplate")
private RestTemplate restTemplate;
@Resource(name = "restTemplateIgnoreSSL")
private RestTemplate restTemplateIgnoreSSL;
private RestTemplateUtil() {

View File

@ -13,8 +13,6 @@ import org.springframework.stereotype.Component;
*/
@Component
@Data
@PropertySource("classpath:tencentcloud.properties")
@ConfigurationProperties(prefix = "tencent.cloud")
public class TencentCloudProperties {
private String secretId;

View File

@ -2,9 +2,11 @@ package com.wzj.soopin.member.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.wzj.soopin.member.domain.po.MemberAccount;
import com.wzj.soopin.member.domain.bo.MemberAccountQuery;
import com.wzj.soopin.member.mapper.MemberAccountMapper;
import com.wzj.soopin.member.service.IMemberAccountService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -18,9 +20,7 @@ import java.time.LocalDateTime;
* @author zcc
*/
@Service
public class MemberAccountServiceImpl {
@Autowired
private MemberAccountMapper memberAccountMapper;
public class MemberAccountServiceImpl extends ServiceImpl<MemberAccountMapper,MemberAccount> implements IMemberAccountService {
/**
* 查询会员账户表
@ -29,7 +29,7 @@ public class MemberAccountServiceImpl {
* @return 会员账户表
*/
public MemberAccount selectByMemberId(Long memberId) {
return memberAccountMapper.selectById(memberId);
return baseMapper.selectById(memberId);
}
/**
@ -50,37 +50,9 @@ public class MemberAccountServiceImpl {
if (totalIntegralBalance != null) {
qw.eq("total_integral_balance", totalIntegralBalance);
}
return memberAccountMapper.selectPage(page,qw);
return baseMapper.selectPage(page,qw);
}
/**
* 新增会员账户表
*
* @param memberAccount 会员账户表
* @return 结果
*/
public int insert(MemberAccount memberAccount) {
memberAccount.setCreateTime(LocalDateTime.now());
return memberAccountMapper.insert(memberAccount);
}
/**
* 修改会员账户表
*
* @param memberAccount 会员账户表
* @return 结果
*/
public int update(MemberAccount memberAccount) {
return memberAccountMapper.updateById(memberAccount);
}
/**
* 删除会员账户表信息
*
* @param memberId 会员账户表主键
* @return 结果
*/
public int deleteByMemberId(Long memberId) {
return memberAccountMapper.deleteById(memberId);
}
}

View File

@ -3,10 +3,12 @@ package com.wzj.soopin.member.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.wzj.soopin.member.convert.MemberAddressConvert;
import com.wzj.soopin.member.domain.po.MemberAddress;
import com.wzj.soopin.member.domain.bo.MemberAddressBO;
import com.wzj.soopin.member.mapper.MemberAddressMapper;
import com.wzj.soopin.member.service.IMemberAddressService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@ -21,23 +23,10 @@ import java.util.List;
* @author zcc
*/
@Service
public class MemberAddressServiceImpl {
@Autowired
private MemberAddressMapper memberAddressMapper;
public class MemberAddressServiceImpl extends ServiceImpl<MemberAddressMapper, MemberAddress> implements IMemberAddressService {
@Autowired
private MemberAddressConvert memberAddressConvert;
@Value("${aes.key}")
private String aesKey;
/**
* 查询会员收货地址
*
* @param id 会员收货地址主键
* @return 会员收货地址
*/
public MemberAddress selectById(Long id) {
return memberAddressMapper.selectById(id);
}
/**
* 查询会员收货地址列表
@ -77,55 +66,24 @@ public class MemberAddressServiceImpl {
if (!StringUtils.isEmpty(detailAddress)) {
qw.like("detail_address", detailAddress);
}
return memberAddressMapper.selectPage(page,qw);
return baseMapper.selectPage(page,qw);
}
/**
* 新增会员收货地址
*
* @param memberAddress 会员收货地址
* @return 结果
*/
public int insert(MemberAddress memberAddress) {
memberAddress.setCreateTime(LocalDateTime.now());
return memberAddressMapper.insert(memberAddress);
}
/**
* 修改会员收货地址
*
* @param memberAddress 会员收货地址
* @return 结果
*/
public int update(MemberAddress memberAddress) {
return memberAddressMapper.updateById(memberAddress);
}
/**
* 删除会员收货地址信息
*
* @param id 会员收货地址主键
* @return 结果
*/
public int deleteById(Long id) {
return memberAddressMapper.deleteById(id);
}
public Integer deleteUserIds(List<Long> ids) {
LambdaQueryWrapper<MemberAddress> qw = new LambdaQueryWrapper<>();
// qw.eq(MemberAddress::getMemberId, SecurityUtils.getUserId());
qw.in(MemberAddress::getId, ids);
return memberAddressMapper.delete(qw);
return baseMapper.delete(qw);
}
public MemberAddress selectByUserAndId(Long id) {
LambdaQueryWrapper<MemberAddress> qw = new LambdaQueryWrapper<>();
// qw.eq(MemberAddress::getMemberId, SecurityUtils.getUserId());
qw.eq(MemberAddress::getId, id);
return memberAddressMapper.selectOne(qw);
return baseMapper.selectOne(qw);
}
public int updateSelective(MemberAddress address) {
return memberAddressMapper.updateByPrimaryKeySelective(address);
}
}

View File

@ -3,6 +3,7 @@ package com.wzj.soopin.member.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.wzj.soopin.member.convert.MemberCartConvert;
import com.wzj.soopin.member.domain.form.UpdateMemberCartForm;
import com.wzj.soopin.member.domain.po.MemberCart;
@ -10,6 +11,7 @@ import com.wzj.soopin.member.domain.bo.MemberCartBO;
import com.wzj.soopin.member.domain.vo.MemberCartVO;
import com.wzj.soopin.member.mapper.MemberCartMapper;
import com.wzj.soopin.member.mapper.MemberMapper;
import com.wzj.soopin.member.service.IMemberCartService;
import org.dromara.common.core.exception.base.BaseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@ -27,9 +29,7 @@ import java.util.stream.Collectors;
* @author zcc
*/
@Service
public class MemberCartServiceImpl {
@Autowired
private MemberCartMapper memberCartMapper;
public class MemberCartServiceImpl extends ServiceImpl<MemberCartMapper, MemberCart> implements IMemberCartService {
// @Autowired
// private SkuMapper skuMapper;
@Autowired
@ -38,18 +38,8 @@ public class MemberCartServiceImpl {
// private ProductMapper productMapper;
@Autowired
private MemberCartConvert memberCartConvert;
@Value("${aes.key}")
private String aesKey;
/**
* 查询购物车
*
* @param id 购物车主键
* @return 购物车
*/
public MemberCart selectById(Long id) {
return memberCartMapper.selectById(id);
}
/**
* 查询购物车列表
@ -63,7 +53,7 @@ public class MemberCartServiceImpl {
// if (!StrUtil.isEmpty(query.getPhone())){
// query.setPhone(AesCryptoUtils.encrypt(aesKey, query.getPhone()));
// }
List<MemberCartVO> memberCartList = memberCartMapper.selectByPage(query);
List<MemberCartVO> memberCartList = baseMapper.selectByPage(query);
// long total = ((com.github.pagehelper.Page)memberCartList).getTotal();
// if (CollectionUtil.isEmpty(memberCartList)){
// return new PageImpl<>(Collections.EMPTY_LIST, page, total);
@ -102,17 +92,17 @@ public class MemberCartServiceImpl {
// queryWrapper.eq("member_id",member.getId());
queryWrapper.eq("sku_id",memberCart.getSkuId());
queryWrapper.eq("product_id",memberCart.getProductId());
List<MemberCart> memberCarts = memberCartMapper.selectList(queryWrapper);
List<MemberCart> memberCarts = baseMapper.selectList(queryWrapper);
if (CollectionUtils.isEmpty(memberCarts)) {
memberCart.setStatus(1);
memberCart.setCreateTime(LocalDateTime.now());
// memberCart.setCreateBy(member.getId());
return memberCartMapper.insert(memberCart);
return baseMapper.insert(memberCart);
}
MemberCart dbCart = memberCarts.get(0);
dbCart.setUpdateTime(LocalDateTime.now());
dbCart.setQuantity(dbCart.getQuantity() + memberCart.getQuantity());
return memberCartMapper.updateById(dbCart);
return baseMapper.updateById(dbCart);
}
/**
@ -122,14 +112,14 @@ public class MemberCartServiceImpl {
* @return 结果
*/
public int update(MemberCart memberCart) {
MemberCart cart = memberCartMapper.selectById(memberCart.getId());
MemberCart cart = baseMapper.selectById(memberCart.getId());
if (cart == null){
return 0;
}
cart.setQuantity(memberCart.getQuantity());
cart.setUpdateTime(LocalDateTime.now());
// cart.setUpdateBy(SecurityUtil.getLocalMember().getId());
return memberCartMapper.updateById(cart);
return baseMapper.updateById(cart);
}
public int update(UpdateMemberCartForm form) {
if (form.getNum() == null || form.getId() == null) {
@ -144,18 +134,9 @@ public class MemberCartServiceImpl {
// }
MemberCart e = new MemberCart();
e.setQuantity(form.getNum());
return memberCartMapper.update(e, qw);
return baseMapper.update(e, qw);
}
/**
* 删除购物车信息
*
* @param id 购物车主键
* @return 结果
*/
public int deleteById(Long id) {
return memberCartMapper.deleteById(id);
}
/**
* 删除购物车信息
@ -165,7 +146,7 @@ public class MemberCartServiceImpl {
*/
public int deleteByIds(String ids) {
List<Long> idList = Arrays.stream(ids.split(",")).map(it -> Long.parseLong(it)).collect(Collectors.toList());
return memberCartMapper.deleteBatchIds(idList);
return baseMapper.deleteBatchIds(idList);
}
public Integer mineCartNum() {
@ -174,7 +155,7 @@ public class MemberCartServiceImpl {
// qw.eq("member_id", userId);
qw.eq("status", 1);
qw.select("count(quantity) quantity");
MemberCart c = memberCartMapper.selectOne(qw);
MemberCart c = baseMapper.selectOne(qw);
if (c == null) {
return 0;
}

View File

@ -29,8 +29,7 @@ public class MemberLoginRecordServiceImpl extends ServiceImpl<MemberLogininforMa
@Autowired
private MemberMapper memberMapper;
@Value("${aes.key}")
private String aesKey;

View File

@ -27,8 +27,7 @@ import java.time.LocalDateTime;
public class MemberServiceImpl extends ServiceImpl<MemberMapper,Member> implements IMemberService {
@Autowired
private MemberMapper memberMapper;
@Value("${aes.key}")
private String aesKey;
@Autowired
private MemberCartMapper memberCartMapper;

View File

@ -74,8 +74,7 @@ public class OrderService {
private MemberCartMapper memberCartMapper;
@Autowired
private MemberMapper memberMapper;
@Value("${aes.key}")
private String aesKey;
@Autowired
private OrderDeliveryHistoryMapper orderDeliveryHistoryMapper;
@Autowired
@ -153,7 +152,7 @@ public class OrderService {
// PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
}
if (!StringUtils.isEmpty(query.getUserPhone())){
query.setUserPhone(AesCryptoUtils.encrypt(aesKey, query.getUserPhone()));
// query.setUserPhone(AesCryptoUtils.encrypt(aesKey, query.getUserPhone()));
}
List<ManagerOrderVO> managerOrderVOList = orderMapper.selectManagerOrderPage(query);
if (CollectionUtil.isEmpty(managerOrderVOList)){
@ -375,7 +374,8 @@ public class OrderService {
Order order = orderMapper.selectById(orderId);
String receiverPhoneEncrypted = order.getReceiverPhoneEncrypted();
if(receiverPhoneEncrypted!=null){
return AesCryptoUtils.decrypt(aesKey,receiverPhoneEncrypted);
// return AesCryptoUtils.decrypt(aesKey,receiverPhoneEncrypted);
return null;
}else {
return null;
}
@ -393,7 +393,7 @@ public class OrderService {
.set("receiver_district",order.getReceiverDistrict())
.set("receiver_province",order.getReceiverProvince())
.set("receiver_detail_address",order.getReceiverDetailAddress())
.set("receiver_phone_encrypted", AesCryptoUtils.encrypt(aesKey, order.getReceiverPhone()))
// .set("receiver_phone_encrypted", AesCryptoUtils.encrypt(aesKey, order.getReceiverPhone()))
.set("update_time",LocalDateTime.now());
updateWrapper.eq("id",order.getId());
int update = orderMapper.update(null, updateWrapper);