提交2
This commit is contained in:
parent
d0eff2fe6b
commit
467d785660
|
@ -64,7 +64,7 @@ public class SysLoginService
|
||||||
public String login(String username, String password, String code, String uuid)
|
public String login(String username, String password, String code, String uuid)
|
||||||
{
|
{
|
||||||
// 验证码校验
|
// 验证码校验
|
||||||
validateCaptcha(username, code, uuid);
|
//validateCaptcha(username, code, uuid);
|
||||||
// 登录前置校验
|
// 登录前置校验
|
||||||
loginPreCheck(username, password);
|
loginPreCheck(username, password);
|
||||||
// 用户验证
|
// 用户验证
|
||||||
|
|
|
@ -2,6 +2,8 @@ package com.ruoyi.system.controller;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import com.ruoyi.common.annotation.Anonymous;
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
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;
|
||||||
|
@ -37,7 +39,8 @@ public class DataController extends BaseController
|
||||||
/**
|
/**
|
||||||
* 查询qiangdan列表
|
* 查询qiangdan列表
|
||||||
*/
|
*/
|
||||||
@PreAuthorize("@ss.hasPermi('system:data:list')")
|
//@PreAuthorize("@ss.hasPermi('system:data:list')")
|
||||||
|
@Anonymous
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public TableDataInfo list(Data data)
|
public TableDataInfo list(Data data)
|
||||||
{
|
{
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
package com.ruoyi.system.controller;
|
||||||
|
|
||||||
|
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.http.converter.StringHttpMessageConverter;
|
||||||
|
import org.springframework.web.client.RestTemplate;
|
||||||
|
|
||||||
|
import java.nio.charset.Charset;
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
public class RestTemplateConfiguration {
|
||||||
|
//
|
||||||
|
// @Bean
|
||||||
|
// public RestTemplate restTemplate(){
|
||||||
|
// RestTemplate restTemplate = new RestTemplate();
|
||||||
|
//// 设置中文乱码问题方式一
|
||||||
|
// restTemplate.getMessageConverters().add(1,new StringHttpMessageConverter(Charset.forName("UTF-8")));
|
||||||
|
// // 设置中文乱码问题方式二
|
||||||
|
// // restTemplate.getMessageConverters().set(1,new StringHttpMessageConverter(StandardCharsets.UTF_8)); // 支持中文编码
|
||||||
|
//// return new RestTemplate();
|
||||||
|
// return restTemplate;
|
||||||
|
// }
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue