From 8b0501f73b6d92b611c7df74535566f65faa7d7b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 17 Sep 2020 13:51:15 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/WebController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index fcec4ca..de4f6df 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -1,13 +1,15 @@
package com.moral.controller;
-import com.moral.Webinterceptor.WebInterceptor;
import com.moral.common.util.BeanUtils;
+import com.moral.common.webAnno.UserLoginToken;
import com.moral.entity.AreaNames;
import com.moral.entity.Organization;
import com.moral.service.AccountService;
import com.moral.service.DictionaryDataService;
import com.moral.service.OrganizationService;
+import com.moral.service.WebTokenService;
import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -30,6 +32,8 @@
@Resource
DictionaryDataService dictionaryDataService;
OrganizationService organizationService;
+ @Resource
+ WebTokenService webTokenService;
@RequestMapping("login")
public Map<String, Object> login(HttpServletRequest request){
@@ -44,7 +48,9 @@
Object orgId = resultMap.get("orgId");
if (resultMap.get("orgId") != null && resultMap.get("orgId") instanceof Integer) {
StringBuilder areaNamesBuilder = new StringBuilder("������");
+ //���������������������������������
if (!((Integer) orgId).equals(dictionaryDataService.querySupperOrgId())) {
+ //���������������������������������������������������
Organization organization = organizationService.getOrganizationById((Integer) orgId);
if (organization.getAreaNames() != null) {
Map<String, String> areaNameMap = BeanUtils.beanToMap(organization.getAreaNames());
@@ -78,14 +84,16 @@
resultMap.put("mapAreaCode", mapAreaCode.toString());
}
resultMap.put("mapPath", areaNamesBuilder.toString());
+ String accountId= String.valueOf(resultMap.get("accountId"));
+ resultMap.put("token",webTokenService.getToken(accountId));
}
}
- request.getSession().setAttribute(WebInterceptor.SESSION_KEY,resultMap);
return resultMap;
}
- @RequestMapping("add")
+ @UserLoginToken
+ @GetMapping("test")
public String add(){
- return "123123";
+ return "test success!";
}
}
--
Gitblit v1.8.0