diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/doc/RemoveHandwritingController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/doc/RemoveHandwritingController.java index 04d9ee5..24158b4 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/doc/RemoveHandwritingController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/doc/RemoveHandwritingController.java @@ -37,7 +37,7 @@ public class RemoveHandwritingController extends BaseController { @Autowired private BRemoveHandwritingHandle bRemoveHandwritingHandle; - @RequestMapping("/repair") + @RequestMapping("/repair2") @CacheResult public R repair(BRemoveHandwritingRequest request) { diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/doc/RemoveMoireController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/doc/RemoveMoireController.java index d1e6f62..52ac2a9 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/doc/RemoveMoireController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/doc/RemoveMoireController.java @@ -34,7 +34,7 @@ public class RemoveMoireController { private BRemoveMoireHandle bRemoveMoireHandle; - @RequestMapping("/repair") + @RequestMapping("/repair1") @CacheResult public R repair(BRemoveMoireRequest request) { diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/face/FaceTidyupController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/face/FaceTidyupController.java index 75f1f48..f979b7c 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/face/FaceTidyupController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/face/FaceTidyupController.java @@ -4,7 +4,6 @@ package com.heyu.api.controller.face; import com.aliyun.facebody20191230.models.FaceTidyupRequest; import com.aliyun.facebody20191230.models.FaceTidyupResponse; import com.aliyun.facebody20191230.models.FaceTidyupResponseBody; -import com.google.protobuf.Api; import com.heyu.api.alibaba.handle.facebody.AFaceTidyupHandle; import com.heyu.api.alibaba.request.facebody.AFaceTidyupRequest; import com.heyu.api.controller.BaseController; diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/video/DetectVideoLivingFaceController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/video/DetectVideoLivingFaceController.java index bcf69f7..fc69127 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/video/DetectVideoLivingFaceController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/video/DetectVideoLivingFaceController.java @@ -3,7 +3,6 @@ package com.heyu.api.controller.video; import com.aliyun.facebody20191230.models.DetectVideoLivingFaceResponse; import com.aliyun.facebody20191230.models.DetectVideoLivingFaceResponseBody; -import com.google.protobuf.Api; import com.heyu.api.alibaba.handle.facebody.ADetectVideoLivingFaceHandle; import com.heyu.api.alibaba.request.facebody.ADetectVideoLivingFaceRequest; import com.heyu.api.controller.BaseController; diff --git a/api-web/api-interface/src/main/resources/bootstrap-dev.yml b/api-web/api-interface/src/main/resources/bootstrap-dev.yml index 78af0d1..44d7e0d 100644 --- a/api-web/api-interface/src/main/resources/bootstrap-dev.yml +++ b/api-web/api-interface/src/main/resources/bootstrap-dev.yml @@ -1,4 +1,25 @@ spring: + cloud: + nacos: + discovery: + # 服务注册地址 + #server-addr: 192.168.8.146:32470 + #server-addr: 120.26.162.237:30571 + server-addr: nacos.iwulin.tech:30571 + namespace: ${spring.profiles.active} + password: hz_HeYu@202518 + config: + namespace: ${spring.profiles.active} + # 配置中心地址 + #server-addr: 192.168.8.146:32470 + #server-addr: 120.26.162.237:30571 + server-addr: nacos.iwulin.tech:30571 + password: hz_HeYu@202518 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.jdbc.Driver diff --git a/api-web/pom.xml b/api-web/pom.xml index aa420e5..5774938 100644 --- a/api-web/pom.xml +++ b/api-web/pom.xml @@ -29,5 +29,17 @@ 0.0.1-SNAPSHOT + + + org.springframework.cloud + spring-cloud-starter-bootstrap + ${spring.cloud.version} + + + org.springframework.cloud + spring-cloud-context + ${spring.cloud.version} + + diff --git a/pom.xml b/pom.xml index ea86761..8d49f46 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.4.RELEASE + 2.6.3 @@ -44,8 +44,9 @@ 1.2.3 1.7.25 3.4.3 - - 2.0.4.RELEASE + 3.1.1 + 2.6.3 + ${spring.boot.version} @@ -168,7 +169,7 @@ org.springframework.cloud spring-cloud-starter-sleuth - 2.0.1.RELEASE + 2.2.8.RELEASE io.zipkin.brave