From abb5c36c028c77dbaca81e42ea0038ae452fd6f4 Mon Sep 17 00:00:00 2001
From: zhangye <654600784@qq.com>
Date: Sat, 7 May 2022 10:12:18 +0800
Subject: [PATCH] =?UTF-8?q?20220506=E4=B8=80=E6=9C=9F=E5=BD=92=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 408 +++++++++---------
.../delivery/api/StudentController.java | 3 -
.../ccsens/delivery/api/UserController.java | 2 -
.../ccsens/delivery/service/UserService.java | 125 +++---
src/main/resources/application.yml | 2 +-
5 files changed, 262 insertions(+), 278 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3c603e8..4c92fdd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,243 +19,229 @@
-
-
-
-
-
com.ccsensptos
- wechatutil
+ util_wechat
1.0-SNAPSHOT
compile
-
-
- org.springframework.boot
- spring-boot-starter-amqp
-
-
- com.ccsensptos
- cloudutil
-
-
org.aspectj
aspectjweaver
-
-
- io.netty
- netty-all
- 4.1.32.Final
-
-
-
- org.springframework.boot
- spring-boot-starter-data-redis
-
-
-
- org.springframework.boot
- spring-boot-starter-cache
-
-
-
-
- org.springframework.boot
- spring-boot-starter-jdbc
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
-
-
-
-
- org.springframework.boot
- spring-boot-starter-jetty
-
-
-
- org.springframework.boot
- spring-boot-configuration-processor
- true
-
org.projectlombok
lombok
true
-
- org.springframework.boot
- spring-boot-starter-test
-
-
- com.vaadin.external.google
- android-json
-
-
- test
-
-
- org.springframework.boot
- spring-boot-starter-actuator
-
+
+
+
+
+
+
-
-
- cn.hutool
- hutool-all
- 4.1.21
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- org.apache.poi
- poi
- 3.17
-
-
- org.apache.poi
- poi-ooxml
- 3.17
-
-
-
- org.springframework.boot
- spring-boot-starter-websocket
-
-
-
-
-
- org.mybatis.spring.boot
- mybatis-spring-boot-starter
- 1.1.1
-
-
-
- com.github.pagehelper
- pagehelper
- 4.1.4
-
-
-
- mysql
- mysql-connector-java
-
-
-
- com.alibaba
- druid
- 1.1.10
-
-
-
- io.jsonwebtoken
- jjwt
- 0.7.0
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- com.fasterxml.jackson.dataformat
- jackson-dataformat-xml
- 2.9.0
-
+
+
+
+
+
+
-
-
-
-
- org.apache.shiro
- shiro-spring
- 1.4.0
-
-
-
- org.apache.shiro
- shiro-ehcache
- 1.4.0
-
-
-
- net.sourceforge.htmlcleaner
- htmlcleaner
- 2.22
-
-
-
- org.apache.commons
- commons-lang3
- 3.8.1
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- io.springfox
- springfox-swagger2
- 2.9.2
-
+
+
+
+
+
+
-
- io.springfox
- springfox-swagger-ui
- 2.9.2
-
-
-
- org.mybatis.generator
- mybatis-generator-core
- 1.3.7
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- org.beanshell
- bsh
- 2.0b5
-
-
-
- org.apache.httpcomponents
- httpclient
- 4.5.1
-
-
-
- org.apache.httpcomponents
- httpcore
- 4.4.3
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- com.alibaba
- fastjson
- 1.2.62
-
diff --git a/src/main/java/com/ccsens/delivery/api/StudentController.java b/src/main/java/com/ccsens/delivery/api/StudentController.java
index 1267fba..4df7f3c 100644
--- a/src/main/java/com/ccsens/delivery/api/StudentController.java
+++ b/src/main/java/com/ccsens/delivery/api/StudentController.java
@@ -2,13 +2,10 @@ package com.ccsens.delivery.api;
import com.ccsens.delivery.annotation.MustLogin;
import com.ccsens.delivery.bean.dto.StudentDto;
-import com.ccsens.delivery.bean.dto.UserDto;
import com.ccsens.delivery.bean.vo.StudentVo;
-import com.ccsens.delivery.bean.vo.UserVo;
import com.ccsens.delivery.service.IStudentService;
import com.ccsens.util.JsonResponse;
import com.ccsens.util.bean.dto.QueryDto;
-import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParams;
diff --git a/src/main/java/com/ccsens/delivery/api/UserController.java b/src/main/java/com/ccsens/delivery/api/UserController.java
index af41a61..d2c2a2d 100644
--- a/src/main/java/com/ccsens/delivery/api/UserController.java
+++ b/src/main/java/com/ccsens/delivery/api/UserController.java
@@ -6,9 +6,7 @@ import com.ccsens.delivery.bean.dto.UserDto;
import com.ccsens.delivery.bean.vo.UserVo;
import com.ccsens.delivery.service.IUserService;
import com.ccsens.util.JsonResponse;
-import com.ccsens.util.WebConstant;
import com.ccsens.util.bean.dto.QueryDto;
-import io.jsonwebtoken.Claims;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
diff --git a/src/main/java/com/ccsens/delivery/service/UserService.java b/src/main/java/com/ccsens/delivery/service/UserService.java
index 2b0ab14..a5f82be 100644
--- a/src/main/java/com/ccsens/delivery/service/UserService.java
+++ b/src/main/java/com/ccsens/delivery/service/UserService.java
@@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
@@ -239,7 +240,8 @@ public class UserService implements IUserService {
*/
@Override
public UserVo.TokenBean generateToken(Long userId, Object authId) {
- Map payLoads = CollectionUtil.newHashMap();
+// Map payLoads = CollectionUtil.newHashMap();
+ Map payLoads = new HashMap<>();
payLoads.put(WebConstant.PARAMETER_KEY_TOKEN_AUTH_ID, String.valueOf(authId));
UserVo.TokenBean tokenBean = new UserVo.TokenBean();
@@ -322,65 +324,65 @@ public class UserService implements IUserService {
return userSignVo;
}
- /**
- * 微信登陆
- * @param code 微信code
- * @return 返回用户信息
- */
- private UserVo.UserSign wxLogin(WebConstant.IDENTIFY_TYPE identifyType, String code) {
- UserVo.UserSign userSignVo;
- //获取微信信息并保存
- log.info("公众号登陆，{}", code);
- WxOauth2UserInfo wxOauth2UserInfo = WxGzhUtil.getOauth2UserInfo(identifyType, code);
- log.info("获取用户的微信信息，{}", wxOauth2UserInfo);
- SysAuth theAuth;
- if (ObjectUtil.isNull(wxOauth2UserInfo)) {
- throw new BaseException(CodeEnum.NOT_SELECT_WX);
- }
- SysAuthExample authExample = new SysAuthExample();
- authExample.createCriteria().andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.OAUTH2_Wx.value)
- .andIdentifierEqualTo(wxOauth2UserInfo.getOpenId()).andCredentialEqualTo(wxOauth2UserInfo.getUnionId());
- List authList = sysAuthDao.selectByExample(authExample);
- if (CollectionUtil.isNotEmpty(authList)) {
- theAuth = authList.get(0);
- log.info("该用户已有微信登录的auth信息，{}", theAuth);
- } else {
- SysAuthExample sysAuthExample = new SysAuthExample();
- sysAuthExample.createCriteria().andCredentialEqualTo(wxOauth2UserInfo.getUnionId());
- List sysAuthList = sysAuthDao.selectByExample(sysAuthExample);
- if (CollectionUtil.isNotEmpty(sysAuthList)) {
- //添加认证方式
- theAuth = new SysAuth();
- theAuth.setId(snowflake.nextId());
- theAuth.setUserId(sysAuthList.get(0).getUserId());
- } else {
- //新建用户并保存微信信息
- SysUser user = new SysUser();
- user.setId(snowflake.nextId());
- user.setAvatarUrl(wxOauth2UserInfo.getHeadImgUrl());
- user.setName(wxOauth2UserInfo.getNickname());
- user.setGender((byte) wxOauth2UserInfo.getSex());
- user.setCountry(wxOauth2UserInfo.getCountry());
- user.setProvince(wxOauth2UserInfo.getProvince());
- user.setCity(wxOauth2UserInfo.getCity());
- sysUserDao.insertSelective(user);
- //添加认证方式
- theAuth = new SysAuth();
- theAuth.setId(snowflake.nextId());
- theAuth.setUserId(user.getId());
- }
- theAuth.setIdentifyType((byte) WebConstant.IDENTIFY_TYPE.OAUTH2_Wx.value);
- theAuth.setIdentifier(wxOauth2UserInfo.getOpenId());
- theAuth.setCredential(wxOauth2UserInfo.getUnionId());
- sysAuthDao.insertSelective(theAuth);
- }
- //2.返回
- userSignVo = new UserVo.UserSign();
- userSignVo.setUserId(theAuth.getUserId());
- userSignVo.setAuthId(theAuth.getId());
- log.info("认证成功返回：{}", userSignVo);
- return userSignVo;
- }
+// /**
+// * 微信登陆
+// * @param code 微信code
+// * @return 返回用户信息
+// */
+// private UserVo.UserSign wxLogin(WebConstant.IDENTIFY_TYPE identifyType, String code) {
+// UserVo.UserSign userSignVo;
+// //获取微信信息并保存
+// log.info("公众号登陆，{}", code);
+// WxOauth2UserInfo wxOauth2UserInfo = WxGzhUtil.getOauth2UserInfo(identifyType, code);
+// log.info("获取用户的微信信息，{}", wxOauth2UserInfo);
+// SysAuth theAuth;
+// if (ObjectUtil.isNull(wxOauth2UserInfo)) {
+// throw new BaseException(CodeEnum.NOT_SELECT_WX);
+// }
+// SysAuthExample authExample = new SysAuthExample();
+// authExample.createCriteria().andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.OAUTH2_Wx.value)
+// .andIdentifierEqualTo(wxOauth2UserInfo.getOpenId()).andCredentialEqualTo(wxOauth2UserInfo.getUnionId());
+// List authList = sysAuthDao.selectByExample(authExample);
+// if (CollectionUtil.isNotEmpty(authList)) {
+// theAuth = authList.get(0);
+// log.info("该用户已有微信登录的auth信息，{}", theAuth);
+// } else {
+// SysAuthExample sysAuthExample = new SysAuthExample();
+// sysAuthExample.createCriteria().andCredentialEqualTo(wxOauth2UserInfo.getUnionId());
+// List sysAuthList = sysAuthDao.selectByExample(sysAuthExample);
+// if (CollectionUtil.isNotEmpty(sysAuthList)) {
+// //添加认证方式
+// theAuth = new SysAuth();
+// theAuth.setId(snowflake.nextId());
+// theAuth.setUserId(sysAuthList.get(0).getUserId());
+// } else {
+// //新建用户并保存微信信息
+// SysUser user = new SysUser();
+// user.setId(snowflake.nextId());
+// user.setAvatarUrl(wxOauth2UserInfo.getHeadImgUrl());
+// user.setName(wxOauth2UserInfo.getNickname());
+// user.setGender((byte) wxOauth2UserInfo.getSex());
+// user.setCountry(wxOauth2UserInfo.getCountry());
+// user.setProvince(wxOauth2UserInfo.getProvince());
+// user.setCity(wxOauth2UserInfo.getCity());
+// sysUserDao.insertSelective(user);
+// //添加认证方式
+// theAuth = new SysAuth();
+// theAuth.setId(snowflake.nextId());
+// theAuth.setUserId(user.getId());
+// }
+// theAuth.setIdentifyType((byte) WebConstant.IDENTIFY_TYPE.OAUTH2_Wx.value);
+// theAuth.setIdentifier(wxOauth2UserInfo.getOpenId());
+// theAuth.setCredential(wxOauth2UserInfo.getUnionId());
+// sysAuthDao.insertSelective(theAuth);
+// }
+// //2.返回
+// userSignVo = new UserVo.UserSign();
+// userSignVo.setUserId(theAuth.getUserId());
+// userSignVo.setAuthId(theAuth.getId());
+// log.info("认证成功返回：{}", userSignVo);
+// return userSignVo;
+// }
/**
@@ -602,7 +604,8 @@ public class UserService implements IUserService {
throw new BaseException(DeliveryCodeError.NOT_REFRESH_TOKEN);
}
//重新生成token
- Map payLoads = CollectionUtil.newHashMap();
+// Map payLoads = CollectionUtil.newHashMap();
+ Map payLoads = new HashMap<>();
payLoads.put(WebConstant.PARAMETER_KEY_TOKEN_AUTH_ID, String.valueOf(authId));
//生成过期时间
long tokenExpired = 3600 * 1000L * 2;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0ee65bb..d7b5c1e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
spring:
profiles:
- active: test
+ active: prod
include: common