Merge remote-tracking branch 'origin/master'

# Conflicts:
#	maku-framework/src/main/resources/auth.yml

maku-framework/src/main/resources/auth.yml

@@ -8,13 +8,16 @@ auth:
     - /swagger-ui.html
     - /swagger-ui/**
     - /doc.html
+    - /
     - /maku/t_user/login
     - /maku/t_user/updateUser
     - /maku/t_user/register
     - /maku/t_user/logout
-    - /user/login
+    - /maku/t_user/info
     - /maku/t_book/list/search
     - /maku/t_book/{id}
+    - /maku/t_book/{id}
     - /user/login
     - /maku/t_shopping_trolley/aaa
 
+

maku-server/src/main/java/net/maku/maku/controller/TBookCollectionController.java

@@ -29,6 +29,11 @@ import java.util.List;
 @AllArgsConstructor
 public class TBookCollectionController {
     private final TBookCollectionService tBookCollectionService;
+    @GetMapping("/book/buy")
+    @Operation(summary = "购买书籍")
+    public Result<List<TBookCollectionVO>> getBookCollectionByUserId(@PathVariable Long id) {
+        return Result.ok(tBookCollectionService.getPhoneByUseId(id));
+    }
 
     @GetMapping("page")
     @Operation(summary = "分页")

maku-server/src/main/java/net/maku/maku/controller/TUserController.java

@@ -11,9 +11,11 @@ import net.maku.framework.common.cache.RedisCache;
 import net.maku.framework.common.utils.PageResult;
 import net.maku.framework.common.utils.Result;
 import net.maku.maku.convert.TUserConvert;
+import net.maku.maku.entity.TBookCollectionEntity;
 import net.maku.maku.entity.TUserEntity;
 import net.maku.maku.service.TUserService;
 import net.maku.maku.query.TUserQuery;
+import net.maku.maku.vo.TBookCollectionVO;
 import net.maku.maku.vo.TUserVO;
 import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.http.ResponseEntity;
@@ -26,6 +28,8 @@ import java.time.Duration;
 import java.util.List;
 import java.util.UUID;
 
+import static java.util.Collections.list;
+
 /**
 *
 *
@@ -56,7 +60,7 @@ public class TUserController {
 
     @PostMapping("/login")
     @Operation(summary = "登录")
-    public Result login(@RequestBody TUserEntity entity){
+    public Result<String> login(@RequestBody TUserEntity entity){
         TUserEntity entity1 = tUserService.login(entity);
         if(ObjectUtils.isNotNull(entity1)){
             String token = UUID.randomUUID()+"";
@@ -78,12 +82,23 @@ public class TUserController {
 
     @GetMapping("/info")
     @Operation(summary = "用户中心")
-    public Result findByUsername(HttpServletRequest request){
+    public Result<TUserEntity> findByUsername(HttpServletRequest request){
         String token = request.getHeader("token");
         TUserEntity entity = (TUserEntity) redisCache.get(token);
         return Result.ok(entity);
     }
 
+    @GetMapping("/recharge")
+    @Operation(summary = "充值")
+    public Result<String> recharge(HttpServletRequest request,@RequestParam(value = "balance",required =false) int balance){
+        String token = request.getHeader("token");
+        TUserEntity entity = (TUserEntity) redisCache.get(token);;
+        int money=entity.getBalance();
+        entity.setBalance(money+balance);
+        tUserService.updateById(entity);
+        return Result.ok();
+    }
+
 
     @PostMapping("/logout")
     @Operation(summary = "退出登录")

maku-server/src/main/java/net/maku/maku/entity/TUserEntity.java

@@ -24,7 +24,7 @@ public class TUserEntity {
 
 	private String avatar;
 
-	private BigDecimal balance;
+	private int balance;
 
 	private Integer status;
 

maku-server/src/main/java/net/maku/maku/service/TBookCollectionService.java

@@ -6,8 +6,6 @@ import net.maku.maku.vo.TBookCollectionVO;
 import net.maku.maku.query.TBookCollectionQuery;
 import net.maku.maku.entity.TBookCollectionEntity;
 
-import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,5 +24,6 @@ public interface TBookCollectionService extends BaseService<TBookCollectionEntit
 
     void delete(List<Long> idList);
 
-    void save(Integer userId, Integer bookId, Date currentTime);
+    List<TBookCollectionVO> getPhoneByUseId(Long id);
+
 }

maku-server/src/main/java/net/maku/maku/service/impl/TBookCollectionServiceImpl.java

@@ -4,21 +4,23 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import net.maku.framework.common.utils.PageResult;
 import net.maku.framework.mybatis.service.impl.BaseServiceImpl;
 import net.maku.maku.convert.TBookCollectionConvert;
 import net.maku.maku.entity.TBookCollectionEntity;
+import net.maku.maku.entity.TBookEntity;
+import net.maku.maku.entity.TUserEntity;
 import net.maku.maku.query.TBookCollectionQuery;
+import net.maku.maku.service.TUserService;
 import net.maku.maku.vo.TBookCollectionVO;
 import net.maku.maku.dao.TBookCollectionDao;
 import net.maku.maku.service.TBookCollectionService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDateTime;
-import java.util.Date;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -31,6 +33,7 @@ import java.util.List;
 @AllArgsConstructor
 public class TBookCollectionServiceImpl extends BaseServiceImpl<TBookCollectionDao, TBookCollectionEntity> implements TBookCollectionService {
 
+
     @Override
     public PageResult<TBookCollectionVO> page(TBookCollectionQuery query) {
         IPage<TBookCollectionEntity> page = baseMapper.selectPage(getPage(query), getWrapper(query));
@@ -66,19 +69,9 @@ public class TBookCollectionServiceImpl extends BaseServiceImpl<TBookCollectionD
     }
 
     @Override
-    public void save(Integer userId, Integer bookId, Date currentTime) {
-        TBookCollectionEntity entity = new TBookCollectionEntity();
-        entity.setUserId(userId);
-        entity.setBookId(bookId);
-        entity.setCreateTime(currentTime);
-        // 可以根据需要设置其它字段，例如自增id字段和lastModifiedTime字段（如果需要）
-
-        // 假设lastModifiedTime可以为空，可以根据需要设置
-
-
-        // 使用 MyBatis Plus 的 save 方法保存实体
-        this.save(entity);
-
+    public List<TBookCollectionVO> getPhoneByUseId(Long id) {
+        return List.of();
     }
 
+
 }

maku-server/src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ spring:
       database: 0
       host: localhost
       port: 6379
-#      password: 123456
+      password: 123456
       #timeout: 6000ms  # 连接超时时长（毫秒）
   datasource:
     dynamic: