zhangye
/
delivery
forked from sd_delivery/delivery
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

20220506一期归档

dev
zhangye 3 years ago
parent
ae39b5ab28
commit
abb5c36c02
5 changed files with 262 additions and 278 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 408
      pom.xml
  2. 3
      src/main/java/com/ccsens/delivery/api/StudentController.java
  3. 2
      src/main/java/com/ccsens/delivery/api/UserController.java
  4. 125
      src/main/java/com/ccsens/delivery/service/UserService.java
  5. 2
      src/main/resources/application.yml

408
pom.xml
View File

@ -19,243 +19,229 @@
</parent> </parent>
<dependencies> <dependencies>
<!-- <dependency>-->
<!-- <groupId>com.ccsensptos</groupId>-->
<!-- <artifactId>util</artifactId>-->
<!-- <version>1.0-SNAPSHOT</version>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>com.ccsensptos</groupId> <groupId>com.ccsensptos</groupId>
<artifactId>wechatutil</artifactId> <artifactId>util_wechat</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
</exclusion>
<exclusion>
<groupId>com.ccsensptos</groupId>
<artifactId>cloudutil</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId> <artifactId>aspectjweaver</artifactId>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.1.32.Final</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!--spring 缓存-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId>
</dependency>
<!--多redis配置-->
<!--<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
</dependency>-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jetty</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <!-- &lt;!&ndash; https://mvnrepository.com/artifact/io.netty/netty-all &ndash;&gt;-->
<groupId>org.springframework.boot</groupId> <!-- <dependency>-->
<artifactId>spring-boot-starter-test</artifactId> <!-- <groupId>io.netty</groupId>-->
<exclusions> <!--排除android-json，与腾讯短信接口qcloudsms冲突--> <!-- <artifactId>netty-all</artifactId>-->
<exclusion> <!-- <version>4.1.32.Final</version>-->
<groupId>com.vaadin.external.google</groupId> <!-- </dependency>-->
<artifactId>android-json</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<!-- hutool-all --> <!-- <dependency>-->
<dependency> <!-- <groupId>org.springframework.boot</groupId>-->
<groupId>cn.hutool</groupId> <!-- <artifactId>spring-boot-starter-data-redis</artifactId>-->
<artifactId>hutool-all</artifactId> <!-- </dependency>-->
<version>4.1.21</version> <!-- &lt;!&ndash;spring 缓存&ndash;&gt;-->
</dependency> <!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-cache</artifactId>-->
<!-- </dependency>-->
<!-- &lt;!&ndash;多redis配置&ndash;&gt;-->
<!-- &lt;!&ndash;<dependency>-->
<!-- <groupId>redis.clients</groupId>-->
<!-- <artifactId>jedis</artifactId>-->
<!-- </dependency>&ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-jdbc</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-web</artifactId>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-tomcat</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-jetty</artifactId>-->
<!-- </dependency>-->
<!--Poi Excel --> <!-- <dependency>-->
<dependency> <!-- <groupId>org.springframework.boot</groupId>-->
<groupId>org.apache.poi</groupId> <!-- <artifactId>spring-boot-configuration-processor</artifactId>-->
<artifactId>poi</artifactId> <!-- <optional>true</optional>-->
<version>3.17</version> <!-- </dependency>-->
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>3.17</version>
</dependency>
<!--websocket-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<!-- spring RabbitMQ-->
<!--<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
</dependency>-->
<!-- spring MyBatis -->
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>1.1.1</version>
</dependency>
<!-- mybatis pagehelper包-->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
<version>4.1.4</version>
</dependency>
<!-- MySQL数据库 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!--Durid数据源-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.1.10</version>
</dependency>
<!--jjwt-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.7.0</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-test</artifactId>-->
<!-- <exclusions> &lt;!&ndash;排除android-json，与腾讯短信接口qcloudsms冲突&ndash;&gt;-->
<!-- <exclusion>-->
<!-- <groupId>com.vaadin.external.google</groupId>-->
<!-- <artifactId>android-json</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-actuator</artifactId>-->
<!-- </dependency>-->
<!--Jackson Xml--> <!-- &lt;!&ndash; hutool-all &ndash;&gt;-->
<dependency> <!-- <dependency>-->
<groupId>com.fasterxml.jackson.dataformat</groupId> <!-- <groupId>cn.hutool</groupId>-->
<artifactId>jackson-dataformat-xml</artifactId> <!-- <artifactId>hutool-all</artifactId>-->
<version>2.9.0</version> <!-- <version>4.1.21</version>-->
</dependency> <!-- </dependency>-->
<!-- ehcache 缓存 --> <!-- &lt;!&ndash;Poi Excel &ndash;&gt;-->
<!--<dependency> <!-- <dependency>-->
<groupId>net.sf.ehcache</groupId> <!-- <groupId>org.apache.poi</groupId>-->
<artifactId>ehcache</artifactId> <!-- <artifactId>poi</artifactId>-->
</dependency>--> <!-- <version>3.17</version>-->
<!--Shiro --> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.apache.shiro</groupId> <!-- <groupId>org.apache.poi</groupId>-->
<artifactId>shiro-spring</artifactId> <!-- <artifactId>poi-ooxml</artifactId>-->
<version>1.4.0</version> <!-- <version>3.17</version>-->
</dependency> <!-- </dependency>-->
<!-- shiro ehcache --> <!-- &lt;!&ndash;websocket&ndash;&gt;-->
<dependency> <!-- <dependency>-->
<groupId>org.apache.shiro</groupId> <!-- <groupId>org.springframework.boot</groupId>-->
<artifactId>shiro-ehcache</artifactId> <!-- <artifactId>spring-boot-starter-websocket</artifactId>-->
<version>1.4.0</version> <!-- </dependency>-->
</dependency> <!-- &lt;!&ndash; spring RabbitMQ&ndash;&gt;-->
<!--HtmlCleaner--> <!-- &lt;!&ndash;<dependency>-->
<dependency> <!-- <groupId>org.springframework.boot</groupId>-->
<groupId>net.sourceforge.htmlcleaner</groupId> <!-- <artifactId>spring-boot-starter-amqp</artifactId>-->
<artifactId>htmlcleaner</artifactId> <!-- </dependency>&ndash;&gt;-->
<version>2.22</version> <!-- &lt;!&ndash; spring MyBatis &ndash;&gt;-->
</dependency> <!-- <dependency>-->
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 --> <!-- <groupId>org.mybatis.spring.boot</groupId>-->
<dependency> <!-- <artifactId>mybatis-spring-boot-starter</artifactId>-->
<groupId>org.apache.commons</groupId> <!-- <version>1.1.1</version>-->
<artifactId>commons-lang3</artifactId> <!-- </dependency>-->
<version>3.8.1</version> <!-- &lt;!&ndash; mybatis pagehelper包&ndash;&gt;-->
</dependency> <!-- <dependency>-->
<!-- <groupId>com.github.pagehelper</groupId>-->
<!-- <artifactId>pagehelper</artifactId>-->
<!-- <version>4.1.4</version>-->
<!-- </dependency>-->
<!-- &lt;!&ndash; MySQL数据库 &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>mysql</groupId>-->
<!-- <artifactId>mysql-connector-java</artifactId>-->
<!-- </dependency>-->
<!-- &lt;!&ndash;Durid数据源&ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.alibaba</groupId>-->
<!-- <artifactId>druid</artifactId>-->
<!-- <version>1.1.10</version>-->
<!-- </dependency>-->
<!-- &lt;!&ndash;jjwt&ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>io.jsonwebtoken</groupId>-->
<!-- <artifactId>jjwt</artifactId>-->
<!-- <version>0.7.0</version>-->
<!-- </dependency>-->
<!--Swagger --> <!-- &lt;!&ndash;Jackson Xml&ndash;&gt;-->
<dependency> <!-- <dependency>-->
<groupId>io.springfox</groupId> <!-- <groupId>com.fasterxml.jackson.dataformat</groupId>-->
<artifactId>springfox-swagger2</artifactId> <!-- <artifactId>jackson-dataformat-xml</artifactId>-->
<version>2.9.2</version> <!-- <version>2.9.0</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- &lt;!&ndash; ehcache 缓存 &ndash;&gt;-->
<groupId>io.springfox</groupId> <!-- &lt;!&ndash;<dependency>-->
<artifactId>springfox-swagger-ui</artifactId> <!-- <groupId>net.sf.ehcache</groupId>-->
<version>2.9.2</version> <!-- <artifactId>ehcache</artifactId>-->
</dependency> <!-- </dependency>&ndash;&gt;-->
<!--mybatis generator包--> <!-- &lt;!&ndash;Shiro &ndash;&gt;-->
<dependency> <!-- <dependency>-->
<groupId>org.mybatis.generator</groupId> <!-- <groupId>org.apache.shiro</groupId>-->
<artifactId>mybatis-generator-core</artifactId> <!-- <artifactId>shiro-spring</artifactId>-->
<version>1.3.7</version> <!-- <version>1.4.0</version>-->
</dependency> <!-- </dependency>-->
<!-- &lt;!&ndash; shiro ehcache &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>org.apache.shiro</groupId>-->
<!-- <artifactId>shiro-ehcache</artifactId>-->
<!-- <version>1.4.0</version>-->
<!-- </dependency>-->
<!-- &lt;!&ndash;HtmlCleaner&ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>net.sourceforge.htmlcleaner</groupId>-->
<!-- <artifactId>htmlcleaner</artifactId>-->
<!-- <version>2.22</version>-->
<!-- </dependency>-->
<!-- &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>org.apache.commons</groupId>-->
<!-- <artifactId>commons-lang3</artifactId>-->
<!-- <version>3.8.1</version>-->
<!-- </dependency>-->
<!-- https://mvnrepository.com/artifact/org.beanshell/bsh -->
<dependency> <!-- &lt;!&ndash;Swagger &ndash;&gt;-->
<groupId>org.beanshell</groupId>
<artifactId>bsh</artifactId>
<version>2.0b5</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.3</version>
</dependency>
<!-- &lt;!&ndash;腾讯短信&ndash;&gt;-->
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>com.github.qcloudsms</groupId>--> <!-- <groupId>io.springfox</groupId>-->
<!-- <artifactId>qcloudsms</artifactId>--> <!-- <artifactId>springfox-swagger2</artifactId>-->
<!-- <version>1.0.5</version>--> <!-- <version>2.9.2</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.springfox</groupId>-->
<!-- <artifactId>springfox-swagger-ui</artifactId>-->
<!-- <version>2.9.2</version>-->
<!-- </dependency>-->
<!-- &lt;!&ndash;mybatis generator包&ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>org.mybatis.generator</groupId>-->
<!-- <artifactId>mybatis-generator-core</artifactId>-->
<!-- <version>1.3.7</version>-->
<!-- </dependency>-->
<!-- &lt;!&ndash; https://mvnrepository.com/artifact/org.beanshell/bsh &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>org.beanshell</groupId>-->
<!-- <artifactId>bsh</artifactId>-->
<!-- <version>2.0b5</version>-->
<!-- </dependency>-->
<!-- &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>org.apache.httpcomponents</groupId>-->
<!-- <artifactId>httpclient</artifactId>-->
<!-- <version>4.5.1</version>-->
<!-- </dependency>-->
<!-- &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>org.apache.httpcomponents</groupId>-->
<!-- <artifactId>httpcore</artifactId>-->
<!-- <version>4.4.3</version>-->
<!-- </dependency>-->
<!--&lt;!&ndash; &lt;!&ndash;腾讯短信&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash; <dependency>&ndash;&gt;-->
<!--&lt;!&ndash; <groupId>com.github.qcloudsms</groupId>&ndash;&gt;-->
<!--&lt;!&ndash; <artifactId>qcloudsms</artifactId>&ndash;&gt;-->
<!--&lt;!&ndash; <version>1.0.5</version>&ndash;&gt;-->
<!--&lt;!&ndash; </dependency>&ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.alibaba</groupId>-->
<!-- <artifactId>fastjson</artifactId>-->
<!-- <version>1.2.62</version>-->
<!-- </dependency>--> <!-- </dependency>-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.62</version>
</dependency>
</dependencies> </dependencies>

3
src/main/java/com/ccsens/delivery/api/StudentController.java
View File

@ -2,13 +2,10 @@ package com.ccsens.delivery.api;
import com.ccsens.delivery.annotation.MustLogin; import com.ccsens.delivery.annotation.MustLogin;
import com.ccsens.delivery.bean.dto.StudentDto; 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.StudentVo;
import com.ccsens.delivery.bean.vo.UserVo;
import com.ccsens.delivery.service.IStudentService; import com.ccsens.delivery.service.IStudentService;
import com.ccsens.util.JsonResponse; import com.ccsens.util.JsonResponse;
import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.util.bean.dto.QueryDto;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;

2
src/main/java/com/ccsens/delivery/api/UserController.java
View File

@ -6,9 +6,7 @@ import com.ccsens.delivery.bean.dto.UserDto;
import com.ccsens.delivery.bean.vo.UserVo; import com.ccsens.delivery.bean.vo.UserVo;
import com.ccsens.delivery.service.IUserService; import com.ccsens.delivery.service.IUserService;
import com.ccsens.util.JsonResponse; import com.ccsens.util.JsonResponse;
import com.ccsens.util.WebConstant;
import com.ccsens.util.bean.dto.QueryDto; import com.ccsens.util.bean.dto.QueryDto;
import io.jsonwebtoken.Claims;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;

125
src/main/java/com/ccsens/delivery/service/UserService.java
View File

@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -239,7 +240,8 @@ public class UserService implements IUserService {
*/ */
@Override @Override
public UserVo.TokenBean generateToken(Long userId, Object authId) { public UserVo.TokenBean generateToken(Long userId, Object authId) {
Map<String, Object> payLoads = CollectionUtil.newHashMap(); // Map<String, Object> payLoads = CollectionUtil.newHashMap();
Map<String, Object> payLoads = new HashMap<>();
payLoads.put(WebConstant.PARAMETER_KEY_TOKEN_AUTH_ID, String.valueOf(authId)); payLoads.put(WebConstant.PARAMETER_KEY_TOKEN_AUTH_ID, String.valueOf(authId));
UserVo.TokenBean tokenBean = new UserVo.TokenBean(); UserVo.TokenBean tokenBean = new UserVo.TokenBean();
@ -322,65 +324,65 @@ public class UserService implements IUserService {
return userSignVo; return userSignVo;
} }
/** // /**
* 微信登陆 // * 微信登陆
* @param code 微信code // * @param code 微信code
* @return 返回用户信息 // * @return 返回用户信息
*/ // */
private UserVo.UserSign wxLogin(WebConstant.IDENTIFY_TYPE identifyType, String code) { // private UserVo.UserSign wxLogin(WebConstant.IDENTIFY_TYPE identifyType, String code) {
UserVo.UserSign userSignVo; // UserVo.UserSign userSignVo;
//获取微信信息并保存 // //获取微信信息并保存
log.info("公众号登陆，{}", code); // log.info("公众号登陆，{}", code);
WxOauth2UserInfo wxOauth2UserInfo = WxGzhUtil.getOauth2UserInfo(identifyType, code); // WxOauth2UserInfo wxOauth2UserInfo = WxGzhUtil.getOauth2UserInfo(identifyType, code);
log.info("获取用户的微信信息，{}", wxOauth2UserInfo); // log.info("获取用户的微信信息，{}", wxOauth2UserInfo);
SysAuth theAuth; // SysAuth theAuth;
if (ObjectUtil.isNull(wxOauth2UserInfo)) { // if (ObjectUtil.isNull(wxOauth2UserInfo)) {
throw new BaseException(CodeEnum.NOT_SELECT_WX); // throw new BaseException(CodeEnum.NOT_SELECT_WX);
} // }
SysAuthExample authExample = new SysAuthExample(); // SysAuthExample authExample = new SysAuthExample();
authExample.createCriteria().andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.OAUTH2_Wx.value) // authExample.createCriteria().andIdentifyTypeEqualTo((byte) WebConstant.IDENTIFY_TYPE.OAUTH2_Wx.value)
.andIdentifierEqualTo(wxOauth2UserInfo.getOpenId()).andCredentialEqualTo(wxOauth2UserInfo.getUnionId()); // .andIdentifierEqualTo(wxOauth2UserInfo.getOpenId()).andCredentialEqualTo(wxOauth2UserInfo.getUnionId());
List<SysAuth> authList = sysAuthDao.selectByExample(authExample); // List<SysAuth> authList = sysAuthDao.selectByExample(authExample);
if (CollectionUtil.isNotEmpty(authList)) { // if (CollectionUtil.isNotEmpty(authList)) {
theAuth = authList.get(0); // theAuth = authList.get(0);
log.info("该用户已有微信登录的auth信息，{}", theAuth); // log.info("该用户已有微信登录的auth信息，{}", theAuth);
} else { // } else {
SysAuthExample sysAuthExample = new SysAuthExample(); // SysAuthExample sysAuthExample = new SysAuthExample();
sysAuthExample.createCriteria().andCredentialEqualTo(wxOauth2UserInfo.getUnionId()); // sysAuthExample.createCriteria().andCredentialEqualTo(wxOauth2UserInfo.getUnionId());
List<SysAuth> sysAuthList = sysAuthDao.selectByExample(sysAuthExample); // List<SysAuth> sysAuthList = sysAuthDao.selectByExample(sysAuthExample);
if (CollectionUtil.isNotEmpty(sysAuthList)) { // if (CollectionUtil.isNotEmpty(sysAuthList)) {
//添加认证方式 // //添加认证方式
theAuth = new SysAuth(); // theAuth = new SysAuth();
theAuth.setId(snowflake.nextId()); // theAuth.setId(snowflake.nextId());
theAuth.setUserId(sysAuthList.get(0).getUserId()); // theAuth.setUserId(sysAuthList.get(0).getUserId());
} else { // } else {
//新建用户并保存微信信息 // //新建用户并保存微信信息
SysUser user = new SysUser(); // SysUser user = new SysUser();
user.setId(snowflake.nextId()); // user.setId(snowflake.nextId());
user.setAvatarUrl(wxOauth2UserInfo.getHeadImgUrl()); // user.setAvatarUrl(wxOauth2UserInfo.getHeadImgUrl());
user.setName(wxOauth2UserInfo.getNickname()); // user.setName(wxOauth2UserInfo.getNickname());
user.setGender((byte) wxOauth2UserInfo.getSex()); // user.setGender((byte) wxOauth2UserInfo.getSex());
user.setCountry(wxOauth2UserInfo.getCountry()); // user.setCountry(wxOauth2UserInfo.getCountry());
user.setProvince(wxOauth2UserInfo.getProvince()); // user.setProvince(wxOauth2UserInfo.getProvince());
user.setCity(wxOauth2UserInfo.getCity()); // user.setCity(wxOauth2UserInfo.getCity());
sysUserDao.insertSelective(user); // sysUserDao.insertSelective(user);
//添加认证方式 // //添加认证方式
theAuth = new SysAuth(); // theAuth = new SysAuth();
theAuth.setId(snowflake.nextId()); // theAuth.setId(snowflake.nextId());
theAuth.setUserId(user.getId()); // theAuth.setUserId(user.getId());
} // }
theAuth.setIdentifyType((byte) WebConstant.IDENTIFY_TYPE.OAUTH2_Wx.value); // theAuth.setIdentifyType((byte) WebConstant.IDENTIFY_TYPE.OAUTH2_Wx.value);
theAuth.setIdentifier(wxOauth2UserInfo.getOpenId()); // theAuth.setIdentifier(wxOauth2UserInfo.getOpenId());
theAuth.setCredential(wxOauth2UserInfo.getUnionId()); // theAuth.setCredential(wxOauth2UserInfo.getUnionId());
sysAuthDao.insertSelective(theAuth); // sysAuthDao.insertSelective(theAuth);
} // }
//2.返回 // //2.返回
userSignVo = new UserVo.UserSign(); // userSignVo = new UserVo.UserSign();
userSignVo.setUserId(theAuth.getUserId()); // userSignVo.setUserId(theAuth.getUserId());
userSignVo.setAuthId(theAuth.getId()); // userSignVo.setAuthId(theAuth.getId());
log.info("认证成功返回：{}", userSignVo); // log.info("认证成功返回：{}", userSignVo);
return userSignVo; // return userSignVo;
} // }
/** /**
@ -602,7 +604,8 @@ public class UserService implements IUserService {
throw new BaseException(DeliveryCodeError.NOT_REFRESH_TOKEN); throw new BaseException(DeliveryCodeError.NOT_REFRESH_TOKEN);
} }
//重新生成token //重新生成token
Map<String, Object> payLoads = CollectionUtil.newHashMap(); // Map<String, Object> payLoads = CollectionUtil.newHashMap();
Map<String, Object> payLoads = new HashMap<>();
payLoads.put(WebConstant.PARAMETER_KEY_TOKEN_AUTH_ID, String.valueOf(authId)); payLoads.put(WebConstant.PARAMETER_KEY_TOKEN_AUTH_ID, String.valueOf(authId));
//生成过期时间 //生成过期时间
long tokenExpired = 3600 * 1000L * 2; long tokenExpired = 3600 * 1000L * 2;

2
src/main/resources/application.yml
View File

@ -1,4 +1,4 @@
spring: spring:
profiles: profiles:
active: test active: prod
include: common include: common

Write Preview
Loading…
Cancel
Save