Skip to content

T
TDLCloud
Commit 8e19bce4 authored by zhuangzhuang's avatar zhuangzhuang
Browse files
Options

3.5--登录拦截器,增加获取用户名的接口,修改传值为空的判断

parent 3b887955
Hide whitespace changes
Inline Side-by-side
Showing with 5131 additions and 19385 deletions
logback.log
View file @ 8e19bce4
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/java/com/example/tdl/config/MyWebMvcConfigurer.java 0 → 100644
View file @ 8e19bce4
package com.example.tdl.config;
import com.example.tdl.interceptor.LoginInterceptor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
@Configuration
public class MyWebMvcConfigurer extends WebMvcConfigurerAdapter {
@Bean
public LoginInterceptor loginInterceptor(){
return new LoginInterceptor();
}
@Override
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(loginInterceptor())
.excludePathPatterns("/login/**");
super.addInterceptors(registry);
}
}
src/main/java/com/example/tdl/domain/vo/UserNameVo.java 0 → 100644
View file @ 8e19bce4
package com.example.tdl.domain.vo;
public class UserNameVo {
private String UserName;
public UserNameVo() {
}
public UserNameVo(String userName) {
UserName = userName;
}
public String getUserName() {
return UserName;
}
public void setUserName(String userName) {
UserName = userName;
}
}
src/main/java/com/example/tdl/interceptor/LoginInterceptor.java 0 → 100644
View file @ 8e19bce4
package com.example.tdl.interceptor;
import com.example.tdl.service.TokenRedisService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
public class LoginInterceptor implements HandlerInterceptor {
private static Logger logger = LoggerFactory.getLogger(LoginInterceptor.class);
@Autowired
private TokenRedisService redisService;
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
String url = request.getRequestURI();
if(url.contains("swagger") || url.contains("/v2/api-docs")){
return true;
}
String token = request.getHeader("Account_token");
if(token == null){
response.setContentType("application/json");
response.setStatus(401);
response.setHeader("Content-type", "text/html;charset=UTF-8");
OutputStream ps = response.getOutputStream();
ps.write("{\"code\":0,\"message\":\"用户未登录，请先登录\"}".getBytes("UTF-8"));
return false;
}
String data = redisService.get("TOKEN_" +token);
if(data == null){
response.setContentType("application/json");
response.setStatus(401);
response.setHeader("Content-type", "text/html;charset=UTF-8");
OutputStream ps = response.getOutputStream();
ps.write("{\"code\":0,\"message\":\"用户登录过期，请重新登录\"}".getBytes("UTF-8"));
return false;
}
redisService.expire("TOKEN_" +token,60 * 30);
return true;
}
@Override
public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
}
@Override
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
}
}
\ No newline at end of file
src/main/java/com/example/tdl/web/AlarmController.java
View file @ 8e19bce4
...@@ -112,70 +112,64 @@ public class AlarmController { ...@@ -112,70 +112,64 @@ public class AlarmController {
public Object addAlarm(@RequestBody AddAlarmVo addAlarmVo,HttpServletRequest request){ public Object addAlarm(@RequestBody AddAlarmVo addAlarmVo,HttpServletRequest request){
String token = request.getHeader("Account_token"); String token = request.getHeader("Account_token");
String datum = tokenRedisService.get("TOKEN_" +token); String datum = tokenRedisService.get("TOKEN_" +token);
if(datum == null){ if (StringUtils.isEmpty(addAlarmVo.getAlarmType())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("您没有登录，请先登录"); fb.setMessage("预警类型不能为空");
return gson.toJson(fb); return gson.toJson(fb);
}else{ }
if (StringUtils.isEmpty(addAlarmVo.getAlarmType())){ if (StringUtils.isEmpty(addAlarmVo.getAlarmScene())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("预警类型不能为空"); fb.setMessage("预警场景不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }else if (!addAlarmVo.getAlarmScene().equals("仓库")&&!addAlarmVo.getAlarmScene().equals("运输")){
if (StringUtils.isEmpty(addAlarmVo.getAlarmScene())){ fb.setCode(0);
fb.setCode(0); fb.setMessage("请选择正确的预警场景");
fb.setMessage("预警场景不能为空");
return gson.toJson(fb);
}else if (!addAlarmVo.getAlarmScene().equals("仓库")&&!addAlarmVo.getAlarmScene().equals("运输")){
fb.setCode(0);
fb.setMessage("请选择正确的预警场景");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addAlarmVo.getTemMax()+"")){
fb.setCode(0);
fb.setMessage("温度上限不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addAlarmVo.getTemMin()+"")){
fb.setCode(0);
fb.setMessage("温度下限不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addAlarmVo.getHumidityMax()+"")){
fb.setCode(0);
fb.setMessage("湿度上限不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addAlarmVo.getHumidityMin()+"")){
fb.setCode(0);
fb.setMessage("湿度下限不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addAlarmVo.getTilt()+"")){
fb.setCode(0);
fb.setMessage("倾斜度不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addAlarmVo.getShock()+"")){
fb.setCode(0);
fb.setMessage("震度不能为空");
return gson.toJson(fb);
}
if (alarmService.getByTypeAndScene(addAlarmVo.getAlarmType(),addAlarmVo.getAlarmScene())!=null){
fb.setCode(0);
fb.setMessage("添加的预警类型在该场景中已存在");
return gson.toJson(fb);
}
int a=alarmService.addAlarm(addAlarmVo);
if (a>0){
fb.setCode(1);
fb.setMessage("添加预警信息成功");
}else{
fb.setCode(0);
fb.setMessage("添加预警信息失败");
}
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addAlarmVo.getTemMax()+"")){
fb.setCode(0);
fb.setMessage("温度上限不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addAlarmVo.getTemMin()+"")){
fb.setCode(0);
fb.setMessage("温度下限不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addAlarmVo.getHumidityMax()+"")){
fb.setCode(0);
fb.setMessage("湿度上限不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addAlarmVo.getHumidityMin()+"")){
fb.setCode(0);
fb.setMessage("湿度下限不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addAlarmVo.getTilt()+"")){
fb.setCode(0);
fb.setMessage("倾斜度不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addAlarmVo.getShock()+"")){
fb.setCode(0);
fb.setMessage("震度不能为空");
return gson.toJson(fb);
}
if (alarmService.getByTypeAndScene(addAlarmVo.getAlarmType(),addAlarmVo.getAlarmScene())!=null){
fb.setCode(0);
fb.setMessage("添加的预警类型在该场景中已存在");
return gson.toJson(fb);
}
int a=alarmService.addAlarm(addAlarmVo);
if (a>0){
fb.setCode(1);
fb.setMessage("添加预警信息成功");
}else{
fb.setCode(0);
fb.setMessage("添加预警信息失败");
}
return gson.toJson(fb);
} }
//修改预警信息 //修改预警信息
...@@ -195,87 +189,80 @@ public class AlarmController { ...@@ -195,87 +189,80 @@ public class AlarmController {
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"), @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
}) })
@RequestMapping(value="/updateAlarm",method = RequestMethod.POST) @RequestMapping(value="/updateAlarm",method = RequestMethod.POST)
public Object updateAlarm(@RequestBody UpdateAlarmVo updateAlarmVo,HttpServletRequest request){ public Object updateAlarm(@RequestBody UpdateAlarmVo updateAlarmVo){
String token = request.getHeader("Account_token"); if (StringUtils.isEmpty(updateAlarmVo.getOldAlarmType())){
String datum = tokenRedisService.get("TOKEN_" +token);
if(datum == null){
fb.setCode(0); fb.setCode(0);
fb.setMessage("您没有登录，请先登录"); fb.setMessage("需要修改的预警类型不能为空");
return gson.toJson(fb); return gson.toJson(fb);
}else{ }
if (StringUtils.isEmpty(updateAlarmVo.getOldAlarmType())){ if (StringUtils.isEmpty(updateAlarmVo.getOldAlarmScene())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("需要修改的预警类型不能为空"); fb.setMessage("需要修改的预警场景不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }else if (!updateAlarmVo.getOldAlarmScene().equals("仓库")&&!updateAlarmVo.getOldAlarmScene().equals("运输")){
if (StringUtils.isEmpty(updateAlarmVo.getOldAlarmScene())){ fb.setCode(0);
fb.setCode(0); fb.setMessage("请输入正确的需要修改预警场景");
fb.setMessage("需要修改的预警场景不能为空");
return gson.toJson(fb);
}else if (!updateAlarmVo.getOldAlarmScene().equals("仓库")&&!updateAlarmVo.getOldAlarmScene().equals("运输")){
fb.setCode(0);
fb.setMessage("请输入正确的需要修改预警场景");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateAlarmVo.getAlarmType())){
fb.setCode(0);
fb.setMessage("预警类型不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateAlarmVo.getAlarmScene())){
fb.setCode(0);
fb.setMessage("预警场景不能为空");
return gson.toJson(fb);
}else if (!updateAlarmVo.getAlarmScene().equals("仓库")&&!updateAlarmVo.getAlarmScene().equals("运输")){
fb.setCode(0);
fb.setMessage("请选择正确的预警场景");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateAlarmVo.getTemMax()+"")){
fb.setCode(0);
fb.setMessage("温度上限不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateAlarmVo.getTemMin()+"")){
fb.setCode(0);
fb.setMessage("温度下限不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateAlarmVo.getHumidityMax()+"")){
fb.setCode(0);
fb.setMessage("湿度上限不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateAlarmVo.getHumidityMin()+"")){
fb.setCode(0);
fb.setMessage("湿度下限不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateAlarmVo.getTilt()+"")){
fb.setCode(0);
fb.setMessage("倾斜度不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateAlarmVo.getShock()+"")){
fb.setCode(0);
fb.setMessage("震度不能为空");
return gson.toJson(fb);
}
if (alarmService.getByTypeAndScene(updateAlarmVo.getAlarmType(),updateAlarmVo.getAlarmType())!=null&&!updateAlarmVo.getAlarmType().equals(updateAlarmVo.getAlarmType())&&!updateAlarmVo.getAlarmScene().equals(updateAlarmVo.getAlarmScene())){
fb.setCode(0);
fb.setMessage("修改的预警类型在该场景中已存在");
return gson.toJson(fb);
}
int a=alarmService.updateAlarm(updateAlarmVo);
if (a>0){
fb.setCode(1);
fb.setMessage("修改预警信息成功");
}else{
fb.setCode(0);
fb.setMessage("修改预警信息失败");
}
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(updateAlarmVo.getAlarmType())){
fb.setCode(0);
fb.setMessage("预警类型不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateAlarmVo.getAlarmScene())){
fb.setCode(0);
fb.setMessage("预警场景不能为空");
return gson.toJson(fb);
}else if (!updateAlarmVo.getAlarmScene().equals("仓库")&&!updateAlarmVo.getAlarmScene().equals("运输")){
fb.setCode(0);
fb.setMessage("请选择正确的预警场景");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateAlarmVo.getTemMax()+"")){
fb.setCode(0);
fb.setMessage("温度上限不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateAlarmVo.getTemMin()+"")){
fb.setCode(0);
fb.setMessage("温度下限不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateAlarmVo.getHumidityMax()+"")){
fb.setCode(0);
fb.setMessage("湿度上限不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateAlarmVo.getHumidityMin()+"")){
fb.setCode(0);
fb.setMessage("湿度下限不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateAlarmVo.getTilt()+"")){
fb.setCode(0);
fb.setMessage("倾斜度不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateAlarmVo.getShock()+"")){
fb.setCode(0);
fb.setMessage("震度不能为空");
return gson.toJson(fb);
}
if (alarmService.getByTypeAndScene(updateAlarmVo.getAlarmType(),updateAlarmVo.getAlarmType())!=null&&!updateAlarmVo.getAlarmType().equals(updateAlarmVo.getAlarmType())&&!updateAlarmVo.getAlarmScene().equals(updateAlarmVo.getAlarmScene())){
fb.setCode(0);
fb.setMessage("修改的预警类型在该场景中已存在");
return gson.toJson(fb);
}
int a=alarmService.updateAlarm(updateAlarmVo);
if (a>0){
fb.setCode(1);
fb.setMessage("修改预警信息成功");
}else{
fb.setCode(0);
fb.setMessage("修改预警信息失败");
}
return gson.toJson(fb);
} }
//删除预警信息 //删除预警信息
...@@ -286,22 +273,14 @@ public class AlarmController { ...@@ -286,22 +273,14 @@ public class AlarmController {
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"), @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
}) })
@RequestMapping(value="/delAlarm",method = RequestMethod.POST) @RequestMapping(value="/delAlarm",method = RequestMethod.POST)
public Object delAlarm(@RequestBody DelAlarmVo delAlarmVo,HttpServletRequest request){ public Object delAlarm(@RequestBody DelAlarmVo delAlarmVo){
String token = request.getHeader("Account_token"); int a=alarmService.delAlarm(delAlarmVo);
String datum = tokenRedisService.get("TOKEN_" +token); if (a>0){
if(datum == null){ fb.setCode(1);
fb.setCode(0); fb.setMessage("删除预警信息成功");
fb.setMessage("您没有登录，请先登录");
return gson.toJson(fb);
}else{ }else{
int a=alarmService.delAlarm(delAlarmVo); fb.setCode(0);
if (a>0){ fb.setMessage("删除预警信息失败");
fb.setCode(1);
fb.setMessage("删除预警信息成功");
}else{
fb.setCode(0);
fb.setMessage("删除预警信息失败");
}
} }
return gson.toJson(fb); return gson.toJson(fb);
} }
......
src/main/java/com/example/tdl/web/LoginController.java
View file @ 8e19bce4
...@@ -103,9 +103,6 @@ public class LoginController { ...@@ -103,9 +103,6 @@ public class LoginController {
@ResponseBody @ResponseBody
public String logout(HttpServletRequest request){ public String logout(HttpServletRequest request){
String token=request.getHeader("Account_token"); String token=request.getHeader("Account_token");
// JSONObject jsonObject= JSON.parseObject(token);
// token=(String)jsonObject.get("token");
// logger.info(request.getHeader("Account_token"));
tokenRedisService.delKey("TOKEN_"+token); tokenRedisService.delKey("TOKEN_"+token);
fb.setCode(1); fb.setCode(1);
fb.setMessage("注销成功"); fb.setMessage("注销成功");
......
src/main/java/com/example/tdl/web/LoginLogController.java
View file @ 8e19bce4
...@@ -72,26 +72,19 @@ public class LoginLogController { ...@@ -72,26 +72,19 @@ public class LoginLogController {
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"), @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
}) })
@RequestMapping(value="/getByTime",method = RequestMethod.POST) @RequestMapping(value="/getByTime",method = RequestMethod.POST)
public Object getByTime(@RequestBody LoginLogTermVo loginLogTermVo,HttpServletRequest request){ public Object getByTime(@RequestBody LoginLogTermVo loginLogTermVo){
String token = request.getHeader("Account_token"); if (StringUtils.isEmpty(loginLogTermVo.getStartTime()+"")){
String datum = tokenRedisService.get("TOKEN_" +token);
if(datum == null){
fb.setCode(0); fb.setCode(0);
fb.setMessage("您没有登录，请先登录"); fb.setMessage("查询开始时间不能为空");
return gson.toJson(fb); return gson.toJson(fb);
}else{
if (StringUtils.isEmpty(loginLogTermVo.getStartTime()+"")){
fb.setCode(0);
fb.setMessage("查询开始时间不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(loginLogTermVo.getStopTime()+"")){
fb.setCode(0);
fb.setMessage("查询结束时间不能为空");
return gson.toJson(fb);
}
return loginLogService.getByTime(loginLogTermVo);
} }
if (StringUtils.isEmpty(loginLogTermVo.getStopTime()+"")){
fb.setCode(0);
fb.setMessage("查询结束时间不能为空");
return gson.toJson(fb);
}
return loginLogService.getByTime(loginLogTermVo);
} }
......
src/main/java/com/example/tdl/web/PermissionController.java
View file @ 8e19bce4
...@@ -43,16 +43,8 @@ public class PermissionController { ...@@ -43,16 +43,8 @@ public class PermissionController {
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"), @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
}) })
@RequestMapping(value="/getAll",method = RequestMethod.GET) @RequestMapping(value="/getAll",method = RequestMethod.GET)
public Object getAll(HttpServletRequest request){ public Object getAll(){
String token = request.getHeader("Account_token"); return permissionService.getAll();
String datum = tokenRedisService.get("TOKEN_" +token);
if(datum == null){
fb.setCode(0);
fb.setMessage("您没有登录，请先登录");
return gson.toJson(fb);
}else{
return permissionService.getAll();
}
} }
......
src/main/java/com/example/tdl/web/RouteController.java
View file @ 8e19bce4
...@@ -154,143 +154,142 @@ public class RouteController { ...@@ -154,143 +154,142 @@ public class RouteController {
fb.setCode(0); fb.setCode(0);
fb.setMessage("您没有登录，请先登录"); fb.setMessage("您没有登录，请先登录");
return gson.toJson(fb); return gson.toJson(fb);
}else{ }
if (StringUtils.isEmpty(addRouteVo.getStartLatitude())){ if (StringUtils.isEmpty(addRouteVo.getStartLatitude())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("启运纬度不能为空"); fb.setMessage("启运纬度不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addRouteVo.getStartLongitude())){ if (StringUtils.isEmpty(addRouteVo.getStartLongitude())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("启运经度不能为空"); fb.setMessage("启运经度不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if(!addRouteVo.getStartLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){ if(!addRouteVo.getStartLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
fb.setCode(0); fb.setCode(0);
fb.setMessage("启运纬度的范围为-90~90"); fb.setMessage("启运纬度的范围为-90~90");
return gson.toJson(fb); return gson.toJson(fb);
} }
if(!addRouteVo.getStartLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) { if(!addRouteVo.getStartLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
fb.setCode(0); fb.setCode(0);
fb.setMessage("启运经度的范围为-180~180"); fb.setMessage("启运经度的范围为-180~180");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addRouteVo.getStartCountry())){ if (StringUtils.isEmpty(addRouteVo.getStartCountry())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("启运国不能为空"); fb.setMessage("启运国不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addRouteVo.getStartProvince())){ if (StringUtils.isEmpty(addRouteVo.getStartProvince())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("启运省不能为空"); fb.setMessage("启运省不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addRouteVo.getStartCity())){ if (StringUtils.isEmpty(addRouteVo.getStartCity())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("启运市不能为空"); fb.setMessage("启运市不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addRouteVo.getStartAddress())){ if (StringUtils.isEmpty(addRouteVo.getStartAddress())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("启运地址不能为空"); fb.setMessage("启运地址不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addRouteVo.getEndLatitude())){ if (StringUtils.isEmpty(addRouteVo.getEndLatitude())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("目的纬度不能为空"); fb.setMessage("目的纬度不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addRouteVo.getEndLongitude())){ if (StringUtils.isEmpty(addRouteVo.getEndLongitude())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("目的经度不能为空"); fb.setMessage("目的经度不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if(!addRouteVo.getEndLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){ if(!addRouteVo.getEndLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
fb.setCode(0); fb.setCode(0);
fb.setMessage("目的纬度的范围为-90~90"); fb.setMessage("目的纬度的范围为-90~90");
return gson.toJson(fb); return gson.toJson(fb);
} }
if(!addRouteVo.getEndLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) { if(!addRouteVo.getEndLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
fb.setCode(0); fb.setCode(0);
fb.setMessage("目的经度的范围为-180~180"); fb.setMessage("目的经度的范围为-180~180");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addRouteVo.getEndCountry())){ if (StringUtils.isEmpty(addRouteVo.getEndCountry())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("目的国不能为空"); fb.setMessage("目的国不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addRouteVo.getEndProvince())){ if (StringUtils.isEmpty(addRouteVo.getEndProvince())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("目的省不能为空"); fb.setMessage("目的省不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addRouteVo.getEndCity())){ if (StringUtils.isEmpty(addRouteVo.getEndCity())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("目的市不能为空"); fb.setMessage("目的市不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addRouteVo.getEndAddress())){ if (StringUtils.isEmpty(addRouteVo.getEndAddress())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("目的地址不能为空"); fb.setMessage("目的地址不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (StringUtils.isEmpty(addRouteVo.getTransport())){ if (StringUtils.isEmpty(addRouteVo.getTransport())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("运输方式不能为空"); fb.setMessage("运输方式不能为空");
return gson.toJson(fb); return gson.toJson(fb);
}else if (!addRouteVo.getTransport().equals("铁路")&&!addRouteVo.getTransport().equals("汽运")&&!addRouteVo.getTransport().equals("海运")&& }else if (!addRouteVo.getTransport().equals("铁路")&&!addRouteVo.getTransport().equals("汽运")&&!addRouteVo.getTransport().equals("海运")&&
!addRouteVo.getTransport().equals("空运")&&!addRouteVo.getTransport().equals("快递")){ !addRouteVo.getTransport().equals("空运")&&!addRouteVo.getTransport().equals("快递")){
fb.setCode(0); fb.setCode(0);
fb.setMessage("请选择正确的运输方式"); fb.setMessage("请选择正确的运输方式");
return gson.toJson(fb); return gson.toJson(fb);
} }
String routeName=addRouteVo.getStartCity()+"-"+addRouteVo.getEndCity(); String routeName=addRouteVo.getStartCity()+"-"+addRouteVo.getEndCity();
Date day=new Date(); Date day=new Date();
SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
String routeNumbers="RT"+df.format(day); String routeNumbers="RT"+df.format(day);
String abbreviation=routeName; String abbreviation=routeName;
if (addRouteVo.getTransport().equals("汽运")){ if (addRouteVo.getTransport().equals("汽运")){
routeNumbers=routeNumbers+"G"; routeNumbers=routeNumbers+"G";
abbreviation=abbreviation+"-G"; abbreviation=abbreviation+"-G";
} }
if (addRouteVo.getTransport().equals("铁路")){ if (addRouteVo.getTransport().equals("铁路")){
routeNumbers=routeNumbers+"T"; routeNumbers=routeNumbers+"T";
abbreviation=abbreviation+"-T"; abbreviation=abbreviation+"-T";
} }
if (addRouteVo.getTransport().equals("空运")){ if (addRouteVo.getTransport().equals("空运")){
routeNumbers=routeNumbers+"K"; routeNumbers=routeNumbers+"K";
abbreviation=abbreviation+"-K"; abbreviation=abbreviation+"-K";
} }
if (addRouteVo.getTransport().equals("快递")){ if (addRouteVo.getTransport().equals("快递")){
routeNumbers=routeNumbers+"D"; routeNumbers=routeNumbers+"D";
abbreviation=abbreviation+"-D"; abbreviation=abbreviation+"-D";
} }
if (addRouteVo.getTransport().equals("海运")){ if (addRouteVo.getTransport().equals("海运")){
routeNumbers=routeNumbers+"H"; routeNumbers=routeNumbers+"H";
abbreviation=abbreviation+"-H"; abbreviation=abbreviation+"-H";
} }
String routeNumber=routeNumbers+((int)(Math.random()*(9999-1000+1))+1000); String routeNumber=routeNumbers+((int)(Math.random()*(9999-1000+1))+1000);
if (routeService.getByRouteNumber(routeNumber)>0){ if (routeService.getByRouteNumber(routeNumber)>0){
while (routeService.getByRouteNumber(routeNumber)>0){ while (routeService.getByRouteNumber(routeNumber)>0){
routeNumber=routeNumbers+((int)(Math.random()*(9999-1000+1))+1000); routeNumber=routeNumbers+((int)(Math.random()*(9999-1000+1))+1000);
}
}
int a=routeService.addRoute(new Route(routeNumber,routeName,abbreviation,addRouteVo.getStartLongitude(),addRouteVo.getStartLatitude(),
addRouteVo.getStartCountry(),addRouteVo.getStartProvince(),addRouteVo.getStartCity(),addRouteVo.getStartAddress(),
addRouteVo.getEndLongitude(),addRouteVo.getEndLatitude(),addRouteVo.getEndCountry(),addRouteVo.getEndProvince(),
addRouteVo.getEndCity(), addRouteVo.getEndAddress(),addRouteVo.getTransport(),addRouteVo.getTransportRemark(),
System.currentTimeMillis(),System.currentTimeMillis(),addRouteVo.getRemark()));
if (a>0){
fb.setCode(1);
fb.setMessage("添加路由成功");
}else{
fb.setCode(0);
fb.setMessage("添加路由失败");
} }
return gson.toJson(fb);
} }
int a=routeService.addRoute(new Route(routeNumber,routeName,abbreviation,addRouteVo.getStartLongitude(),addRouteVo.getStartLatitude(),
addRouteVo.getStartCountry(),addRouteVo.getStartProvince(),addRouteVo.getStartCity(),addRouteVo.getStartAddress(),
addRouteVo.getEndLongitude(),addRouteVo.getEndLatitude(),addRouteVo.getEndCountry(),addRouteVo.getEndProvince(),
addRouteVo.getEndCity(), addRouteVo.getEndAddress(),addRouteVo.getTransport(),addRouteVo.getTransportRemark(),
System.currentTimeMillis(),System.currentTimeMillis(),addRouteVo.getRemark()));
if (a>0){
fb.setCode(1);
fb.setMessage("添加路由成功");
}else{
fb.setCode(0);
fb.setMessage("添加路由失败");
}
return gson.toJson(fb);
} }
@ApiOperation(value = "修改路由信息",notes = "修改路由信息，都要传，路由编号是需要修改的路由编号，不能改，说明：" + @ApiOperation(value = "修改路由信息",notes = "修改路由信息，都要传，路由编号是需要修改的路由编号，不能改，说明：" +
......
src/main/java/com/example/tdl/web/UserController.java
View file @ 8e19bce4
...@@ -14,14 +14,10 @@ import io.swagger.annotations.ApiImplicitParams; ...@@ -14,14 +14,10 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
...@@ -54,14 +50,7 @@ public class UserController { ...@@ -54,14 +50,7 @@ public class UserController {
}) })
@RequestMapping(value="/getAll",method = RequestMethod.GET) @RequestMapping(value="/getAll",method = RequestMethod.GET)
public Object getAll(HttpServletRequest request){ public Object getAll(HttpServletRequest request){
String token = request.getHeader("Account_token"); UserRedisVo user = gson.fromJson(tokenRedisService.get("TOKEN_" +request.getHeader("Account_token")),UserRedisVo.class);
String datum = tokenRedisService.get("TOKEN_" +token);
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
if(datum == null){
fb.setCode(0);
fb.setMessage("您没有登录，请先登录");
return gson.toJson(fb);
}
List<String> permission=roleHasPermissionService.getByRoleName(user.getRoleName()); List<String> permission=roleHasPermissionService.getByRoleName(user.getRoleName());
if (!permission.contains("用户列表")){ if (!permission.contains("用户列表")){
fb.setCode(0); fb.setCode(0);
...@@ -82,11 +71,6 @@ public class UserController { ...@@ -82,11 +71,6 @@ public class UserController {
String token = request.getHeader("Account_token"); String token = request.getHeader("Account_token");
String datum = tokenRedisService.get("TOKEN_" +token); String datum = tokenRedisService.get("TOKEN_" +token);
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class); UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
if(datum == null){
fb.setCode(0);
fb.setMessage("您没有登录，请先登录");
return gson.toJson(fb);
}
List<String> permission=roleHasPermissionService.getByRoleName(user.getRoleName()); List<String> permission=roleHasPermissionService.getByRoleName(user.getRoleName());
if (!permission.contains("用户列表")){ if (!permission.contains("用户列表")){
fb.setCode(0); fb.setCode(0);
...@@ -113,20 +97,16 @@ public class UserController { ...@@ -113,20 +97,16 @@ public class UserController {
String token = request.getHeader("Account_token"); String token = request.getHeader("Account_token");
String datum = tokenRedisService.get("TOKEN_" +token); String datum = tokenRedisService.get("TOKEN_" +token);
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class); UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
if(datum == null){
fb.setCode(0);
fb.setMessage("您没有登录，请先登录");
return gson.toJson(fb);
}
List<String> permission=roleHasPermissionService.getByRoleName(user.getRoleName()); List<String> permission=roleHasPermissionService.getByRoleName(user.getRoleName());
if (!permission.contains("用户列表")){ if (!permission.contains("用户列表")){
fb.setCode(0); fb.setCode(0);
fb.setMessage("对不起，您没有此权限"); fb.setMessage("对不起，您没有此权限");
return gson.toJson(fb); return gson.toJson(fb);
}else{ }else{
if (userVo.getUserName().equals("")||userVo.getUserName()==null){ if (StringUtils.isEmpty(userVo.getUserName())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("用户名不能为空"); fb.setMessage("用户名不能为空");
return gson.toJson(fb);
} }
if (!userVo.getUserName().matches("^[a-zA-Z][a-zA-Z0-9_]{5,19}$")) { if (!userVo.getUserName().matches("^[a-zA-Z][a-zA-Z0-9_]{5,19}$")) {
fb.setCode(0); fb.setCode(0);
...@@ -148,12 +128,12 @@ public class UserController { ...@@ -148,12 +128,12 @@ public class UserController {
fb.setMessage("密码必须是6-20位的数字、字母和_"); fb.setMessage("密码必须是6-20位的数字、字母和_");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (userVo.getNickName()==null||userVo.getNickName().equals("")){ if (StringUtils.isEmpty(userVo.getNickName())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("昵称不能为空"); fb.setMessage("昵称不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if(userVo.getPhone() ==null || userVo.getPhone().equals("")){ if(StringUtils.isEmpty(userVo.getPhone())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("电话不能为空"); fb.setMessage("电话不能为空");
return gson.toJson(fb); return gson.toJson(fb);
...@@ -168,7 +148,7 @@ public class UserController { ...@@ -168,7 +148,7 @@ public class UserController {
fb.setMessage("该手机号已被注册"); fb.setMessage("该手机号已被注册");
return gson.toJson(fb); return gson.toJson(fb);
} }
if(userVo.getEmail() ==null || userVo.getEmail().equals("")){ if(StringUtils.isEmpty(userVo.getEmail())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("邮箱不能为空"); fb.setMessage("邮箱不能为空");
return gson.toJson(fb); return gson.toJson(fb);
...@@ -183,7 +163,7 @@ public class UserController { ...@@ -183,7 +163,7 @@ public class UserController {
fb.setMessage("该邮箱已被注册"); fb.setMessage("该邮箱已被注册");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (userVo.getRoleName().equals("")||userVo.getRoleName()==null){ if (StringUtils.isEmpty(userVo.getRoleName())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("角色名不能为空"); fb.setMessage("角色名不能为空");
return gson.toJson(fb); return gson.toJson(fb);
...@@ -215,18 +195,13 @@ public class UserController { ...@@ -215,18 +195,13 @@ public class UserController {
String token = request.getHeader("Account_token"); String token = request.getHeader("Account_token");
String datum = tokenRedisService.get("TOKEN_" +token); String datum = tokenRedisService.get("TOKEN_" +token);
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class); UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
if(datum == null){
fb.setCode(0);
fb.setMessage("您没有登录，请先登录");
return gson.toJson(fb);
}
List<String> permission=roleHasPermissionService.getByRoleName(user.getRoleName()); List<String> permission=roleHasPermissionService.getByRoleName(user.getRoleName());
if (!permission.contains("用户列表")){ if (!permission.contains("用户列表")){
fb.setCode(0); fb.setCode(0);
fb.setMessage("对不起，您没有此权限"); fb.setMessage("对不起，您没有此权限");
return gson.toJson(fb); return gson.toJson(fb);
}else{ }
ResultUserVo userInfo=userService.getByUserNumber(user.getUserNumber()); ResultUserVo userInfo=userService.getByUserNumber(user.getUserNumber());
// if (userVo.getUserName().equals("")||userVo.getUserName()==null){ // if (userVo.getUserName().equals("")||userVo.getUserName()==null){
// fb.setCode(0); // fb.setCode(0);
// fb.setMessage("用户名不能为空"); // fb.setMessage("用户名不能为空");
...@@ -251,59 +226,58 @@ public class UserController { ...@@ -251,59 +226,58 @@ public class UserController {
// fb.setMessage("密码必须是6-20位的数字、字母和_"); // fb.setMessage("密码必须是6-20位的数字、字母和_");
// return gson.toJson(fb); // return gson.toJson(fb);
// } // }
if (userVo.getNickName()==null||userVo.getNickName().equals("")){ if (StringUtils.isEmpty(userVo.getNickName())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("昵称不能为空"); fb.setMessage("昵称不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if(userVo.getPhone() ==null || userVo.getPhone().equals("")){ if(StringUtils.isEmpty(userVo.getPhone())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("电话不能为空"); fb.setMessage("电话不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if( !userVo.getPhone().matches("^1[34578]\\d{9}$")){ if( !userVo.getPhone().matches("^1[34578]\\d{9}$")){
fb.setCode(0); fb.setCode(0);
fb.setMessage("手机号不规范"); fb.setMessage("手机号不规范");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (userInfo!=null&&userInfo.getPhone().equals(userVo.getPhone())){ if (userInfo!=null&&userInfo.getPhone().equals(userVo.getPhone())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("该手机号已被注册"); fb.setMessage("该手机号已被注册");
return gson.toJson(fb); return gson.toJson(fb);
} }
if(userVo.getEmail() ==null || userVo.getEmail().equals("")){ if(StringUtils.isEmpty(userVo.getEmail())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("邮箱不能为空"); fb.setMessage("邮箱不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if( !userVo.getEmail().matches("\\w+(\\.\\w*)*@\\w+(\\.\\w{2,3}){1,3}")){ if( !userVo.getEmail().matches("\\w+(\\.\\w*)*@\\w+(\\.\\w{2,3}){1,3}")){
fb.setCode(0); fb.setCode(0);
fb.setMessage("邮箱格式不规范"); fb.setMessage("邮箱格式不规范");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (userInfo!=null&&userInfo.getEmail().equals(userVo.getEmail())){ if (userInfo!=null&&userInfo.getEmail().equals(userVo.getEmail())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("该邮箱已被注册"); fb.setMessage("该邮箱已被注册");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (userVo.getRoleName().equals("")||userVo.getRoleName()==null){ if (StringUtils.isEmpty(userVo.getRoleName())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("角色名不能为空"); fb.setMessage("角色名不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if (userVo.getUserNumber()==null||userVo.getUserNumber().equals("")){ if (StringUtils.isEmpty(userVo.getUserNumber())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("需要修改的用户编号不能为空"); fb.setMessage("需要修改的用户编号不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
int a=userService.updateUser(userVo); int a=userService.updateUser(userVo);
if (a>0){ if (a>0){
fb.setCode(1); fb.setCode(1);
fb.setMessage("修改用户成功"); fb.setMessage("修改用户成功");
}else{ }else{
fb.setCode(0); fb.setCode(0);
fb.setMessage("修改用户失败"); fb.setMessage("修改用户失败");
}
} }
return gson.toJson(fb); return gson.toJson(fb);
} }
...@@ -315,32 +289,26 @@ public class UserController { ...@@ -315,32 +289,26 @@ public class UserController {
}) })
@RequestMapping(value="/delUser",method = RequestMethod.POST) @RequestMapping(value="/delUser",method = RequestMethod.POST)
public Object delUser(@RequestBody String userNumber,HttpServletRequest request){ public Object delUser(@RequestBody String userNumber,HttpServletRequest request){
JSONObject jsonObject= JSON.parseObject(userNumber);
userNumber=jsonObject.getString("userNumber");
String token = request.getHeader("Account_token"); String token = request.getHeader("Account_token");
String datum = tokenRedisService.get("TOKEN_" +token); String datum = tokenRedisService.get("TOKEN_" +token);
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class); UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
if(datum == null){
fb.setCode(0);
fb.setMessage("您没有登录，请先登录");
return gson.toJson(fb);
}
List<String> permission=roleHasPermissionService.getByRoleName(user.getRoleName()); List<String> permission=roleHasPermissionService.getByRoleName(user.getRoleName());
if (!permission.contains("用户列表")){ if (!permission.contains("用户列表")){
fb.setCode(0); fb.setCode(0);
fb.setMessage("对不起，您没有此权限"); fb.setMessage("对不起，您没有此权限");
return gson.toJson(fb); return gson.toJson(fb);
}
JSONObject jsonObject= JSON.parseObject(userNumber);
userNumber=jsonObject.getString("userNumber");
int a = userService.delUser(userNumber);
if (a>0){
fb.setCode(0);
fb.setMessage("删除用户成功");
}else{ }else{
int a = userService.delUser(userNumber); fb.setCode(0);
if (a>0){ fb.setMessage("删除用户失败");
fb.setCode(0);
fb.setMessage("删除用户成功");
}else{
fb.setCode(0);
fb.setMessage("删除用户失败");
}
return gson.toJson(fb);
} }
return gson.toJson(fb);
} }
//重置密码 //重置密码
...@@ -350,33 +318,39 @@ public class UserController { ...@@ -350,33 +318,39 @@ public class UserController {
}) })
@RequestMapping(value="/resetPassword",method = RequestMethod.POST) @RequestMapping(value="/resetPassword",method = RequestMethod.POST)
public Object resetPassword(@RequestBody String userNumber, HttpServletRequest request){ public Object resetPassword(@RequestBody String userNumber, HttpServletRequest request){
JSONObject jsonObject= JSON.parseObject(userNumber);
userNumber=jsonObject.getString("userNumber");
String token = request.getHeader("Account_token"); String token = request.getHeader("Account_token");
String datum = tokenRedisService.get("TOKEN_" +token); String datum = tokenRedisService.get("TOKEN_" +token);
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class); UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
if(datum == null){
fb.setCode(0);
fb.setMessage("您没有登录，请先登录");
return gson.toJson(fb);
}
List<String> permission=roleHasPermissionService.getByRoleName(user.getRoleName()); List<String> permission=roleHasPermissionService.getByRoleName(user.getRoleName());
if (!permission.contains("用户列表")){ if (!permission.contains("用户列表")){
fb.setCode(0); fb.setCode(0);
fb.setMessage("对不起，您没有此权限"); fb.setMessage("对不起，您没有此权限");
return gson.toJson(fb); return gson.toJson(fb);
}
JSONObject jsonObject= JSON.parseObject(userNumber);
userNumber=jsonObject.getString("userNumber");
String pwd=DigestUtils.sha256Hex("Witium123");
int a = userService.resetPassword(userNumber,pwd);
if (a>0){
fb.setCode(0);
fb.setMessage("重置密码成功");
}else{ }else{
String pwd=DigestUtils.sha256Hex("Witium123"); fb.setCode(0);
int a = userService.resetPassword(userNumber,pwd); fb.setMessage("重置密码失败");
if (a>0){
fb.setCode(0);
fb.setMessage("重置密码成功");
}else{
fb.setCode(0);
fb.setMessage("重置密码失败");
}
return gson.toJson(fb);
} }
return gson.toJson(fb);
}
//获取当前的用户名
@ApiOperation(value = "获取当前的用户名",notes = "获取当前的用户名")
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
})
@GetMapping(value="/getUserName")
public Object getUserName(HttpServletRequest request){
String token = request.getHeader("Account_token");
String datum = tokenRedisService.get("TOKEN_" +token);
return new UserNameVo(gson.fromJson(datum,UserRedisVo.class).getUserName());
} }
} }
src/main/resources/application.properties
View file @ 8e19bce4
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/cy?useUnicode=true&characterEncoding=utf-8&useSSL=false spring.datasource.url=jdbc:mysql://192.168.1.53:3306/cy?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=root spring.datasource.password=root
spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.datasource.driver-class-name=com.mysql.jdbc.Driver
server.port=8092 server.port=8099
management.security.enabled=false management.security.enabled=false
mybatis.type-aliases-package=com.example.demo.entity mybatis.type-aliases-package=com.example.demo.entity
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment