From b3002937e43b6a0ae03e88c23c000c4914bcb012 Mon Sep 17 00:00:00 2001 From: dute7liang <383200134@qq.com> Date: Sun, 24 Dec 2023 01:20:00 +0800 Subject: [PATCH] init --- .../src/main/resources/application.yml | 10 ++++++---- .../app/CaiUserStartAppController.java | 7 ++++--- .../app/CaiUserVisitorAppController.java | 4 +++- .../java/com/ruoyi/cai/domain/CaiAccount.java | 1 - .../com/ruoyi/cai/domain/CaiUserFollow.java | 5 +++-- .../mapper/cai/CaiUserSkillMapper.xml | 19 ------------------- 6 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 ruoyi-cai/src/main/resources/mapper/cai/CaiUserSkillMapper.xml diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 77a9ea2c..c5187288 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -59,6 +59,8 @@ user: # Spring配置 spring: + main: + allow-circular-references: true application: name: ${ruoyi.name} # 资源信息 @@ -98,11 +100,11 @@ spring: sa-token: # token名称 (同时也是cookie名称) token-name: Authorization - # token有效期 设为一天 (必定过期) 单位: 秒 - timeout: 86400 + # token有效期 设为30天 (必定过期) 单位: 秒 + timeout: 2592000 # 多端不同 token 有效期 可查看 LoginHelper.loginByDevice 方法自定义 - # token最低活跃时间 (指定时间无操作就过期) 单位: 秒 - active-timeout: 1800 + # token最低活跃时间 (指定时间无操作就过期) 单位: 秒 86400 + active-timeout: 2592000 # 允许动态设置 token 有效期 dynamic-active-timeout: true # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserStartAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserStartAppController.java index 285a9229..34f3e447 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserStartAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserStartAppController.java @@ -1,10 +1,9 @@ package com.ruoyi.cai.controller.app; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.dto.app.query.StarQuery; import com.ruoyi.cai.dto.app.query.StarOrVisitorRes; +import com.ruoyi.cai.dto.app.query.StarQuery; import com.ruoyi.cai.dto.app.vo.UserStarOrVisitorList; -import com.ruoyi.cai.service.CaiUserCountService; import com.ruoyi.cai.service.CaiUserFollowService; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; @@ -12,9 +11,11 @@ import com.ruoyi.common.core.page.TableDataInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@RestController("/user/star") +@RestController +@RequestMapping("/api/user/star") public class CaiUserStartAppController { @Autowired diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserVisitorAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserVisitorAppController.java index 72874ecb..41ccb26d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserVisitorAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserVisitorAppController.java @@ -12,9 +12,11 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@RestController("/user/visitor") +@RestController +@RequestMapping("/api/user/visitor") @Slf4j public class CaiUserVisitorAppController { diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccount.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccount.java index 976bd80d..5dd36956 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccount.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccount.java @@ -31,7 +31,6 @@ public class CaiAccount implements Serializable { /** * 用户ID */ - @TableId(value = "user_id") private Long userId; /** * 充值的可用余额 diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserFollow.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserFollow.java index 3e817851..d8b02451 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserFollow.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserFollow.java @@ -22,15 +22,16 @@ public class CaiUserFollow implements Serializable { private static final long serialVersionUID=1L; + @TableId(value = "id") + private Integer id; + /** * 关注人ID */ - @TableId(value = "user_id") private Long userId; /** * 被关注人ID */ - @TableId(value = "follow_user") private Long followUser; /** * 状态 0 未查看 1 已查看 diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserSkillMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserSkillMapper.xml deleted file mode 100644 index 43d3c39d..00000000 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserSkillMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - -