From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java | 67 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java b/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
index 7bf2201..780c72d 100644
--- a/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
+++ b/flower_city/src/main/java/com/dg/core/interceptor/AuthorizationInterceptor.java
@@ -2,8 +2,11 @@
import com.dg.core.Constant;
import com.dg.core.annotation.Authorization;
+import com.dg.core.db.gen.entity.HuaChengSysUser;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.manager.TokenManager;
+import com.dg.core.service.IHuaChengSysUserService;
+import com.dg.core.service.ISysUserRecordService;
import org.apache.catalina.connector.ResponseFacade;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,10 +18,7 @@
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.time.ZoneId;
-import java.util.Calendar;
-import java.util.Date;
+import java.time.LocalDateTime;
/**
* 自定义拦截器，判断此次请求是否有权限
@@ -33,6 +33,15 @@
@Autowired
com.dg.core.service.ISysUserService IUserService;
+
+ /**
+ * 花城e+用户接口
+ */
+ @Autowired
+ IHuaChengSysUserService iHuaChengSysUserService;
+
+ @Autowired
+ private ISysUserRecordService iSysUserRecordService;
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
@@ -52,26 +61,36 @@
if(StringUtils.isEmpty(token))
{
-// if(StringUtils.isEmpty(HCtoken))
-// {
-// String reponse = "{\"result\": 448, \"message\": \"token not is null \"}";
-// response.setStatus(200);
-// response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
-// ResponseFacade facade = (ResponseFacade) response;
-// facade.setContentLength(reponse.getBytes(StandardCharsets.UTF_8).length);
-// facade.getWriter().write(reponse);
-// return false;
-// }
-// else
-// {
-//
-// }
-
- //花城e+ token
if (manager.checkHCToken(HCtoken)) {
//如果token验证成功，权限检查通过，将token对应的用户id存在request中，便于之后注入
request.setAttribute(Constant.CURRENT_USER_ID, manager.getHCUserId(HCtoken));
-// SysUser ss = IUserService.selectData(manager.getHCUserId(HCtoken)+"");
+ System.out.println("花城用户id："+manager.getHCUserId(HCtoken));
+ HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData(manager.getHCUserId(HCtoken)+"","","");
+ if(huaChengSysUser!=null && huaChengSysUser.getUserId()!=0 )
+ {
+ SysUser sysUser = IUserService.selectData(null,huaChengSysUser.getPhone());
+ if(sysUser==null)
+ {
+ //本地没有此用户 新用户
+ SysUser newSysUser=new SysUser();
+ //默认 1系统后台用户
+ newSysUser.setUserType("3");
+ newSysUser.setPhonenumber(huaChengSysUser.getPhone());
+ newSysUser.setUserId(huaChengSysUser.getUserId());
+ newSysUser.setUserName(huaChengSysUser.getNickName());
+ newSysUser.setSex(huaChengSysUser.getSex());
+ newSysUser.setAvatar(huaChengSysUser.getImageUrl());
+ newSysUser.setCreateTime(LocalDateTime.now());
+ newSysUser.setUpdateTime(LocalDateTime.now());
+ newSysUser.setOpenid(huaChengSysUser.getOpenid());
+ IUserService.insertConfig(newSysUser);
+ }
+ //新增浏览记录
+ iSysUserRecordService.add(sysUser);
+ //删除因为token问题产出的重复脏数据
+ iSysUserRecordService.deleteDistinct();
+ }
+
return true;
}
@@ -86,8 +105,8 @@
}
}
- if(!StringUtils.isEmpty(token))
- {
+// if(!StringUtils.isEmpty(token))
+// {
//如果验证token失败，并且方法或类注明了Authorization，返回401错误
if (method.getAnnotation(Authorization.class) != null ||
bean.getClass().getAnnotation(Authorization.class) != null)
@@ -100,7 +119,7 @@
facade.getWriter().write(reponse);
return false;
}
- }
+// }
return true;
}
}
\ No newline at end of file
--
Gitblit v1.7.1