diff --git a/api-passenger/pom.xml b/api-passenger/pom.xml index 0e1dec6..001da1b 100644 --- a/api-passenger/pom.xml +++ b/api-passenger/pom.xml @@ -40,6 +40,7 @@ org.mashibing internal-common + 1.0-SNAPSHOT diff --git a/api-passenger/src/main/java/com/mashibing/apipassenger/controller/TestController.java b/api-passenger/src/main/java/com/mashibing/apipassenger/controller/TestController.java index b7ea833..255d815 100644 --- a/api-passenger/src/main/java/com/mashibing/apipassenger/controller/TestController.java +++ b/api-passenger/src/main/java/com/mashibing/apipassenger/controller/TestController.java @@ -1,6 +1,7 @@ package com.mashibing.apipassenger.controller; import com.mashibing.apipassenger.request.VerificationCodeDTO; +import com.mashibing.common.dto.ResponseResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -13,4 +14,21 @@ public class TestController { // return "test api passenger."; } + + /** + * 需要有token + * @return + */ + @GetMapping("/authTest") + public ResponseResult authTest(){ + return ResponseResult.success("auth test!"); + } + /** + * 没有token + * @return + */ + @GetMapping("/noAuthTest") + public ResponseResult noAuthTest(){ + return ResponseResult.success("no auth test!"); + } } diff --git a/api-passenger/src/main/java/com/mashibing/apipassenger/controller/VerificationCodeController.java b/api-passenger/src/main/java/com/mashibing/apipassenger/controller/VerificationCodeController.java index 5e386a6..2babfbc 100644 --- a/api-passenger/src/main/java/com/mashibing/apipassenger/controller/VerificationCodeController.java +++ b/api-passenger/src/main/java/com/mashibing/apipassenger/controller/VerificationCodeController.java @@ -30,7 +30,6 @@ public class VerificationCodeController { String passengerPhone = verificationCodeDTO.getPassengerPhone(); System.out.println("verificationCode:" + verificationCode + ",passengerPhone:" + passengerPhone); - return verificationCodeService.checkCode(passengerPhone,verificationCode); } diff --git a/api-passenger/src/main/java/com/mashibing/apipassenger/interceptor/InterceptorConfig.java b/api-passenger/src/main/java/com/mashibing/apipassenger/interceptor/InterceptorConfig.java new file mode 100644 index 0000000..8ed8e4d --- /dev/null +++ b/api-passenger/src/main/java/com/mashibing/apipassenger/interceptor/InterceptorConfig.java @@ -0,0 +1,25 @@ +package com.mashibing.apipassenger.interceptor; + +import com.alibaba.cloud.nacos.discovery.reactive.NacosReactiveDiscoveryClient; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +@Configuration +public class InterceptorConfig implements WebMvcConfigurer { + + @Bean + public JwtInterceptor jwtInterceptor(){ + return new JwtInterceptor(); + } + @Override + public void addInterceptors(InterceptorRegistry registry) { + // /**拦截的更多，子目录也拦截 +// registry.addInterceptor(new JwtInterceptor()) 这个会导致拦截器初始化时，没有初始化redisTemplate,所以要提前new + registry.addInterceptor(jwtInterceptor()) + .addPathPatterns("/**") + .excludePathPatterns("/noAuthTest") + .excludePathPatterns("/verification-code") + .excludePathPatterns("/verification-code-check"); + } +} diff --git a/api-passenger/src/main/java/com/mashibing/apipassenger/interceptor/JwtInterceptor.java b/api-passenger/src/main/java/com/mashibing/apipassenger/interceptor/JwtInterceptor.java new file mode 100644 index 0000000..42c6086 --- /dev/null +++ b/api-passenger/src/main/java/com/mashibing/apipassenger/interceptor/JwtInterceptor.java @@ -0,0 +1,63 @@ +package com.mashibing.apipassenger.interceptor; + +import com.auth0.jwt.exceptions.AlgorithmMismatchException; +import com.auth0.jwt.exceptions.SignatureVerificationException; +import com.auth0.jwt.exceptions.TokenExpiredException; +import com.mashibing.common.constant.TokenConstants; +import com.mashibing.common.dto.ResponseResult; +import com.mashibing.common.dto.TokenResult; +import com.mashibing.common.util.JwtUtils; +import com.mashibing.common.util.RedisPrefixUtils; +import net.sf.json.JSONObject; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.web.servlet.HandlerInterceptor; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.transform.Result; +import java.io.PrintWriter; + +public class JwtInterceptor implements HandlerInterceptor { + @Autowired + private StringRedisTemplate stringRedisTemplate; + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + + boolean result = true; + String resutltString = ""; + + String token = request.getHeader("Authorization"); + // 解析token + TokenResult tokenResult = null; + try { + tokenResult = JwtUtils.parseToken(token); + }catch (Exception e){ + tokenResult = null; + } + + if (tokenResult == null){ + resutltString = "access token invalid"; + result = false; + }else{ + // 拼接key + String phone = tokenResult.getPhone(); + String identity = tokenResult.getIdentity(); + + String tokenKey = RedisPrefixUtils.generateTokenKey(phone,identity, TokenConstants.ACCESS_TOKEN_TYPE); + // 从redis中取出token + String tokenRedis = stringRedisTemplate.opsForValue().get(tokenKey); + if ((StringUtils.isBlank(tokenRedis)) || (!token.trim().equals(tokenRedis.trim()))){ + resutltString = "access token invalid"; + result = false; + } + } + + if (!result){//输出到前台页面数据 + PrintWriter out = response.getWriter(); + out.print(JSONObject.fromObject(ResponseResult.fail(resutltString)).toString()); + } + return result; + } +} diff --git a/api-passenger/src/main/java/com/mashibing/apipassenger/service/VerificationCodeService.java b/api-passenger/src/main/java/com/mashibing/apipassenger/service/VerificationCodeService.java index a611125..0183144 100644 --- a/api-passenger/src/main/java/com/mashibing/apipassenger/service/VerificationCodeService.java +++ b/api-passenger/src/main/java/com/mashibing/apipassenger/service/VerificationCodeService.java @@ -4,11 +4,14 @@ import com.mashibing.apipassenger.remote.ServicePassengerUserClient; import com.mashibing.apipassenger.remote.ServiceVefificationcodeClient; import com.mashibing.common.constant.CommonStatusEnum; import com.mashibing.common.constant.IdentityConstant; +import com.mashibing.common.constant.TokenConstants; import com.mashibing.common.dto.ResponseResult; import com.mashibing.common.request.VerificationCodeDTO; import com.mashibing.common.response.NumberCodeResponse; import com.mashibing.common.response.TokenResponse; import com.mashibing.common.util.JwtUtils; +import com.mashibing.common.util.RedisPrefixUtils; +import jdk.nashorn.internal.parser.TokenType; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -27,7 +30,7 @@ public class VerificationCodeService { @Autowired private StringRedisTemplate stringRedisTemplate; - private String verificationCodePrefix = "verification-code-"; + /** * 生成验证码 @@ -43,7 +46,7 @@ public class VerificationCodeService { //存入redis System.out.println("存入redis"); - String key = this.generateKeyByCode(passengerPhone); + String key = RedisPrefixUtils.generateKeyByCode(passengerPhone); stringRedisTemplate.opsForValue().set(key, "" + numberCode,2, TimeUnit.MINUTES); //发送短信。。。 @@ -52,9 +55,6 @@ public class VerificationCodeService { } - private String generateKeyByCode(String passengerPhone){ - return this.verificationCodePrefix + passengerPhone; - } /** * 校验验证码 * @param passengerPhone @@ -63,7 +63,7 @@ public class VerificationCodeService { */ public ResponseResult checkCode(String passengerPhone, String verificationCode) { System.out.println("根据手机号和验证码，查询redis"); - String key = this.generateKeyByCode(passengerPhone); + String key = RedisPrefixUtils.generateKeyByCode(passengerPhone); String codeRedis = stringRedisTemplate.opsForValue().get(key); System.out.println("code in redis:" + codeRedis); @@ -80,12 +80,22 @@ public class VerificationCodeService { servicePassengerUserClient.loginOrRegister(verificationCodeDTO); System.out.println("颁发token"); - String token = JwtUtils.generateToken(passengerPhone, IdentityConstant.PASSENGER_IDENTITY); + String accessToken = JwtUtils.generateToken(passengerPhone, IdentityConstant.PASSENGER_IDENTITY, TokenConstants.ACCESS_TOKEN_TYPE); + String refreshToken = JwtUtils.generateToken(passengerPhone, IdentityConstant.PASSENGER_IDENTITY, TokenConstants.REFRESH_TOKEN_TYPE); + + //token存入Redis + String accessTokenRedisKey = RedisPrefixUtils.generateTokenKey(passengerPhone, IdentityConstant.PASSENGER_IDENTITY, TokenConstants.ACCESS_TOKEN_TYPE); + String refreshTokenRedisKey = RedisPrefixUtils.generateTokenKey(passengerPhone, IdentityConstant.PASSENGER_IDENTITY, TokenConstants.REFRESH_TOKEN_TYPE); + stringRedisTemplate.opsForValue().set(accessTokenRedisKey, accessToken, 30,TimeUnit.DAYS); + stringRedisTemplate.opsForValue().set(refreshTokenRedisKey, refreshToken, 31,TimeUnit.DAYS); TokenResponse tokenResponse = new TokenResponse(); - tokenResponse.setToken(token); + tokenResponse.setAccessToken(accessToken); + tokenResponse.setRefreshToken(refreshToken); return ResponseResult.success(tokenResponse); } + + } diff --git a/api-passenger/target/api-passenger-1.0-SNAPSHOT.jar b/api-passenger/target/api-passenger-1.0-SNAPSHOT.jar deleted file mode 100644 index 493f4d3..0000000 Binary files a/api-passenger/target/api-passenger-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/api-passenger/target/classes/com/mashibing/apipassenger/controller/TestController.class b/api-passenger/target/classes/com/mashibing/apipassenger/controller/TestController.class index d8b816f..00bd3f6 100644 Binary files a/api-passenger/target/classes/com/mashibing/apipassenger/controller/TestController.class and b/api-passenger/target/classes/com/mashibing/apipassenger/controller/TestController.class differ diff --git a/api-passenger/target/classes/com/mashibing/apipassenger/controller/VerificationCodeController.class b/api-passenger/target/classes/com/mashibing/apipassenger/controller/VerificationCodeController.class index dd4419a..f23b6b8 100644 Binary files a/api-passenger/target/classes/com/mashibing/apipassenger/controller/VerificationCodeController.class and b/api-passenger/target/classes/com/mashibing/apipassenger/controller/VerificationCodeController.class differ diff --git a/api-passenger/target/classes/com/mashibing/apipassenger/interceptor/InterceptorConfig.class b/api-passenger/target/classes/com/mashibing/apipassenger/interceptor/InterceptorConfig.class new file mode 100644 index 0000000..957d01d Binary files /dev/null and b/api-passenger/target/classes/com/mashibing/apipassenger/interceptor/InterceptorConfig.class differ diff --git a/api-passenger/target/classes/com/mashibing/apipassenger/interceptor/JwtInterceptor.class b/api-passenger/target/classes/com/mashibing/apipassenger/interceptor/JwtInterceptor.class new file mode 100644 index 0000000..18cd050 Binary files /dev/null and b/api-passenger/target/classes/com/mashibing/apipassenger/interceptor/JwtInterceptor.class differ diff --git a/api-passenger/target/classes/com/mashibing/apipassenger/service/VerificationCodeService.class b/api-passenger/target/classes/com/mashibing/apipassenger/service/VerificationCodeService.class index 6185027..ad351ea 100644 Binary files a/api-passenger/target/classes/com/mashibing/apipassenger/service/VerificationCodeService.class and b/api-passenger/target/classes/com/mashibing/apipassenger/service/VerificationCodeService.class differ diff --git a/api-passenger/target/maven-archiver/pom.properties b/api-passenger/target/maven-archiver/pom.properties deleted file mode 100644 index bac587d..0000000 --- a/api-passenger/target/maven-archiver/pom.properties +++ /dev/null @@ -1,3 +0,0 @@ -artifactId=api-passenger -groupId=org.mashibing -version=1.0-SNAPSHOT diff --git a/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index b734a5f..0000000 --- a/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,5 +0,0 @@ -com\mashibing\apipassenger\request\VerificationCodeDTO.class -com\mashibing\apipassenger\ApiPassengerApplication.class -com\mashibing\apipassenger\controller\TestController.class -com\mashibing\apipassenger\service\VerificationCodeService.class -com\mashibing\apipassenger\controller\VerificationCodeController.class diff --git a/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 9a861f6..0000000 --- a/api-passenger/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,5 +0,0 @@ -D:\Works\workspaces\online-taxi-public\api-passenger\src\main\java\com\mashibing\apipassenger\controller\VerificationCodeController.java -D:\Works\workspaces\online-taxi-public\api-passenger\src\main\java\com\mashibing\apipassenger\request\VerificationCodeDTO.java -D:\Works\workspaces\online-taxi-public\api-passenger\src\main\java\com\mashibing\apipassenger\service\VerificationCodeService.java -D:\Works\workspaces\online-taxi-public\api-passenger\src\main\java\com\mashibing\apipassenger\ApiPassengerApplication.java -D:\Works\workspaces\online-taxi-public\api-passenger\src\main\java\com\mashibing\apipassenger\controller\TestController.java diff --git a/api-passenger/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/api-passenger/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/internal-common/src/main/java/com/mashibing/common/constant/TokenConstants.java b/internal-common/src/main/java/com/mashibing/common/constant/TokenConstants.java new file mode 100644 index 0000000..5a17018 --- /dev/null +++ b/internal-common/src/main/java/com/mashibing/common/constant/TokenConstants.java @@ -0,0 +1,11 @@ +package com.mashibing.common.constant; + +/** + * token常量类 + */ +public class TokenConstants { + + public static final String ACCESS_TOKEN_TYPE = "accessToken"; + + public static final String REFRESH_TOKEN_TYPE = "refreshToken"; +} diff --git a/internal-common/src/main/java/com/mashibing/common/dto/TokenResult.java b/internal-common/src/main/java/com/mashibing/common/dto/TokenResult.java index eee7e4c..09206fa 100644 --- a/internal-common/src/main/java/com/mashibing/common/dto/TokenResult.java +++ b/internal-common/src/main/java/com/mashibing/common/dto/TokenResult.java @@ -6,4 +6,5 @@ import lombok.Data; public class TokenResult { private String phone; private String identity; + private String tokenType; } diff --git a/internal-common/src/main/java/com/mashibing/common/response/TokenResponse.java b/internal-common/src/main/java/com/mashibing/common/response/TokenResponse.java index 3e34230..7912a2c 100644 --- a/internal-common/src/main/java/com/mashibing/common/response/TokenResponse.java +++ b/internal-common/src/main/java/com/mashibing/common/response/TokenResponse.java @@ -4,5 +4,6 @@ import lombok.Data; @Data public class TokenResponse { - private String token; + private String accessToken; + private String refreshToken; } diff --git a/internal-common/src/main/java/com/mashibing/common/util/JwtUtils.java b/internal-common/src/main/java/com/mashibing/common/util/JwtUtils.java index 4c7c41d..1b4365d 100644 --- a/internal-common/src/main/java/com/mashibing/common/util/JwtUtils.java +++ b/internal-common/src/main/java/com/mashibing/common/util/JwtUtils.java @@ -4,6 +4,7 @@ import com.auth0.jwt.JWT; import com.auth0.jwt.JWTCreator; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.interfaces.DecodedJWT; +import com.mashibing.common.constant.TokenConstants; import com.mashibing.common.dto.TokenResult; import java.util.Calendar; @@ -17,11 +18,13 @@ public class JwtUtils { private static final String JWT_KEY_PHONE = "phone"; //乘客是1，司机是2 private static final String JWT_KET_IDENTITY = "identity"; + private static final String JWT_KET_TOKEN_TYPE = "tokenType"; - public static String generateToken(String phone, String identity){ + public static String generateToken(String phone, String identity, String tokenType){ Map map = new HashMap(); map.put(JwtUtils.JWT_KEY_PHONE,phone); map.put(JwtUtils.JWT_KET_IDENTITY,identity); + map.put(JwtUtils.JWT_KET_TOKEN_TYPE,tokenType); Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.DATE,1); @@ -31,7 +34,7 @@ public class JwtUtils { map.forEach((k,v) -> { builder.withClaim(k,v); }); - builder.withExpiresAt(date); +// builder.withExpiresAt(date); String token = builder.sign(Algorithm.HMAC256(SIGN)); return token; @@ -39,16 +42,18 @@ public class JwtUtils { public static TokenResult parseToken(String token){ DecodedJWT decodedJWT = JWT.require(Algorithm.HMAC256(SIGN)).build().verify(token); - String phone = decodedJWT.getClaim(JwtUtils.JWT_KEY_PHONE).toString(); - String identity = decodedJWT.getClaim(JwtUtils.JWT_KET_IDENTITY).toString(); + String phone = decodedJWT.getClaim(JwtUtils.JWT_KEY_PHONE).asString();//不能写toString，会多带“”双引号 + String identity = decodedJWT.getClaim(JwtUtils.JWT_KET_IDENTITY).asString(); + String tokenType = decodedJWT.getClaim(JwtUtils.JWT_KET_TOKEN_TYPE).asString(); TokenResult tokenResult = new TokenResult(); + tokenResult.setTokenType(tokenType); tokenResult.setIdentity(identity); tokenResult.setPhone(phone); return tokenResult; } public static void main(String[] args) { - String token = JwtUtils.generateToken("13751145166","1"); + String token = JwtUtils.generateToken("13751145166","1", TokenConstants.ACCESS_TOKEN_TYPE); System.out.println("token:" + token); TokenResult result = JwtUtils.parseToken(token); System.out.println("phone parsed:" + result.toString()); diff --git a/internal-common/src/main/java/com/mashibing/common/util/RedisPrefixUtils.java b/internal-common/src/main/java/com/mashibing/common/util/RedisPrefixUtils.java new file mode 100644 index 0000000..e60b20a --- /dev/null +++ b/internal-common/src/main/java/com/mashibing/common/util/RedisPrefixUtils.java @@ -0,0 +1,14 @@ +package com.mashibing.common.util; + +public class RedisPrefixUtils { + private static String verificationCodePrefix = "verification-code-"; + private static String tokenKeyPrefix = "token-"; + + public static String generateKeyByCode(String passengerPhone){ + return verificationCodePrefix + passengerPhone; + } + + public static String generateTokenKey(String phone,String identity, String tokenType){ + return tokenKeyPrefix + phone + "-" + identity + "-" + tokenType; + } +} diff --git a/internal-common/target/classes/com/mashibing/common/constant/IdentityConstant.class b/internal-common/target/classes/com/mashibing/common/constant/IdentityConstant.class new file mode 100644 index 0000000..fc5ea0c Binary files /dev/null and b/internal-common/target/classes/com/mashibing/common/constant/IdentityConstant.class differ diff --git a/internal-common/target/classes/com/mashibing/common/constant/TokenConstants.class b/internal-common/target/classes/com/mashibing/common/constant/TokenConstants.class new file mode 100644 index 0000000..8f9a1a3 Binary files /dev/null and b/internal-common/target/classes/com/mashibing/common/constant/TokenConstants.class differ diff --git a/internal-common/target/classes/com/mashibing/common/dto/TokenResult.class b/internal-common/target/classes/com/mashibing/common/dto/TokenResult.class index c378acc..e9dd800 100644 Binary files a/internal-common/target/classes/com/mashibing/common/dto/TokenResult.class and b/internal-common/target/classes/com/mashibing/common/dto/TokenResult.class differ diff --git a/internal-common/target/classes/com/mashibing/common/response/TokenResponse.class b/internal-common/target/classes/com/mashibing/common/response/TokenResponse.class index 1097e60..2b24f11 100644 Binary files a/internal-common/target/classes/com/mashibing/common/response/TokenResponse.class and b/internal-common/target/classes/com/mashibing/common/response/TokenResponse.class differ diff --git a/internal-common/target/classes/com/mashibing/common/util/JwtUtils.class b/internal-common/target/classes/com/mashibing/common/util/JwtUtils.class index 816082a..2b410ac 100644 Binary files a/internal-common/target/classes/com/mashibing/common/util/JwtUtils.class and b/internal-common/target/classes/com/mashibing/common/util/JwtUtils.class differ diff --git a/internal-common/target/classes/com/mashibing/common/util/RedisPrefixUtils.class b/internal-common/target/classes/com/mashibing/common/util/RedisPrefixUtils.class new file mode 100644 index 0000000..a116f02 Binary files /dev/null and b/internal-common/target/classes/com/mashibing/common/util/RedisPrefixUtils.class differ diff --git a/internal-common/target/internal-common-1.0-SNAPSHOT.jar b/internal-common/target/internal-common-1.0-SNAPSHOT.jar index 529a24b..704a6b6 100644 Binary files a/internal-common/target/internal-common-1.0-SNAPSHOT.jar and b/internal-common/target/internal-common-1.0-SNAPSHOT.jar differ diff --git a/internal-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/internal-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 8eead35..03d8b46 100644 --- a/internal-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/internal-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,5 +1 @@ -com\mashibing\common\dto\ResponseResult.class -com\mashibing\common\request\VerificationCodeDTO.class -com\mashibing\common\constant\CommonStatusEnum.class -com\mashibing\common\response\NumberCodeResponse.class -com\mashibing\common\response\TokenResponse.class +com\mashibing\common\util\RedisPrefixUtils.class diff --git a/internal-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/internal-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 74e3b0e..c0f5ee4 100644 --- a/internal-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/internal-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,5 +1,9 @@ +D:\Works\workspaces\online-taxi-public\internal-common\src\main\java\com\mashibing\common\constant\IdentityConstant.java D:\Works\workspaces\online-taxi-public\internal-common\src\main\java\com\mashibing\common\constant\CommonStatusEnum.java D:\Works\workspaces\online-taxi-public\internal-common\src\main\java\com\mashibing\common\dto\ResponseResult.java D:\Works\workspaces\online-taxi-public\internal-common\src\main\java\com\mashibing\common\response\NumberCodeResponse.java +D:\Works\workspaces\online-taxi-public\internal-common\src\main\java\com\mashibing\common\constant\TokenConstants.java D:\Works\workspaces\online-taxi-public\internal-common\src\main\java\com\mashibing\common\request\VerificationCodeDTO.java D:\Works\workspaces\online-taxi-public\internal-common\src\main\java\com\mashibing\common\response\TokenResponse.java +D:\Works\workspaces\online-taxi-public\internal-common\src\main\java\com\mashibing\common\util\JwtUtils.java +D:\Works\workspaces\online-taxi-public\internal-common\src\main\java\com\mashibing\common\dto\TokenResult.java diff --git a/api-passenger/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/internal-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst similarity index 100% rename from api-passenger/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst rename to internal-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst diff --git a/pom.xml b/pom.xml index 0baaa84..1861b99 100644 --- a/pom.xml +++ b/pom.xml @@ -74,12 +74,6 @@ import - - org.mashibing - internal-common - 1.0-SNAPSHOT - - diff --git a/service-passenger-user/pom.xml b/service-passenger-user/pom.xml index cc52276..a8291ef 100644 --- a/service-passenger-user/pom.xml +++ b/service-passenger-user/pom.xml @@ -35,6 +35,7 @@ org.mashibing internal-common + 1.0-SNAPSHOT com.alibaba.cloud diff --git a/service-verificationcode/pom.xml b/service-verificationcode/pom.xml index 06914c0..8b955db 100644 --- a/service-verificationcode/pom.xml +++ b/service-verificationcode/pom.xml @@ -37,6 +37,7 @@ org.mashibing internal-common + 1.0-SNAPSHOT