From ac1ed04cb0b3fe471bf771da2a239f677193995e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 21 一月 2025 14:33:02 +0800
Subject: [PATCH] 1
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RegionController.java | 8 +++++---
ruoyi-api/ruoyi-api-company/src/main/java/com/ruoyi/company/api/model/UserDetail.java | 12 ++++++++++++
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 1 +
ruoyi-gateway/src/main/resources/bootstrap.yml | 1 +
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml | 1 +
5 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-company/src/main/java/com/ruoyi/company/api/model/UserDetail.java b/ruoyi-api/ruoyi-api-company/src/main/java/com/ruoyi/company/api/model/UserDetail.java
index 3e38675..b2bcf33 100644
--- a/ruoyi-api/ruoyi-api-company/src/main/java/com/ruoyi/company/api/model/UserDetail.java
+++ b/ruoyi-api/ruoyi-api-company/src/main/java/com/ruoyi/company/api/model/UserDetail.java
@@ -6,41 +6,53 @@
import java.time.LocalDateTime;
@Data
+@Schema(description = "用户详情")
public class UserDetail {
+ @Schema(description = "用户id")
private Long userId;
@Schema(description = "公司名称")
private String companyName;
/** 统一社会信用代码 */
+ @Schema(description = "统一社会信用代码")
private String socialCode;
/** 联系人姓名 */
+ @Schema(description = "联系人姓名")
private String contactName;
/** 联系人手机号 */
+ @Schema(description = "联系人手机号")
private String contactPhone;
/** 联系人邮箱 */
+ @Schema(description = "联系人邮箱")
private String email;
/** 账号 */
+ @Schema(description = "账号")
private String accountName;
/** 用户名称 */
+ @Schema(description = "用户名称")
private String userName;
/** 注册时间 */
+ @Schema(description = "注册时间")
private LocalDateTime registerTime;
/** 绑定手机号 */
+ @Schema(description = "绑定手机号")
private String phone;
/** 账号ID */
+ @Schema(description = "账号ID")
private Long accountId;
/** 登录密码 */
+ @Schema(description = "登录密码")
private String password;
}
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index a07dc6e..751ad71 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -151,6 +151,7 @@
appUser.setAccountName(user.getAccountName());
appUser.setPhone(user.getPhone());
appUser.setLoginTime(System.currentTimeMillis());
+ appUser.setExpireTime(appUser.getLoginTime() + CacheConstants.EXPIRATION * 60 * 1000L);
appUser.setToken(token);
// 根据uuid将loginUser缓存
diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index ed0993a..9bb360b 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -15,6 +15,7 @@
discovery:
# 服务注册地址
server-addr: 192.168.110.111:8848
+ ip: 192.168.110.111
config:
# 配置中心地址
server-addr: 192.168.110.111:8848
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RegionController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RegionController.java
index e4c7a90..8267142 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RegionController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RegionController.java
@@ -1,7 +1,9 @@
package com.ruoyi.system.controller;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.Region;
import com.ruoyi.system.service.RegionService;
+import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -18,8 +20,8 @@
private RegionService regionService;
@GetMapping("/tree")
- @Tag(name = "获取区域树")
- public List<Region> getRegionTree() {
- return regionService.getRegionTree();
+ @Operation(summary = "获取区域树")
+ public R<List<Region>> getRegionTree() {
+ return R.ok(regionService.getRegionTree());
}
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index b170917..59ba4cc 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -15,6 +15,7 @@
discovery:
# 服务注册地址
server-addr: 192.168.110.111:8848
+ ip: 192.168.110.111
config:
# 配置中心地址
server-addr: 192.168.110.111:8848
--
Gitblit v1.7.1