puzhibing
2025-06-15 0e31bc6ea2f9e9ce9e3f8d8529e0f59ed0b22ed7
合并代码
5个文件已修改
36 ■■■■■ 已修改文件
ManagementQYTTravel/guns-admin/pom.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/SpringSessionConfig.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/src/main/resources/application.yml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ManagementQYTTravel/guns-admin/pom.xml
@@ -25,7 +25,11 @@
            <groupId>com.stylefeng</groupId>
            <artifactId>guns-generator</artifactId>
        </dependency>
        <!--设置共享session-->
        <dependency>
            <groupId>org.springframework.session</groupId>
            <artifactId>spring-session-data-redis</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-redis</artifactId>
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/SpringSessionConfig.java
@@ -1,6 +1,8 @@
package com.stylefeng.guns.config;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Configuration;
import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
/**
 * spring session配置
@@ -8,7 +10,8 @@
 * @author fengshuonan
 * @date 2017-07-13 21:05
 */
//@EnableRedisHttpSession(maxInactiveIntervalInSeconds = 1800)  //session过期时间  如果部署多机环境,需要打开注释
@Configuration
@EnableRedisHttpSession(maxInactiveIntervalInSeconds = 172800)  //session过期时间  如果部署多机环境,需要打开注释
@ConditionalOnProperty(prefix = "guns", name = "spring-session-open", havingValue = "true")
public class SpringSessionConfig {
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
@@ -10,9 +10,9 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.DateUtil;
import com.stylefeng.guns.modular.system.util.RedisUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PostMapping;
@@ -47,7 +47,7 @@
    private ITTaxiCardService taxiCardService;
    @Autowired
    private RedisUtil redisUtil;
    private RedisTemplate redisTemplate;
    @Autowired
    private IUserService userService;
@@ -149,7 +149,7 @@
        for(TDriver driver : tDrivers){
            keys += "DRIVER" + driver.getId() + ",";
        }
        String value = redisUtil.getValues(keys.substring(0, keys.length() - 1));
        String value = (String)redisTemplate.opsForValue().get(keys.substring(0, keys.length() - 1));
        JSONArray jsonArray = JSON.parseArray(value);
        int size = driverOnlineService.queryOnlineDriverCount(null, null);
        map1.put("netcardriver", size);  //在线司机
@@ -405,7 +405,7 @@
        List<Object> list = new ArrayList<>();
        for(TDriver tDriver : tDrivers){
            Map<String, Object> d = new HashMap<>();
            String value = redisUtil.getValue("DRIVER" + tDriver.getId());
            String value = (String)redisTemplate.opsForValue().get("DRIVER" + tDriver.getId());
            if(ToolUtil.isEmpty(value)){
                continue;
            }
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
@@ -90,12 +90,7 @@
    @RequestMapping(value = "/", method = RequestMethod.GET)
    public String index(Model model, HttpServletRequest request) throws UnsupportedEncodingException {
        //session中解析用户数据
        //设置共享session
        HttpSession session = (HttpSession) redisTemplate.opsForValue().get(request.getSession().getId());
        if (null != session) {
            session = request.getSession();
            redisTemplate.opsForValue().set(request.getSession().getId(), session, 2, TimeUnit.DAYS);
        }
        HttpSession session = request.getSession();
        String onconParam = edu.yale.its.tp.cas.client.Util.getOnconParam(session);
        onconParam = new String(Base64.decodeBase64(onconParam), "UTF-8");
        LoginUser loginUser = JSON.parseObject(onconParam, LoginUser.class);
@@ -105,6 +100,7 @@
        User user = userMapper.getByAccount(loginUser.getImUser());
        if (null == user) {
            logOut();
            return null;
        }
        ShiroUser shiroUser = shiro.shiroUser(user);
        List<Integer> roleList = shiroUser.getRoleList();
ManagementQYTTravel/guns-admin/src/main/resources/application.yml
@@ -4,12 +4,14 @@
guns:
  swagger-open: true              #是否开启swagger (true/false)
  kaptcha-open: false             #是否开启登录时验证码 (true/false)
  spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
  spring-session-open: true      #是否开启spring session,如果是多机环境需要开启(true/false)
  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效,多机环境在SpringSessionConfig类中配置) 单位:秒
  session-validation-interval: 900  #多久检测一次失效的session(只在单机环境下生效) 单位:秒
  file-upload-path: C:\Users\hi\Desktop\ #文件上传目录(不配置的话为java.io.tmpdir目录)
  picture-server-address: http://192.168.0.43/resources/  #图片服务器地址
  rest-url: http://139.9.249.67:8080/rest/    #前端接口调用基础路径
spring:
  profiles:
    active: dev
@@ -28,9 +30,9 @@
      max-request-size: 500MB
      max-file-size: 500MB
  redis:
    url: 127.0.0.1
    port: 6379
    password: 123456
    host: 127.0.0.1
    port: 6379
mybatis-plus:
  type-aliases-package: com.stylefeng.guns.modular.system.model
@@ -40,7 +42,6 @@
  configuration:
    configuration.map-underscore-to-camel-case: true #是否开启自动驼峰命名规则(camel case)映射
    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #输出Sql,如需打印Sql注释该配置
---
spring: