From 13b800073e9a565e4a2a8ab0daa83aab845e91ed Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Wed, 7 May 2025 18:31:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../promotion/config/HttpClientConfig.java    | 23 ++++++++++++++++++
 .../controller/user/UserInfoController.java   | 24 +++++++++++++++++++
 src/main/resources/application.yml            |  7 ++----
 3 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/greenorange/promotion/config/HttpClientConfig.java

diff --git a/src/main/java/com/greenorange/promotion/config/HttpClientConfig.java b/src/main/java/com/greenorange/promotion/config/HttpClientConfig.java
new file mode 100644
index 0000000..4d1302b
--- /dev/null
+++ b/src/main/java/com/greenorange/promotion/config/HttpClientConfig.java
@@ -0,0 +1,23 @@
+package com.greenorange.promotion.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class HttpClientConfig {
+
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate(clientHttpRequestFactory());
+    }
+
+    private ClientHttpRequestFactory clientHttpRequestFactory() {
+        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
+        factory.setConnectTimeout(500); // 设置连接超时为5秒
+        factory.setReadTimeout(50); // 设置读取超时为5秒
+        return factory;
+    }
+}
diff --git a/src/main/java/com/greenorange/promotion/controller/user/UserInfoController.java b/src/main/java/com/greenorange/promotion/controller/user/UserInfoController.java
index 0093c77..9b22238 100644
--- a/src/main/java/com/greenorange/promotion/controller/user/UserInfoController.java
+++ b/src/main/java/com/greenorange/promotion/controller/user/UserInfoController.java
@@ -172,6 +172,25 @@ public class UserInfoController {
     }
 
 
+    /**
+     * web端用户根据jwt获取用户信息
+     * @return 用户信息
+     */
+    @GetMapping("get/jwt/web")
+    @Operation(summary = "web端用户根据jwt获取用户信息", description = "参数：无，权限：管理员（boss, admin)，方法名：getWebUserInfoByJWT")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+    @SysLog(title = "用户管理", content = "web端用户根据jwt获取用户信息")
+    public BaseResponse<UserInfoVO> getWebUserInfoByJWT(HttpServletRequest request) {
+        String userAccount = (String) request.getAttribute("userAccount");
+        LambdaQueryWrapper<UserInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(UserInfo::getUserAccount, userAccount);
+        UserInfo userInfo = userInfoService.getOne(lambdaQueryWrapper);
+        UserInfoVO userInfoVO = commonService.copyProperties(userInfo, UserInfoVO.class);
+        return ResultUtils.success(userInfoVO);
+    }
+
+
+
     /**
      * 小程序端用户根据jwt获取用户信息
      * @return 用户信息
@@ -350,6 +369,11 @@ public class UserInfoController {
     @RequiresPermission(mustRole = UserConstant.BOSS_ROLE)
     @SysLog(title = "用户管理", content = "web端管理员根据id查询用户")
     public BaseResponse<UserInfoVO> queryUserInfoById(@Valid @RequestBody CommonRequest commonRequest) {
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
         Long id = commonRequest.getId();
         UserInfo userInfo = userInfoService.getById(id);
         ThrowUtils.throwIf(userInfo == null, ErrorCode.OPERATION_ERROR, "当前用户不存在");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index be5d1ab..795ce0a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,6 +10,7 @@ spring:
 
 
 
+
   data:
     redis:
       port: 6379
@@ -32,11 +33,7 @@ springdoc:
 server:
   port: 3456
 
-  servlet:
-    session:
-      timeout: 720h
-      cookie:
-        max-age: 2592000
+
 
 mybatis-plus:
   mapper-locations: classpath:mapper/*.xml