From 351b9a53cb9ecebdf8f79db0117f540d9c42c2a4 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期二, 23 二月 2021 17:19:23 +0800
Subject: [PATCH] update
---
src/main/java/com/fgkj/controller/LoginController.java | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/LoginController.java b/src/main/java/com/fgkj/controller/LoginController.java
index 4655ceb..71a0b29 100644
--- a/src/main/java/com/fgkj/controller/LoginController.java
+++ b/src/main/java/com/fgkj/controller/LoginController.java
@@ -9,6 +9,7 @@
import com.fgkj.services.User_logService;
import com.fgkj.services.Vip_userService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -19,25 +20,28 @@
import java.util.List;
import java.util.Map;
+import javax.annotation.Resource;
+
@RequestMapping("login")
@RestController
-@Api
+@Api(tags = "login鎺ュ彛")
public class LoginController{
// private User_inf uinf;
- private ServiceModel model;
+ ServiceModel model = new ServiceModel();
//private String user;
//private String password;
- @Autowired
+ @Resource
private User_infService service;
- @Autowired
+ @Resource
private Vip_userService vservice;
- @Autowired
+ @Resource
private User_ChartMapper userChartMapper;
//web鐗堢櫥褰�
@PostMapping("login")
+ @ApiOperation(notes = "",value="web鐗堢櫥褰�")
public ServiceModel login(@RequestBody User_inf uinf) {
model=vservice.login(uinf);
//System.out.println(model);
@@ -60,7 +64,7 @@
if(model.getCode()==1){
Cookie c = null;
//System.out.println(ActionUtil.DecryptionBase64());
- if(uinf.getUId() == 1){
+ if(uinf.getuId() == 1){
c = new Cookie("user", ActionUtil.EncryptionBase64(ActionUtil.getGson().toJson(uinf)).toString());
}else{
c = new Cookie("user", "");
@@ -74,6 +78,7 @@
//鎵嬫満绔櫥褰昦ction
@PostMapping("mobileLogin")
+ @ApiOperation(notes = "",value="鎵嬫満绔櫥褰昦ction")
public ServiceModel MobileLogin(@RequestBody User_inf uinf){
System.out.println(uinf);
String usnId64=(String) ActionUtil.EncryptionBase64(uinf.getUpassword());
@@ -86,10 +91,10 @@
User_log log = new User_log();
User_inf uinf2 = (User_inf) ActionUtil.getUser();
if(uinf!=null){
- log.setuId(uinf2.getUId());
- log.setUOprateDay(new Date());
+ log.setuId(uinf2.getuId());
+ log.setuOprateDay(new Date());
log.setuOprateMsg("鐧诲綍绉诲姩绯荤粺");
- log.setUOprateType(UserUtil.LOGIN);
+ log.setuOprateType(UserUtil.LOGIN);
log.setuTerminalIp(ActionUtil.getRequest().getRemoteAddr());
logservice.add(log);
}
@@ -99,6 +104,7 @@
//妫�鏌ヨ秴绾х鐞嗗憳鏄惁
@GetMapping("checkVip")
+ @ApiOperation(notes = "",value="妫�鏌ヨ秴绾х鐞嗗憳鏄惁")
public ServiceModel checkVip(){
Map<String, UserClient> map = (Map) ActionUtil.getApplication().getAttribute("vips");
model=vservice.checkVip();
@@ -111,6 +117,7 @@
* @return
*/
@GetMapping("check")
+ @ApiOperation(notes = "",value="鍒ゆ柇鏄惁鏈夊彟涓�鍚屼竴璐﹀彿鐧婚檰鐨勭敤鎴�")
public ServiceModel check(){
//System.out.println("寮�濮嬫鏌�");
model=service.checkUser();
@@ -129,6 +136,7 @@
* @return
*/
@PutMapping("/userExit")
+ @ApiOperation(notes = "",value="閫�鍑虹櫥褰�")
public ServiceModel exitUser(){
//灏嗗綋鍓嶇敤鎴蜂粠鎵�鏈夌殑鐧婚檰鐢ㄦ埛涓Щ闄�
Map<String, UserClient> map = (Map) ActionUtil.getApplication().getAttribute("users");
@@ -136,17 +144,17 @@
User_inf user = (User_inf) ActionUtil.getSession().getAttribute("user");
if(user!=null){
//System.out.println(user);
- UserClient client = map.get(user.getUName());
+ UserClient client = map.get(user.getuName());
//System.out.println(client);
if(client!=null){
- map.remove(user.getUName());
+ map.remove(user.getuName());
}
User_logService logservice= new User_logService();
User_log log = new User_log();
- log.setuId(user.getUId());
- log.setUOprateDay(new Date());
+ log.setuId(user.getuId());
+ log.setuOprateDay(new Date());
log.setuOprateMsg("鐧诲嚭绯荤粺");
- log.setUOprateType(UserUtil.LOGOUT);
+ log.setuOprateType(UserUtil.LOGOUT);
log.setuTerminalIp(ActionUtil.getRequest().getLocalAddr());
logservice.add(log);
}
@@ -181,10 +189,10 @@
try {
User_logService logservice= new User_logService();
User_log log = new User_log();
- log.setuId(u.getUId());
- log.setUOprateDay(new Date());
+ log.setuId(u.getuId());
+ log.setuOprateDay(new Date());
log.setuOprateMsg("鐧诲綍PC绯荤粺");
- log.setUOprateType(UserUtil.LOGIN);
+ log.setuOprateType(UserUtil.LOGIN);
log.setuTerminalIp(ActionUtil.getRequest().getRemoteAddr());
logservice.add(log);
} catch (Exception e) {
--
Gitblit v1.9.1