From 7c31b75ddb67608b0a86ce2317608f275d44a872 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 14 May 2020 10:56:02 +0800
Subject: [PATCH] modify swagger some config
---
src/main/java/com/xcong/excoin/configurations/SwaggerConfig.java | 6 ++++--
src/main/java/com/xcong/excoin/common/system/dto/LoginDto.java | 4 ++--
src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java | 1 -
src/main/java/com/xcong/excoin/common/system/controller/LoginController.java | 31 +++++++++++++++++++++++--------
src/main/java/com/xcong/excoin/configurations/properties/SecurityProperties.java | 2 ++
src/main/resources/application.yml | 1 +
6 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java b/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java
index 7d601a7..e10dc75 100644
--- a/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java
+++ b/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java
@@ -1,11 +1,15 @@
package com.xcong.excoin.common.system.controller;
import cn.hutool.core.util.IdUtil;
+import cn.hutool.crypto.asymmetric.KeyType;
+import cn.hutool.crypto.asymmetric.RSA;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.common.system.bean.LoginUserBean;
import com.xcong.excoin.common.system.dto.LoginDto;
+import com.xcong.excoin.configurations.properties.ApplicationProperties;
+import com.xcong.excoin.configurations.properties.SecurityProperties;
import com.xcong.excoin.utils.RedisUtils;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
@@ -32,8 +36,11 @@
@RequestMapping(value = "/")
public class LoginController {
- @Value("${rsa.private_key}")
- private String privateKey;
+ @Resource
+ private ApplicationProperties applicationProperties;
+
+ @Resource
+ private SecurityProperties securityProperties;
@Resource
private AuthenticationManagerBuilder authenticationManagerBuilder;
@@ -48,12 +55,20 @@
String token = IdUtil.simpleUUID();
LoginUserBean loginUserBean = (LoginUserBean) authentication.getPrincipal();
redisUtils.set(AppContants.APP_LOGIN_PREFIX + token, JSONObject.toJSONString(loginUserBean), 300000);
- Map<String, Object> authInfo = new HashMap<String, Object>(2){
- {
- put("token", token);
- put("user", loginUserBean);
- }
- };
+ Map<String, Object> authInfo = new HashMap<>();
+ if (applicationProperties.isDebug()) {
+ authInfo.put("token", token);
+ authInfo.put("rsaToken", generateAsaToken(token));
+ authInfo.put("user", loginUserBean);
+ } else {
+ authInfo.put("token", token);
+ authInfo.put("user", loginUserBean);
+ }
return Result.ok("success", authInfo);
}
+
+ public String generateAsaToken(String token) {
+ RSA rsa = new RSA(null, securityProperties.getPublicKey());
+ return rsa.encryptBase64(token + "_" +System.currentTimeMillis(), KeyType.PublicKey);
+ }
}
diff --git a/src/main/java/com/xcong/excoin/common/system/dto/LoginDto.java b/src/main/java/com/xcong/excoin/common/system/dto/LoginDto.java
index af17f24..1721f62 100644
--- a/src/main/java/com/xcong/excoin/common/system/dto/LoginDto.java
+++ b/src/main/java/com/xcong/excoin/common/system/dto/LoginDto.java
@@ -15,11 +15,11 @@
public class LoginDto {
- @ApiModelProperty(value = "用户名", example = "123")
+ @ApiModelProperty(value = "用户名", example = "11111")
@NotBlank(message = "用户名或密码错误")
private String username;
- @ApiModelProperty(value = "密码", example = "3333")
+ @ApiModelProperty(value = "密码", example = "123456")
@NotBlank(message = "用户名或密码错误")
private String password;
}
diff --git a/src/main/java/com/xcong/excoin/configurations/SwaggerConfig.java b/src/main/java/com/xcong/excoin/configurations/SwaggerConfig.java
index 1d1c0aa..1b79633 100644
--- a/src/main/java/com/xcong/excoin/configurations/SwaggerConfig.java
+++ b/src/main/java/com/xcong/excoin/configurations/SwaggerConfig.java
@@ -1,5 +1,7 @@
package com.xcong.excoin.configurations;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
+import io.swagger.annotations.Api;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder;
@@ -34,8 +36,8 @@
parameterBuilder.name("Authorization").description("令牌").modelRef(new ModelRef("string")).parameterType("header")
.required(false).build();
parameters.add(parameterBuilder.build());
- return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select().apis(RequestHandlerSelectors.any())
- .paths(PathSelectors.any()).build().globalOperationParameters(parameters);
+ return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select().apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
+ .paths(PathSelectors.any()).build().globalOperationParameters(parameters).ignoredParameterTypes(MemberEntity.class);
}
private ApiInfo apiInfo(){
diff --git a/src/main/java/com/xcong/excoin/configurations/properties/SecurityProperties.java b/src/main/java/com/xcong/excoin/configurations/properties/SecurityProperties.java
index 0227458..abf0d06 100644
--- a/src/main/java/com/xcong/excoin/configurations/properties/SecurityProperties.java
+++ b/src/main/java/com/xcong/excoin/configurations/properties/SecurityProperties.java
@@ -14,4 +14,6 @@
public class SecurityProperties {
private String privateKey;
+
+ private String publicKey;
}
diff --git a/src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java b/src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java
index 6ebf4d8..c697505 100644
--- a/src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java
+++ b/src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java
@@ -73,7 +73,6 @@
String rsaToken = bearerToken.replace(AppContants.TOKEN_START_WITH, "");
RSA rsa = new RSA(securityProperties.getPrivateKey(), null);
String[] tokens = StrUtil.split(rsa.decryptStr(rsaToken, KeyType.PrivateKey), "_");
-
if (verifyTokenExpired(Long.parseLong(tokens[1]))) {
return tokens[0];
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c6e5be1..e418a9f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -77,4 +77,5 @@
debug: true
rsa:
+ public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCCf8UFZK54AiK4PRu7tNd+Z8qZ77o/QXCnk25DRmygVpOEu5mGNSAvfnWmKp2pEV2RljeXq3Rid/+LQkonaebMJeXKSF0yxL/VgyeT8JaQ5gNbOrdfdlc+mFkXJyzyJt8YkvApEdPRNSU2ENBn7mgRfD0BYPM4vZ6/rv+de38FJwIDAQAB
private_key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIJ/xQVkrngCIrg9G7u0135nypnvuj9BcKeTbkNGbKBWk4S7mYY1IC9+daYqnakRXZGWN5erdGJ3/4tCSidp5swl5cpIXTLEv9WDJ5PwlpDmA1s6t192Vz6YWRcnLPIm3xiS8CkR09E1JTYQ0GfuaBF8PQFg8zi9nr+u/517fwUnAgMBAAECgYBhPt9NvpI4wbanvnndLczr2GJkxfzvSE+vwLCJF4C5FusFHVsxZINggQcg1V75bwRgCiXRMyYefreCSdrCditS43PzTOmE4RRrpxLlm8oubJc0C98LQ2qlN9AsUqL5IHpVGgbHDyWAwjc1GBID6nwXKpxq1/VodFqhahG9D5EZsQJBALnkb+5VTxQbiyQI4Uc9NIvAyVcNY1OisbvY6tvNgdBbJkADgAb78M1HWxxYjUqsvzggNHc7cWqWBHMgpnJaqm8CQQCztze4D7uAk7OC9MJHY5eE980J8Kk+GEZKxz4LahzU6V6dcb9GFac3wEtgilj/tOAn9y0/Q8sm9vvCIbMDzgzJAkEAqRYcqhF26LdVDOX25DHMBgLKISDQZFbsjA13M4/usHL4i+mjHrc0BcUOHu59NpuDI65HitzLAUSLr5zXSdUmiQJAW77wOg4GCejdXsB3IhzMsHwU97sdm26nC+vVV9xvJZ6Rx8zW+f9543NOx9U5BCmhuaVtOvvwDU9PTVcI3atmSQJAXAIJ5gGdtXx0DXiX4VvzNFHqgaqHMGvXyjNVkU2FYQbSAd2A6app4uRO+BkZu9dSjh14m+oXMnV2HzAN2rRnjA==
--
Gitblit v1.9.1