From 259294a3a1f922188075ad6ddad502eca5886b07 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Feb 2018 15:06:31 +0800
Subject: [PATCH] 旧版登录功能 加密修复
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 5 -
/dev/null | 101 ---------------------------------
src/main/java/com/moral/controller/ScreenController.java | 71 ++++++++++++++++++++++-
3 files changed, 67 insertions(+), 110 deletions(-)
diff --git a/src/main/java/com/moral/controller/MapController.java b/src/main/java/com/moral/controller/MapController.java
deleted file mode 100644
index 9d0f0a8..0000000
--- a/src/main/java/com/moral/controller/MapController.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.moral.controller;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.moral.common.bean.Constants;
-import com.moral.common.bean.PageBean;
-import com.moral.common.bean.PageResult;
-import com.moral.common.bean.ResultBean;
-import com.moral.entity.Account;
-import com.moral.entity.Device;
-import com.moral.entity.MapBounds;
-import com.moral.entity.MonitorPoint;
-import com.moral.security.auth.JwtAuthenticationToken;
-import com.moral.security.config.WebSecurityConfig;
-import com.moral.service.*;
-import lombok.extern.log4j.Log4j;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * ���������������������������������
- */
-@Controller
-@RequestMapping("map")
-public class MapController {
- public final static String REFRESH_TOKEN = "_refresh_token";
- public static Logger log = Logger.getLogger(MapController.class);
- @Resource
- DeviceService deviceService;
- @Resource
- AreaService areaService;
- @Resource
- AccountService accountService;
- @Resource
- SensorService sensorService;
- @Resource
- MonitorPointService monitorPointService;
-
- @RequestMapping(value = "/screen-main", method = RequestMethod.GET)
- public String map(Model model,
- @RequestParam("areaCode")int code,
- @RequestParam(WebSecurityConfig.AUTHENTICATION_PARAM_NAME)String token,
- @RequestParam(REFRESH_TOKEN)String refreshToke,
- JwtAuthenticationToken authenticationToken){
- String accountName = authenticationToken.getPrincipal().getUsername();
- Account account = accountService.getAccountByAccountName(accountName);
- String regionName = areaService.selectFullNameByCode(code);
- if(account!=null&®ionName!=null){
- Object sensors = sensorService.queryAll();
- JSONObject params = new JSONObject();
- params.put("regionCode",code);
- params.put("regionName",regionName);
- //token ������������
- params.put(WebSecurityConfig.AUTHENTICATION_PARAM_NAME, token);
- params.put(REFRESH_TOKEN,refreshToke);
- params.put("sensors", sensors);
- String paramsJson = params.toJSONString();
- model.addAttribute("mapParams",paramsJson);
- return "map";
- } else {
- StringBuilder msg = new StringBuilder();
- msg.append(" param[0] areaCode:");
- msg.append(code);
- msg.append(" param[0] token:");
- msg.append(token);
- log.warn(msg);
- return "401";
- }
- }
- @RequestMapping(value="get-monitorpoints",method = RequestMethod.GET)
- @ResponseBody
- public ResultBean getMonitorpointList(JwtAuthenticationToken authenticationToken,MapBounds mapBounds){
- ResultBean< List<MonitorPoint>> resultBean = new ResultBean();
- Map<String,Object> paramMap = new HashMap<String, Object>();
- Integer orgId = authenticationToken.getPrincipal().getOrganizationId();
- paramMap.put("orgId", orgId);
- paramMap.put("mapBounds",mapBounds);
- List<MonitorPoint> list = monitorPointService.queryWithStateByMap(paramMap);
- resultBean.setData(list);
- resultBean.setCode(ResultBean.SUCCESS);
- return resultBean;
- }
- @RequestMapping(value = "get-devices-for-popup",method = RequestMethod.GET)
- @ResponseBody
- public PageResult getDevicesForPopup(
- JwtAuthenticationToken authenticationToken,
- String name,
- Integer pageSize,
- Integer pageNo
- ){ Integer orgId = authenticationToken.getPrincipal().getOrganizationId();
- return deviceService.query(orgId,name,pageSize,pageNo);
- }
-}
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 4d1f9e2..c351ac2 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -8,19 +8,28 @@
import java.io.*;
import java.util.HashMap;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.alibaba.fastjson.JSONObject;
+import com.moral.common.bean.PageResult;
import com.moral.common.xml.Version;
+import com.moral.entity.Account;
+import com.moral.entity.MapBounds;
+import com.moral.entity.MonitorPoint;
+import com.moral.service.*;
import org.apache.commons.net.ftp.FTPClient;
+import org.apache.log4j.Logger;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSON;
@@ -28,11 +37,6 @@
import com.alibaba.fastjson.TypeReference;
import com.moral.common.bean.ResultBean;
import com.moral.common.util.ValidateUtil;
-import com.moral.service.AccountService;
-import com.moral.service.HistoryMinutelyService;
-import com.moral.service.DeviceService;
-import com.moral.service.HistoryService;
-import com.moral.service.MachineActivateService;
import org.xml.sax.InputSource;
/**
@@ -42,6 +46,15 @@
@RequestMapping("/screen")
//@CrossOrigin(origins = "*", maxAge = 3600)
public class ScreenController {
+ public static Logger log = Logger.getLogger(ScreenController.class);
+
+ @Resource
+ AreaService areaService;
+
+ @Resource
+ SensorService sensorService;
+ @Resource
+ MonitorPointService monitorPointService;
/** The screen service. */
@Resource
@@ -263,4 +276,52 @@
}
return version;
}
+
+ @RequestMapping(value = "/map-page", method = RequestMethod.GET)
+ public String map(Model model, @RequestParam("areaCode")int code, @RequestParam("accountId")int accountId){
+ Account account = accountService.getAccountById(accountId);
+ String regionName = areaService.selectFullNameByCode(code);
+ if(account!=null&®ionName!=null){
+ Object sensors = sensorService.queryAll();
+ JSONObject params = new JSONObject();
+ params.put("regionCode",code);
+ params.put("regionName",regionName);
+ params.put("accountId", accountId);
+ params.put("orgId", account.getOrganizationId());
+ params.put("sensors", sensors);
+ String paramsJson = params.toJSONString();
+ model.addAttribute("mapParams",paramsJson);
+ return "map";
+ } else {
+ StringBuilder msg = new StringBuilder();
+ msg.append(" param[0] areaCode:");
+ msg.append(code);
+ msg.append(" param[0] accountId:");
+ msg.append(accountId);
+ log.warn(msg);
+ return "401";
+ }
+ }
+ @RequestMapping(value="/get-monitorpoints",method = RequestMethod.GET)
+ @ResponseBody
+ public ResultBean getMonitorpointList(@RequestParam("orgId")String orgId,MapBounds mapBounds){
+ ResultBean<List<MonitorPoint>> resultBean = new ResultBean();
+ Map<String,Object> paramMap = new HashMap<String, Object>();
+ paramMap.put("orgId", orgId);
+ paramMap.put("mapBounds",mapBounds);
+ List<MonitorPoint> list = monitorPointService.queryWithStateByMap(paramMap);
+ resultBean.setData(list);
+ resultBean.setCode(ResultBean.SUCCESS);
+ return resultBean;
+ }
+ @RequestMapping(value = "get-devices-for-popup",method = RequestMethod.GET)
+ @ResponseBody
+ public PageResult getDevicesForPopup(
+ @RequestParam("orgId")Integer orgId,
+ String name,
+ Integer pageSize,
+ Integer pageNo
+ ){
+ return deviceService.query(orgId,name,pageSize,pageNo);
+ }
}
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index a0e4000..1da082a 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -50,7 +50,7 @@
Map<String, Object> result = new HashMap<String, Object>();
Account account = new Account();
account.setAccountName((String) parameters.get("account"));
- account.setPassword(md5((String) parameters.get("password")));
+ account.setPassword(encoder.encode((String) parameters.get("password")));
account = accountMapper.selectOne(account);
if (isEmpty(account)) {
result.put("msg", "���������������������������������");
@@ -171,9 +171,6 @@
@Override
public Optional<Account> queryAccountByName(String accountName) {
Account account = accountMapper.getByAccountName(accountName);
- if(account!=null){
-
- }
return Optional.ofNullable(account);
}
}
--
Gitblit v1.8.0