验证码

2022-06-16 09:24:27 +08:00
parent 2de946adb8
commit c9ee01dd1f
14 changed files with 598 additions and 108 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@ -29,4 +29,5 @@ public class RuoYiApplication
                " |  |  \\    /  \\      /           \n" +
                " ''-'   `'-'    `-..-'              ");
    }
+
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@ -12,9 +12,11 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginBody;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.framework.web.service.SysLoginService;
 import com.ruoyi.framework.web.service.SysPermissionService;
+import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.system.service.ISysMenuService;

 /**
@ -34,6 +36,9 @@ public class SysLoginController
    @Autowired
    private SysPermissionService permissionService;

+    @Autowired
+    private TokenService tokenService;
+
    /**
     * 登录方法
     * 
@ -45,8 +50,7 @@ public class SysLoginController
    {
        AjaxResult ajax = AjaxResult.success();
        // 生成令牌
-        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
-                loginBody.getUuid());
+        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode());
        ajax.put(Constants.TOKEN, token);
        return ajax;
    }
@ -59,7 +63,8 @@ public class SysLoginController
    @GetMapping("getInfo")
    public AjaxResult getInfo()
    {
-        SysUser user = SecurityUtils.getLoginUser().getUser();
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
        // 角色集合
        Set<String> roles = permissionService.getRolePermission(user);
        // 权限集合
@ -79,8 +84,10 @@ public class SysLoginController
    @GetMapping("getRouters")
    public AjaxResult getRouters()
    {
-        Long userId = SecurityUtils.getUserId();
-        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        // 用户信息
+        SysUser user = loginUser.getUser();
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId());
        return AjaxResult.success(menuService.buildMenus(menus));
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java
@ -1,10 +1,14 @@
 package com.ruoyi.web.controller.yada;

+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.file.WeatherUtils;
 import com.ruoyi.system.domain_yada.*;
 import com.ruoyi.system.service_yada.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jdk.jfr.Frequency;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
@ -16,14 +20,20 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
+import springfox.documentation.spring.web.json.Json;

 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.net.http.HttpRequest;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;

@RestController
@RequestMapping(value = "/Special")
@ -55,7 +65,25 @@ public class SpecialController {
        return IntoRegion(value);
    }

-    /**
+    @RequestMapping(value = "/helpWeatherClass",method = {RequestMethod.GET})
+    public  AjaxResult helpWeatherClass(String city,String type)
+    {
+        String url="https://restapi.amap.com/v3/weather/weatherInfo";
+        Map<String,String> map=new HashMap<>();
+        map.put("key","37087f0a3007dc67d37859553cd02d33");
+        map.put("city",city);
+        if (type!=null){ map.put("extensions",type);}
+        map.put("output","json");
+        String value= WeatherUtils.httpRequest(url,map);
+        WeatherUtilsVO vo = JSON.parseObject(value,WeatherUtilsVO.class);
+//        String value2=vo.getForecasts().substring(1,vo.getForecasts().length()-1);
+//        System.out.println(value2);
+//        vo.setForecast(JSON.parseObject(value2,ForecastVo.class));
+//        JSONObject userJson=JSONObject.parseObject(value);
+//        WeatherUtilsVO utilsValue= JSON.toJavaObject(userJson,WeatherUtilsVO.class);
+
+        return AjaxResult.success(vo);
+    }    /**
     * 森林覆盖率模板导入
     */
    @RequestMapping(value = "/helpExcelAorest")
--- a/ruoyi-admin/src/main/resources/META-INF/com.anji.captcha.service.CaptchaCacheService
+++ b/ruoyi-admin/src/main/resources/META-INF/com.anji.captcha.service.CaptchaCacheService
@ -0,0 +1 @@
+com.ruoyi.framework.web.service.CaptchaRedisService
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@ -3,9 +3,9 @@ ruoyi:
  # 名称
  name: RuoYi
  # 版本
-  version: 3.8.2
+  version: 3.4.0
  # 版权年份
-  copyrightYear: 2022
+  copyrightYear: 2021
  # 实例演示开关
  demoEnabled: true
  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
@ -25,13 +25,10 @@ server:
  tomcat:
    # tomcat的URI编码
    uri-encoding: UTF-8
-    # 连接数满后的排队数，默认为100
-    accept-count: 1000
-    threads:
-      # tomcat最大线程数，默认为200
-      max: 800
-      # Tomcat启动初始化的线程数，默认值10
-      min-spare: 100
+    # tomcat最大线程数，默认为200
+    max-threads: 800
+    # Tomcat启动初始化的线程数，默认值25
+    min-spare-threads: 30

 # 日志配置
 logging:
@ -41,22 +38,19 @@ logging:

 # Spring配置
 spring:
-#  config:
-#    activate:
-#      on-profile: druid
-  profiles:
-    active: druid
  # 资源信息
  messages:
    # 国际化资源文件路径
    basename: i18n/messages
+  profiles:
+    active: druid
  # 文件上传
  servlet:
-     multipart:
-       # 单个文件大小
-       max-file-size:  10MB
-       # 设置总上传的文件大小
-       max-request-size:  20MB
+    multipart:
+      # 单个文件大小
+      max-file-size:  10MB
+      # 设置总上传的文件大小
+      max-request-size:  20MB
  # 服务模块
  devtools:
    restart:
@ -69,9 +63,9 @@ spring:
    # 端口，默认为6379
    port: 6379
    # 数据库索引
-    database: 3
+    database: 0
    # 密码
-    password: sdust2020
+    password:
    # 连接超时时间
    timeout: 10s
    lettuce:
@ -87,44 +81,28 @@ spring:

 # token配置
 token:
-    # 令牌自定义标识
-    header: Authorization
-    # 令牌密钥
-    secret: abcdefghijklmnopqrstuvwxyz
-    # 令牌有效期（默认30分钟）
-    expireTime: 300
-  
+  # 令牌自定义标识
+  header: Authorization
+  # 令牌密钥
+  secret: abcdefghijklmnopqrstuvwxyz
+  # 令牌有效期（默认30分钟）
+  expireTime: 30
+
 # MyBatis配置
 mybatis:
-    # 搜索指定包别名
-    typeAliasesPackage: com.ruoyi.**.domain,com.ruoyi.**.domain_yada
-    # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath*:mapper_yada/*Mapper.xml
-    # 加载全局的配置文件
-    configLocation: classpath:mybatis/mybatis-config.xml
-
-## 滑块验证码
-#aj:
-#  captcha:
-#    # 缓存类型
-#    cache-type: redis
-#    # blockPuzzle 滑块 clickWord 文字点选  default默认两者都实例化
-#    type: blockPuzzle
-#    # 右下角显示字
-#    water-mark: ruoyi.vip
-#    # 校验滑动拼图允许误差偏移量(默认5像素)
-#    slip-offset: 5
-#    # aes加密坐标开启或者禁用(true|false)
-#    aes-status: true
-#    # 滑动干扰项(0/1/2)
-#    interference-options: 2
-
+  # 搜索指定包别名
+  typeAliasesPackage: com.ruoyi.**.domain
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 加载全局的配置文件
+  configLocation: classpath:mybatis/mybatis-config.xml

 # PageHelper分页插件
-pagehelper: 
+pagehelper:
  helperDialect: mysql
+  reasonable: true
  supportMethodsArguments: true
-  params: count=countSql 
+  params: count=countSql

 # Swagger配置
 swagger:
@ -133,12 +111,26 @@ swagger:
  # 请求前缀
  pathMapping: /dev-api

+# 滑块验证码
+aj:
+  captcha:
+    cache-type: redis
+    # blockPuzzle 滑块 clickWord 文字点选  default默认两者都实例化
+    type: blockPuzzle
+    # 右下角显示字
+    water-mark: ruoyi.vip
+    # 校验滑动拼图允许误差偏移量(默认5像素)
+    slip-offset: 5
+    # aes加密坐标开启或者禁用(true|false)
+    aes-status: true
+    # 滑动干扰项(0/1/2)
+    interference-options: 2

 # 防止XSS攻击
 xss:
  # 过滤开关
  enabled: true
  # 排除链接（多个用逗号分隔）
-  excludes: /system/notice
+  excludes: /system/notice/*
  # 匹配链接
  urlPatterns: /system/*,/monitor/*,/tool/*
				`@ -0,0 +1 @@`
				`com.ruoyi.framework.web.service.CaptchaRedisService`