diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 60d7971..0000000 --- a/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -# ---> AL -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json -*.code-workspace - -# Local History for Visual Studio Code -.history/ -*.app -.snapshots/* - diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 0b8ae76..0000000 --- a/LICENSE +++ /dev/null @@ -1,5 +0,0 @@ -Copyright (C) YEAR by AUTHOR EMAIL - -Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/README.md b/README.md deleted file mode 100644 index c8ed5e9..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# workspace - -代码仓库 \ No newline at end of file diff --git a/online-taxt-public/.idea/.gitignore b/online-taxt-public/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/online-taxt-public/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/online-taxt-public/.idea/compiler.xml b/online-taxt-public/.idea/compiler.xml new file mode 100644 index 0000000..994bc5c --- /dev/null +++ b/online-taxt-public/.idea/compiler.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/online-taxt-public/.idea/encodings.xml b/online-taxt-public/.idea/encodings.xml new file mode 100644 index 0000000..7bbc600 --- /dev/null +++ b/online-taxt-public/.idea/encodings.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/online-taxt-public/.idea/jarRepositories.xml b/online-taxt-public/.idea/jarRepositories.xml new file mode 100644 index 0000000..22e83c6 --- /dev/null +++ b/online-taxt-public/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/online-taxt-public/.idea/misc.xml b/online-taxt-public/.idea/misc.xml new file mode 100644 index 0000000..be5f75e --- /dev/null +++ b/online-taxt-public/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/online-taxt-public/.idea/runConfigurations.xml b/online-taxt-public/.idea/runConfigurations.xml new file mode 100644 index 0000000..797acea --- /dev/null +++ b/online-taxt-public/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/online-taxt-public/.idea/uiDesigner.xml b/online-taxt-public/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/online-taxt-public/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/online-taxt-public/api-passager/pom.xml b/online-taxt-public/api-passager/pom.xml new file mode 100644 index 0000000..00c88ca --- /dev/null +++ b/online-taxt-public/api-passager/pom.xml @@ -0,0 +1,55 @@ + + + + online-taxt-public + com.shanshi + 1.0-SNAPSHOT + + 4.0.0 + + api-passager + + + 8 + 8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.projectlombok + lombok + true + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + \ No newline at end of file diff --git a/online-taxt-public/api-passager/src/main/java/com/shanshi/apiPassenger/ApiPassengerApplication.java b/online-taxt-public/api-passager/src/main/java/com/shanshi/apiPassenger/ApiPassengerApplication.java new file mode 100644 index 0000000..971ddc3 --- /dev/null +++ b/online-taxt-public/api-passager/src/main/java/com/shanshi/apiPassenger/ApiPassengerApplication.java @@ -0,0 +1,17 @@ +package com.shanshi.apiPassenger; + + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; + +@SpringBootApplication +@EnableDiscoveryClient +@EnableFeignClients +public class ApiPassengerApplication { + + public static void main(String[] args) { + SpringApplication.run(ApiPassengerApplication.class); + } +} diff --git a/online-taxt-public/api-passager/src/main/java/com/shanshi/apiPassenger/controller/VerificationCodeController.java b/online-taxt-public/api-passager/src/main/java/com/shanshi/apiPassenger/controller/VerificationCodeController.java new file mode 100644 index 0000000..48aa6db --- /dev/null +++ b/online-taxt-public/api-passager/src/main/java/com/shanshi/apiPassenger/controller/VerificationCodeController.java @@ -0,0 +1,47 @@ +package com.shanshi.apiPassenger.controller; + +import com.shanshi.apiPassenger.service.impl.VerificationCodeServiceImpl; +import com.shanshi.internalcommon.dto.ResponseResult; +import com.shanshi.internalcommon.request.VerificationCodeDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class VerificationCodeController { + + @Autowired + private VerificationCodeServiceImpl verificationCodeService; + + /** + * 乘客获取手机号并发送验证码 + * @param verificationCodeDTO + * @return + */ + @GetMapping("/verification-code") + public ResponseResult verificationCodeController(@RequestBody VerificationCodeDTO verificationCodeDTO){ + + //得到手机号 + String passengerPhone = verificationCodeDTO.getPassengerPhone(); + + return verificationCodeService.generatorCode(passengerPhone); + } + + /** + * 检验验证码 + * @param verificationCodeDTO + * @return + */ + @PostMapping("/verification-code-check") + public ResponseResult checkVerificationCode(@RequestBody VerificationCodeDTO verificationCodeDTO){ + + String passengerPhone = verificationCodeDTO.getPassengerPhone(); + String verificationCode = verificationCodeDTO.getVerificationCode(); + + System.out.println("手机号:"+passengerPhone+"验证码:"+verificationCode); + + return verificationCodeService.checkCode(passengerPhone,verificationCode); + } +} diff --git a/online-taxt-public/api-passager/src/main/java/com/shanshi/apiPassenger/remote/ServiceVefificationCodeClient.java b/online-taxt-public/api-passager/src/main/java/com/shanshi/apiPassenger/remote/ServiceVefificationCodeClient.java new file mode 100644 index 0000000..56d77a4 --- /dev/null +++ b/online-taxt-public/api-passager/src/main/java/com/shanshi/apiPassenger/remote/ServiceVefificationCodeClient.java @@ -0,0 +1,15 @@ +package com.shanshi.apiPassenger.remote; + +import com.shanshi.internalcommon.dto.ResponseResult; +import com.shanshi.internalcommon.response.NumberCodeResponse; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +@FeignClient("service-verificationcode") +public interface ServiceVefificationCodeClient { + + @RequestMapping(method = RequestMethod.GET,value = "/numberCode/{size}") + ResponseResult getNumberCode(@PathVariable("size") int size); +} diff --git a/online-taxt-public/api-passager/src/main/java/com/shanshi/apiPassenger/service/VerificationCodeService.java b/online-taxt-public/api-passager/src/main/java/com/shanshi/apiPassenger/service/VerificationCodeService.java new file mode 100644 index 0000000..c3807ad --- /dev/null +++ b/online-taxt-public/api-passager/src/main/java/com/shanshi/apiPassenger/service/VerificationCodeService.java @@ -0,0 +1,12 @@ +package com.shanshi.apiPassenger.service; + +import com.shanshi.internalcommon.dto.ResponseResult; +import org.springframework.stereotype.Service; + +@Service +public interface VerificationCodeService { + + public ResponseResult generatorCode(String passengerPhone); + + public ResponseResult checkCode(String passengerPhone,String verificationCode); +} diff --git a/online-taxt-public/api-passager/src/main/java/com/shanshi/apiPassenger/service/impl/VerificationCodeServiceImpl.java b/online-taxt-public/api-passager/src/main/java/com/shanshi/apiPassenger/service/impl/VerificationCodeServiceImpl.java new file mode 100644 index 0000000..3fe3e08 --- /dev/null +++ b/online-taxt-public/api-passager/src/main/java/com/shanshi/apiPassenger/service/impl/VerificationCodeServiceImpl.java @@ -0,0 +1,89 @@ +package com.shanshi.apiPassenger.service.impl; + +import com.shanshi.apiPassenger.remote.ServiceVefificationCodeClient; +import com.shanshi.apiPassenger.service.VerificationCodeService; +import com.shanshi.internalcommon.constant.CommonStatusEnum; +import com.shanshi.internalcommon.dto.ResponseResult; +import com.shanshi.internalcommon.response.NumberCodeResponse; +import com.shanshi.internalcommon.response.TokenResponse; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Service; + +import java.util.concurrent.TimeUnit; + +@Service +public class VerificationCodeServiceImpl implements VerificationCodeService { + + + private String verificationCodePrefix = "passenger-verification-code-"; + + @Autowired + ServiceVefificationCodeClient serviceVefificationCodeClient; + @Autowired + private StringRedisTemplate stringRedisTemplate; + /*@Autowired + private TokenResponse tokenResponse; +*/ + + /** + * 生成验证码 + * + * @param passengerPhone + * @return + */ + @Override + public ResponseResult generatorCode(String passengerPhone) { + + //通过调用服务获取验证码 + ResponseResult numberCodeResponse = serviceVefificationCodeClient.getNumberCode(6); + int numberCode = numberCodeResponse.getData().getNumberCode(); + + //需要 key、value、过期时间 + String key = generatorKeyByPhone(passengerPhone); + stringRedisTemplate.opsForValue().set(key, numberCode + "", 2, TimeUnit.MINUTES); + + return ResponseResult.success(); + } + + /** + * 根据手机号,生成key + * @param passengerPhone + * @return + */ + public String generatorKeyByPhone(String passengerPhone) { + + return verificationCodePrefix + passengerPhone; + } + + /** + * 校验验证码 + * + * @param passengerPhone 手机号 + * @param verificationCode 验证码 + * @return + */ + @Override + public ResponseResult checkCode(String passengerPhone, String verificationCode) { + + //根据手机号,从redis中获取验证码 + //生成key + String key = generatorKeyByPhone(passengerPhone); + //从redis中获取验证码 + String codeRedis = stringRedisTemplate.opsForValue().get(key); + //校验验证码 + if (StringUtils.isBlank(codeRedis)){ + return ResponseResult.fail(CommonStatusEnum.VERIFICATION_CODE_ERROR.getCode(),CommonStatusEnum.VERIFICATION_CODE_ERROR.getValue()); + } + + //判断原来是否有用户进行登录,并进行对应的处理 + System.out.println("判断原来是否有用户进行登录,并进行对应的处理"); + //分发令牌 + System.out.println("分发令牌"); + TokenResponse tokenResponse = new TokenResponse(); + tokenResponse.setToken("token value"); + + return ResponseResult.success(tokenResponse); + } +} diff --git a/online-taxt-public/api-passager/src/main/resources/application.yml b/online-taxt-public/api-passager/src/main/resources/application.yml new file mode 100644 index 0000000..663caef --- /dev/null +++ b/online-taxt-public/api-passager/src/main/resources/application.yml @@ -0,0 +1,14 @@ +server: + port: 8081 +spring: + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + application: + name: api-passenger + + redis: + port: 6379 + host: 127.0.0.1 + database: 0 diff --git a/online-taxt-public/api-passager/target/api-passager-1.0-SNAPSHOT.jar b/online-taxt-public/api-passager/target/api-passager-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..f61d07c Binary files /dev/null and b/online-taxt-public/api-passager/target/api-passager-1.0-SNAPSHOT.jar differ diff --git a/online-taxt-public/api-passager/target/classes/application.yml b/online-taxt-public/api-passager/target/classes/application.yml new file mode 100644 index 0000000..663caef --- /dev/null +++ b/online-taxt-public/api-passager/target/classes/application.yml @@ -0,0 +1,14 @@ +server: + port: 8081 +spring: + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + application: + name: api-passenger + + redis: + port: 6379 + host: 127.0.0.1 + database: 0 diff --git a/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/ApiPassengerApplication.class b/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/ApiPassengerApplication.class new file mode 100644 index 0000000..82b6373 Binary files /dev/null and b/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/ApiPassengerApplication.class differ diff --git a/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/controller/VerificationCodeController.class b/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/controller/VerificationCodeController.class new file mode 100644 index 0000000..ed70bfa Binary files /dev/null and b/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/controller/VerificationCodeController.class differ diff --git a/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/remote/ServiceVefificationCodeClient.class b/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/remote/ServiceVefificationCodeClient.class new file mode 100644 index 0000000..f3b10a5 Binary files /dev/null and b/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/remote/ServiceVefificationCodeClient.class differ diff --git a/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/request/VerificationCodeDTO.class b/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/request/VerificationCodeDTO.class new file mode 100644 index 0000000..d72dcc4 Binary files /dev/null and b/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/request/VerificationCodeDTO.class differ diff --git a/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/service/VerificationCodeService.class b/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/service/VerificationCodeService.class new file mode 100644 index 0000000..c17d3f9 Binary files /dev/null and b/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/service/VerificationCodeService.class differ diff --git a/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/service/impl/VerificationCodeServiceImpl.class b/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/service/impl/VerificationCodeServiceImpl.class new file mode 100644 index 0000000..08a1eb8 Binary files /dev/null and b/online-taxt-public/api-passager/target/classes/com/shanshi/apiPassenger/service/impl/VerificationCodeServiceImpl.class differ diff --git a/online-taxt-public/api-passager/target/maven-archiver/pom.properties b/online-taxt-public/api-passager/target/maven-archiver/pom.properties new file mode 100644 index 0000000..02cb94f --- /dev/null +++ b/online-taxt-public/api-passager/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Thu Sep 01 17:04:35 CST 2022 +version=1.0-SNAPSHOT +groupId=com.shanshi +artifactId=api-passager diff --git a/online-taxt-public/api-passager/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/online-taxt-public/api-passager/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..e69de29 diff --git a/online-taxt-public/api-passager/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/online-taxt-public/api-passager/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..e69de29 diff --git a/online-taxt-public/internal-commor/pom.xml b/online-taxt-public/internal-commor/pom.xml new file mode 100644 index 0000000..57b00a9 --- /dev/null +++ b/online-taxt-public/internal-commor/pom.xml @@ -0,0 +1,15 @@ + + + + online-taxt-public + com.shanshi + 1.0-SNAPSHOT + + 4.0.0 + + internal-commor + + + \ No newline at end of file diff --git a/online-taxt-public/internal-commor/src/main/java/com/shanshi/internalcommon/constant/CommonStatusEnum.java b/online-taxt-public/internal-commor/src/main/java/com/shanshi/internalcommon/constant/CommonStatusEnum.java new file mode 100644 index 0000000..8b5b3ca --- /dev/null +++ b/online-taxt-public/internal-commor/src/main/java/com/shanshi/internalcommon/constant/CommonStatusEnum.java @@ -0,0 +1,33 @@ +package com.shanshi.internalcommon.constant; + +import lombok.AllArgsConstructor; +import lombok.Getter; + + +public enum CommonStatusEnum { + + /** + * 验证码错误 1000-1099 + */ + VERIFICATION_CODE_ERROR(1099,"验证码不正确"), + + /** + * 成功 + */ + SUCCESS(1,"success"), + /** + * 失败 + */ + FAIL(0,"fail") + + ; + @Getter + private int code; + @Getter + private String value; + + CommonStatusEnum(int code, String value) { + this.code = code; + this.value = value; + } +} diff --git a/online-taxt-public/internal-commor/src/main/java/com/shanshi/internalcommon/dto/ResponseResult.java b/online-taxt-public/internal-commor/src/main/java/com/shanshi/internalcommon/dto/ResponseResult.java new file mode 100644 index 0000000..5207383 --- /dev/null +++ b/online-taxt-public/internal-commor/src/main/java/com/shanshi/internalcommon/dto/ResponseResult.java @@ -0,0 +1,65 @@ +package com.shanshi.internalcommon.dto; + + +import com.shanshi.internalcommon.constant.CommonStatusEnum; +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class ResponseResult { + + private int code; + private String message; + private T data; + + public static ResponseResult success(){ + + return new ResponseResult().setCode(CommonStatusEnum.SUCCESS.getCode()).setMessage(CommonStatusEnum.SUCCESS.getValue()); + + } + /** + * 相应成功方法 + * @param data + * @param + * @return + */ + public static ResponseResult success(T data){ + + return new ResponseResult().setCode(CommonStatusEnum.SUCCESS.getCode()).setMessage(CommonStatusEnum.SUCCESS.getValue()).setData(data); + } + + /** + * 自定义错误:状态码、提示信息、具体错误 + * @param code + * @param message + * @param data + * @return + */ + public static ResponseResult fail(int code,String message,String data){ + return new ResponseResult().setCode(code).setMessage(message).setData(data); + } + + /** + * 自定义错误:状态码、提示信息、 + * @param code + * @param message + * @return + */ + public static ResponseResult fail(int code,String message){ + return new ResponseResult().setCode(code).setMessage(message); + } + + /** + * 默认错误 + * @param data + * @param + * @return + */ + public static ResponseResult fail(T data){ + + return new ResponseResult().setData(data); + } + + +} diff --git a/online-taxt-public/internal-commor/src/main/java/com/shanshi/internalcommon/request/VerificationCodeDTO.java b/online-taxt-public/internal-commor/src/main/java/com/shanshi/internalcommon/request/VerificationCodeDTO.java new file mode 100644 index 0000000..c2613df --- /dev/null +++ b/online-taxt-public/internal-commor/src/main/java/com/shanshi/internalcommon/request/VerificationCodeDTO.java @@ -0,0 +1,12 @@ +package com.shanshi.internalcommon.request; + +import lombok.Data; + +@Data +public class VerificationCodeDTO { + + private String passengerPhone; + + private String verificationCode; + +} diff --git a/online-taxt-public/internal-commor/src/main/java/com/shanshi/internalcommon/response/NumberCodeResponse.java b/online-taxt-public/internal-commor/src/main/java/com/shanshi/internalcommon/response/NumberCodeResponse.java new file mode 100644 index 0000000..8fefa2a --- /dev/null +++ b/online-taxt-public/internal-commor/src/main/java/com/shanshi/internalcommon/response/NumberCodeResponse.java @@ -0,0 +1,10 @@ +package com.shanshi.internalcommon.response; + +import lombok.Data; + +@Data +public class NumberCodeResponse { + + private int numberCode; + +} diff --git a/online-taxt-public/internal-commor/src/main/java/com/shanshi/internalcommon/response/TokenResponse.java b/online-taxt-public/internal-commor/src/main/java/com/shanshi/internalcommon/response/TokenResponse.java new file mode 100644 index 0000000..8a0168f --- /dev/null +++ b/online-taxt-public/internal-commor/src/main/java/com/shanshi/internalcommon/response/TokenResponse.java @@ -0,0 +1,8 @@ +package com.shanshi.internalcommon.response; + +import lombok.Data; + +@Data +public class TokenResponse { + private String token; +} diff --git a/online-taxt-public/internal-commor/target/classes/com/shanshi/internalcommon/constant/CommonStatusEnum.class b/online-taxt-public/internal-commor/target/classes/com/shanshi/internalcommon/constant/CommonStatusEnum.class new file mode 100644 index 0000000..0e29487 Binary files /dev/null and b/online-taxt-public/internal-commor/target/classes/com/shanshi/internalcommon/constant/CommonStatusEnum.class differ diff --git a/online-taxt-public/internal-commor/target/classes/com/shanshi/internalcommon/dto/ResponseResult.class b/online-taxt-public/internal-commor/target/classes/com/shanshi/internalcommon/dto/ResponseResult.class new file mode 100644 index 0000000..e34788d Binary files /dev/null and b/online-taxt-public/internal-commor/target/classes/com/shanshi/internalcommon/dto/ResponseResult.class differ diff --git a/online-taxt-public/internal-commor/target/classes/com/shanshi/internalcommon/request/VerificationCodeDTO.class b/online-taxt-public/internal-commor/target/classes/com/shanshi/internalcommon/request/VerificationCodeDTO.class new file mode 100644 index 0000000..7c60626 Binary files /dev/null and b/online-taxt-public/internal-commor/target/classes/com/shanshi/internalcommon/request/VerificationCodeDTO.class differ diff --git a/online-taxt-public/internal-commor/target/classes/com/shanshi/internalcommon/response/NumberCodeResponse.class b/online-taxt-public/internal-commor/target/classes/com/shanshi/internalcommon/response/NumberCodeResponse.class new file mode 100644 index 0000000..d50337f Binary files /dev/null and b/online-taxt-public/internal-commor/target/classes/com/shanshi/internalcommon/response/NumberCodeResponse.class differ diff --git a/online-taxt-public/internal-commor/target/classes/com/shanshi/internalcommon/response/TokenResponse.class b/online-taxt-public/internal-commor/target/classes/com/shanshi/internalcommon/response/TokenResponse.class new file mode 100644 index 0000000..18c0ef6 Binary files /dev/null and b/online-taxt-public/internal-commor/target/classes/com/shanshi/internalcommon/response/TokenResponse.class differ diff --git a/online-taxt-public/pom.xml b/online-taxt-public/pom.xml new file mode 100644 index 0000000..4b47267 --- /dev/null +++ b/online-taxt-public/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + + + org.springframework.boot + spring-boot-starter-parent + 2.4.13 + + + + com.shanshi + online-taxt-public + 1.0-SNAPSHOT + + api-passager + internal-commor + service-passenger-user + + pom + + + 8 + 8 + + + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + + org.projectlombok + lombok + true + + + + com.shanshi + internal-commor + 1.0-SNAPSHOT + + + + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + 2021.1 + pom + import + + + + org.springframework.cloud + spring-cloud-dependencies + 2020.0.1 + pom + import + + + + + \ No newline at end of file diff --git a/online-taxt-public/service-passenger-user/pom.xml b/online-taxt-public/service-passenger-user/pom.xml new file mode 100644 index 0000000..ea0f8d2 --- /dev/null +++ b/online-taxt-public/service-passenger-user/pom.xml @@ -0,0 +1,41 @@ + + + + online-taxt-public + com.shanshi + 1.0-SNAPSHOT + + 4.0.0 + + service-passenger-user + + + org.springframework.boot + spring-boot-starter-web + + + + org.projectlombok + lombok + true + + + + + com.baomidou + mybatis-plus-boot-starter + 3.4.3.1 + + + + + mysql + mysql-connector-java + + + + + + \ No newline at end of file diff --git a/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/ServicePassengerUserApplication.java b/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/ServicePassengerUserApplication.java new file mode 100644 index 0000000..8edbbdf --- /dev/null +++ b/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/ServicePassengerUserApplication.java @@ -0,0 +1,16 @@ +package com.shanshi.servicepassengeruser; + + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +@MapperScan("com.shanshi.servicepassengeruser.mapper") +public class ServicePassengerUserApplication { + + public static void main(String[] args) { + SpringApplication.run(ServicePassengerUserApplication.class); + } + +} diff --git a/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/controller/UserController.java b/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/controller/UserController.java new file mode 100644 index 0000000..3e3190b --- /dev/null +++ b/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/controller/UserController.java @@ -0,0 +1,26 @@ +package com.shanshi.servicepassengeruser.controller; + +import com.shanshi.internalcommon.dto.ResponseResult; +import com.shanshi.internalcommon.request.VerificationCodeDTO; +import com.shanshi.servicepassengeruser.service.impl.UserServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class UserController { + + @Autowired + private UserServiceImpl userService; + + @PostMapping("/user") + public ResponseResult longinOrRegister(@RequestBody VerificationCodeDTO verificationCodeDTO){ + + String passengerPhone = verificationCodeDTO.getPassengerPhone(); + System.out.println("手机号:"+passengerPhone); + userService.longinOrRegister(passengerPhone); + + return ResponseResult.success(); + } +} diff --git a/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/dto/PassengerUser.java b/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/dto/PassengerUser.java new file mode 100644 index 0000000..81e8aa6 --- /dev/null +++ b/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/dto/PassengerUser.java @@ -0,0 +1,24 @@ +package com.shanshi.servicepassengeruser.dto; + +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class PassengerUser { + + private Long id; + + private LocalDateTime gmtCreate; + + private LocalDateTime gmtModified; + + private String passengerPhone; + + private String passengerName; + + private byte passengerGender; + + private byte state; + +} diff --git a/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/mapper/PassengerUserMapper.java b/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/mapper/PassengerUserMapper.java new file mode 100644 index 0000000..757ed49 --- /dev/null +++ b/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/mapper/PassengerUserMapper.java @@ -0,0 +1,9 @@ +package com.shanshi.servicepassengeruser.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.shanshi.servicepassengeruser.dto.PassengerUser; +import org.springframework.stereotype.Repository; + +@Repository +public interface PassengerUserMapper extends BaseMapper { +} diff --git a/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/service/UserService.java b/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/service/UserService.java new file mode 100644 index 0000000..85b7a98 --- /dev/null +++ b/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/service/UserService.java @@ -0,0 +1,10 @@ +package com.shanshi.servicepassengeruser.service; + +import com.shanshi.internalcommon.dto.ResponseResult; +import org.springframework.stereotype.Service; + +@Service +public interface UserService { + + public ResponseResult longinOrRegister(String passengerPhone); +} diff --git a/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/service/impl/UserServiceImpl.java b/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..30c9ad4 --- /dev/null +++ b/online-taxt-public/service-passenger-user/src/main/java/com/shanshi/servicepassengeruser/service/impl/UserServiceImpl.java @@ -0,0 +1,48 @@ +package com.shanshi.servicepassengeruser.service.impl; + +import com.shanshi.internalcommon.dto.ResponseResult; +import com.shanshi.servicepassengeruser.dto.PassengerUser; +import com.shanshi.servicepassengeruser.mapper.PassengerUserMapper; +import com.shanshi.servicepassengeruser.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.List; + +@Service +public class UserServiceImpl implements UserService { + + @Autowired + private PassengerUserMapper passengerUserMapper; + + + @Override + public ResponseResult longinOrRegister(String passengerPhone) { + + //根据手机号查询用户信息 + HashMap map = new HashMap<>(); + map.put("passenger_phone",passengerPhone); + List passengerUsers = passengerUserMapper.selectByMap(map); + System.out.println(passengerUsers.size()==0?"无记录":passengerUsers.get(0).getPassengerPhone()); + + //判断用户是否存在 + if (passengerUsers.size()==0){ + //进行插入用户 + PassengerUser passengerUser = new PassengerUser(); + passengerUser.setPassengerName("张三"); + passengerUser.setPassengerPhone(passengerPhone); + passengerUser.setPassengerGender((byte) 0); + passengerUser.setPassengerGender((byte) 0); + + //获取本地时间 + LocalDateTime now = LocalDateTime.now(); + passengerUser.setGmtCreate(now); + passengerUser.setGmtModified(now); + + passengerUserMapper.insert(passengerUser); + } + return null; + } +} diff --git a/online-taxt-public/service-passenger-user/src/main/resources/application.yml b/online-taxt-public/service-passenger-user/src/main/resources/application.yml new file mode 100644 index 0000000..c7bceed --- /dev/null +++ b/online-taxt-public/service-passenger-user/src/main/resources/application.yml @@ -0,0 +1,9 @@ +server: + port: 8083 + +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/service-passenger-user?characterEncoding=utf-8&serviceTimezone=GMT%2B8 + username: root + password: 123456 diff --git a/online-taxt-public/service-passenger-user/target/classes/application.yml b/online-taxt-public/service-passenger-user/target/classes/application.yml new file mode 100644 index 0000000..c7bceed --- /dev/null +++ b/online-taxt-public/service-passenger-user/target/classes/application.yml @@ -0,0 +1,9 @@ +server: + port: 8083 + +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/service-passenger-user?characterEncoding=utf-8&serviceTimezone=GMT%2B8 + username: root + password: 123456 diff --git a/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/ServicePassengerUserApplication.class b/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/ServicePassengerUserApplication.class new file mode 100644 index 0000000..9a0bdbf Binary files /dev/null and b/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/ServicePassengerUserApplication.class differ diff --git a/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/controller/UserController.class b/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/controller/UserController.class new file mode 100644 index 0000000..6b98068 Binary files /dev/null and b/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/controller/UserController.class differ diff --git a/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/dto/PassengerUser.class b/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/dto/PassengerUser.class new file mode 100644 index 0000000..e77a46b Binary files /dev/null and b/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/dto/PassengerUser.class differ diff --git a/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/mapper/PassengerUserMapper.class b/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/mapper/PassengerUserMapper.class new file mode 100644 index 0000000..20d70ec Binary files /dev/null and b/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/mapper/PassengerUserMapper.class differ diff --git a/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/service/UserService.class b/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/service/UserService.class new file mode 100644 index 0000000..ff1c1ae Binary files /dev/null and b/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/service/UserService.class differ diff --git a/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/service/impl/UserServiceImpl.class b/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/service/impl/UserServiceImpl.class new file mode 100644 index 0000000..317a462 Binary files /dev/null and b/online-taxt-public/service-passenger-user/target/classes/com/shanshi/servicepassengeruser/service/impl/UserServiceImpl.class differ diff --git a/online-taxt-public/service-verificationcode/.gitignore b/online-taxt-public/service-verificationcode/.gitignore new file mode 100644 index 0000000..a2a3040 --- /dev/null +++ b/online-taxt-public/service-verificationcode/.gitignore @@ -0,0 +1,31 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ + +### VS Code ### +.vscode/ diff --git a/online-taxt-public/service-verificationcode/.mvn/wrapper/MavenWrapperDownloader.java b/online-taxt-public/service-verificationcode/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..a45eb6b --- /dev/null +++ b/online-taxt-public/service-verificationcode/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,118 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if (mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if (mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if (!outputFile.getParentFile().exists()) { + if (!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/online-taxt-public/service-verificationcode/.mvn/wrapper/maven-wrapper.jar b/online-taxt-public/service-verificationcode/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..2cc7d4a Binary files /dev/null and b/online-taxt-public/service-verificationcode/.mvn/wrapper/maven-wrapper.jar differ diff --git a/online-taxt-public/service-verificationcode/.mvn/wrapper/maven-wrapper.properties b/online-taxt-public/service-verificationcode/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..642d572 --- /dev/null +++ b/online-taxt-public/service-verificationcode/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/online-taxt-public/service-verificationcode/mvnw b/online-taxt-public/service-verificationcode/mvnw new file mode 100644 index 0000000..a16b543 --- /dev/null +++ b/online-taxt-public/service-verificationcode/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/online-taxt-public/service-verificationcode/mvnw.cmd b/online-taxt-public/service-verificationcode/mvnw.cmd new file mode 100644 index 0000000..c8d4337 --- /dev/null +++ b/online-taxt-public/service-verificationcode/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/online-taxt-public/service-verificationcode/pom.xml b/online-taxt-public/service-verificationcode/pom.xml new file mode 100644 index 0000000..3e50951 --- /dev/null +++ b/online-taxt-public/service-verificationcode/pom.xml @@ -0,0 +1,89 @@ + + + 4.0.0 + + + online-taxt-public + com.shanshi + 1.0-SNAPSHOT + + + com.shanshi + service-verificationcode + 0.0.1-SNAPSHOT + service-verificationcode + service-verificationcode + + + 1.8 + UTF-8 + UTF-8 + 2.3.7.RELEASE + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.projectlombok + lombok + true + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + UTF-8 + + + + org.springframework.boot + spring-boot-maven-plugin + 2.3.7.RELEASE + + com.shanshi.serviceverificationcode.ServiceVerificationcodeApplication + + + + repackage + + repackage + + + + + + + + diff --git a/online-taxt-public/service-verificationcode/src/main/java/com/shanshi/serviceverificationcode/ServiceVerificationcodeApplication.java b/online-taxt-public/service-verificationcode/src/main/java/com/shanshi/serviceverificationcode/ServiceVerificationcodeApplication.java new file mode 100644 index 0000000..11c266d --- /dev/null +++ b/online-taxt-public/service-verificationcode/src/main/java/com/shanshi/serviceverificationcode/ServiceVerificationcodeApplication.java @@ -0,0 +1,15 @@ +package com.shanshi.serviceverificationcode; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +@SpringBootApplication +@EnableDiscoveryClient +public class ServiceVerificationcodeApplication { + + public static void main(String[] args) { + SpringApplication.run(ServiceVerificationcodeApplication.class, args); + } + +} diff --git a/online-taxt-public/service-verificationcode/src/main/java/com/shanshi/serviceverificationcode/controller/NumberCodeController.java b/online-taxt-public/service-verificationcode/src/main/java/com/shanshi/serviceverificationcode/controller/NumberCodeController.java new file mode 100644 index 0000000..a4674ca --- /dev/null +++ b/online-taxt-public/service-verificationcode/src/main/java/com/shanshi/serviceverificationcode/controller/NumberCodeController.java @@ -0,0 +1,30 @@ +package com.shanshi.serviceverificationcode.controller; + + +import com.shanshi.internalcommon.dto.ResponseResult; +import com.shanshi.internalcommon.response.NumberCodeResponse; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class NumberCodeController { + + + @GetMapping("/numberCode/{size}") + public ResponseResult numberCode(@PathVariable("size") int size) { + + //获取验证码 + double match = (Math.random() * 9 + 1) * (Math.pow(10, 5)); + int resultInt = (int) match; + + NumberCodeResponse response = new NumberCodeResponse(); + response.setNumberCode(resultInt); + + return ResponseResult.success(response); + + } + + + +} diff --git a/online-taxt-public/service-verificationcode/src/main/resources/application.yml b/online-taxt-public/service-verificationcode/src/main/resources/application.yml new file mode 100644 index 0000000..bd952c9 --- /dev/null +++ b/online-taxt-public/service-verificationcode/src/main/resources/application.yml @@ -0,0 +1,14 @@ +# 应用名称 +spring: + application: + name: service-verificationcode + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 +# 应用服务 WEB 访问端口 +server: + port: 8082 + + + diff --git a/online-taxt-public/service-verificationcode/src/test/java/com/shanshi/serviceverificationcode/ServiceVerificationcodeApplicationTests.java b/online-taxt-public/service-verificationcode/src/test/java/com/shanshi/serviceverificationcode/ServiceVerificationcodeApplicationTests.java new file mode 100644 index 0000000..e36d303 --- /dev/null +++ b/online-taxt-public/service-verificationcode/src/test/java/com/shanshi/serviceverificationcode/ServiceVerificationcodeApplicationTests.java @@ -0,0 +1,13 @@ +package com.shanshi.serviceverificationcode; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ServiceVerificationcodeApplicationTests { + + @Test + void contextLoads() { + } + +}