shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
dute7liang
2023-12-24 01:20:00 +08:00
parent c083cb9763
commit b3002937e4
6 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-admin/src/main/resources/application.yml
View File

@@ -59,6 +59,8 @@ user:
# Spring配置 # Spring配置
spring: spring:
main:
allow-circular-references: true
application: application:
name: ${ruoyi.name} name: ${ruoyi.name}
# 资源信息 # 资源信息
@@ -98,11 +100,11 @@ spring:
sa-token: sa-token:
# token名称 (同时也是cookie名称) # token名称 (同时也是cookie名称)
token-name: Authorization token-name: Authorization
# token有效期 设为一天 (必定过期) 单位: 秒 # token有效期 设为30天 (必定过期) 单位: 秒
timeout: 86400 timeout: 2592000
# 多端不同 token 有效期 可查看 LoginHelper.loginByDevice 方法自定义 # 多端不同 token 有效期 可查看 LoginHelper.loginByDevice 方法自定义
# token最低活跃时间 (指定时间无操作就过期) 单位: 秒 # token最低活跃时间 (指定时间无操作就过期) 单位: 秒 86400
active-timeout: 1800 active-timeout: 2592000
# 允许动态设置 token 有效期 # 允许动态设置 token 有效期
dynamic-active-timeout: true dynamic-active-timeout: true
# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)

7
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserStartAppController.java
View File

@@ -1,10 +1,9 @@
package com.ruoyi.cai.controller.app; package com.ruoyi.cai.controller.app;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.StarOrVisitorRes;
import com.ruoyi.cai.dto.app.query.StarQuery;
import com.ruoyi.cai.dto.app.vo.UserStarOrVisitorList; import com.ruoyi.cai.dto.app.vo.UserStarOrVisitorList;
import com.ruoyi.cai.service.CaiUserCountService;
import com.ruoyi.cai.service.CaiUserFollowService; import com.ruoyi.cai.service.CaiUserFollowService;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R; 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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@RestController("/user/star") @RestController
@RequestMapping("/api/user/star")
public class CaiUserStartAppController { public class CaiUserStartAppController {
@Autowired @Autowired

4
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserVisitorAppController.java
View File

@@ -12,9 +12,11 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@RestController("/user/visitor") @RestController
@RequestMapping("/api/user/visitor")
@Slf4j @Slf4j
public class CaiUserVisitorAppController { public class CaiUserVisitorAppController {

1
ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccount.java
View File

@@ -31,7 +31,6 @@ public class CaiAccount implements Serializable {
/** /**
* 用户ID * 用户ID
*/ */
@TableId(value = "user_id")
private Long userId; private Long userId;
/** /**
* 充值的可用余额 * 充值的可用余额

5
ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserFollow.java
View File

@@ -22,15 +22,16 @@ public class CaiUserFollow implements Serializable {
private static final long serialVersionUID=1L; private static final long serialVersionUID=1L;
@TableId(value = "id")
private Integer id;
/** /**
* 关注人ID * 关注人ID
*/ */
@TableId(value = "user_id")
private Long userId; private Long userId;
/** /**
* 被关注人ID * 被关注人ID
*/ */
@TableId(value = "follow_user")
private Long followUser; private Long followUser;
/** /**
* 状态 0 未查看 1 已查看 * 状态 0 未查看 1 已查看

19
ruoyi-cai/src/main/resources/mapper/cai/CaiUserSkillMapper.xml
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.cai.mapper.CaiUserSkillMapper">
<resultMap type="com.ruoyi.cai.domain.CaiUserSkill" id="CaiUserSkillResult">
<result property="id" column="id"/>
<result property="userId" column="user_id"/>
<result property="skillId" column="skill_id"/>
<result property="price" column="price"/>
<result property="score" column="score"/>
<result property="serviceCount" column="service_count"/>
<result property="serviceTime" column="service_time"/>
<result property="createTime" column="create_time"/>
</resultMap>
</mapper>