diff --git a/gateway-8133/pom.xml b/gateway-8133/pom.xml index 35a8bee..f3957d4 100644 --- a/gateway-8133/pom.xml +++ b/gateway-8133/pom.xml @@ -56,26 +56,6 @@ org.springframework.cloud spring-cloud-starter-loadbalancer - - - io.micrometer - micrometer-tracing - - - - io.micrometer - micrometer-tracing-bridge-brave - - - - io.micrometer - micrometer-observation - - - - io.zipkin.reporter2 - zipkin-reporter-brave - com.alibaba.csp sentinel-transport-simple-http diff --git a/gateway-8133/src/main/java/com/ivmiku/tutorial/Main8133.java b/gateway-8133/src/main/java/com/ivmiku/tutorial/Main8133.java index 944b565..954215d 100644 --- a/gateway-8133/src/main/java/com/ivmiku/tutorial/Main8133.java +++ b/gateway-8133/src/main/java/com/ivmiku/tutorial/Main8133.java @@ -3,9 +3,7 @@ package com.ivmiku.tutorial; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -@SpringBootApplication(exclude = { - org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration.class -}) +@SpringBootApplication public class Main8133 { public static void main(String[] args) { SpringApplication.run(Main8133.class, args); diff --git a/gateway-8133/src/main/resources/application-dep.properties b/gateway-8133/src/main/resources/application-dep.properties index a793f21..e09f40c 100644 --- a/gateway-8133/src/main/resources/application-dep.properties +++ b/gateway-8133/src/main/resources/application-dep.properties @@ -1,16 +1,24 @@ server.port=8133 spring.application.name=gateway -spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 +spring.cloud.nacos.discovery.server-addr=nacos:8848 -spring.data.redis.host=127.0.0.1 +spring.data.redis.host=redis spring.data.redis.port=6379 spring.data.redis.database=0 -#spring.data.redis.password=Shuodedaoli114514 +spring.data.redis.password=Shuodedaoli114514 spring.cloud.gateway.routes[0].id=user spring.cloud.gateway.routes[0].uri=lb://user spring.cloud.gateway.routes[0].predicates[0]=Path=/user/** +spring.cloud.gateway.routes[0].filters[0]=StripPrefix=1 -management.zipkin.tracing.endpoint=http://127.0.0.1:9411/api/v2/spans -management.tracing.sampling.probability=1.0 +spring.cloud.gateway.routes[1].id=community +spring.cloud.gateway.routes[1].uri=lb://community +spring.cloud.gateway.routes[1].predicates[0]=Path=/community/** +spring.cloud.gateway.routes[1].filters[0]=StripPrefix=1 + +spring.cloud.gateway.routes[2].id=navigate +spring.cloud.gateway.routes[2].uri=lb://navigate +spring.cloud.gateway.routes[2].predicates[0]=Path=/navigate/** +spring.cloud.gateway.routes[2].filters[0]=StripPrefix=1 diff --git a/navigate-8432/lib/opencv-4100.jar b/navigate-8432/lib/opencv-4100.jar new file mode 100644 index 0000000..f9b3f2c Binary files /dev/null and b/navigate-8432/lib/opencv-4100.jar differ diff --git a/navigate-8432/lib/opencv_java4100.dll b/navigate-8432/lib/opencv_java4100.dll new file mode 100644 index 0000000..08bcb5a Binary files /dev/null and b/navigate-8432/lib/opencv_java4100.dll differ diff --git a/navigate-8432/pom.xml b/navigate-8432/pom.xml index e3aa5f4..12f507a 100644 --- a/navigate-8432/pom.xml +++ b/navigate-8432/pom.xml @@ -109,5 +109,31 @@ tencentcloud-sdk-java-asr 3.1.1083 + + + ai.djl + api + 0.29.0 + + + + ai.djl.pytorch + pytorch-model-zoo + 0.29.0 + + + + ai.djl.pytorch + pytorch-engine + 0.29.0 + + + + ai.djl.pytorch + pytorch-native-auto + 1.9.1 + runtime + + \ No newline at end of file diff --git a/navigate-8432/src/main/java/com/ivmiku/tutorial/controller/NavigateController.java b/navigate-8432/src/main/java/com/ivmiku/tutorial/controller/NavigateController.java index 924e7e5..8be9c4b 100644 --- a/navigate-8432/src/main/java/com/ivmiku/tutorial/controller/NavigateController.java +++ b/navigate-8432/src/main/java/com/ivmiku/tutorial/controller/NavigateController.java @@ -57,10 +57,29 @@ public class NavigateController { } @PostMapping("/ticket") - public Object scanTicket(@RequestPart MultipartFile file) throws IOException { + public Object scanTicket(@RequestPart MultipartFile file, @RequestParam String location) throws IOException { BufferedImage image = ImageIO.read(file.getInputStream()); Map map = navigateService.scanTicket(image); - return Result.ok(map); + Map result = new HashMap<>(); + if (map.containsKey("登机口")) { + String address = navigateService.deGeoCode(location); + address += map.get("登机口"); + address += "登机口"; + result.put("地址", address); + } else if (map.containsKey("检票口")) { + if (map.containsKey("左边车站")) { + String address = (String) map.get("左边车站"); + address += map.get("检票口"); + address += "检票口"; + result.put("地址", address); + } else { + String address = navigateService.deGeoCode(location); + address += map.get("检票口"); + address += "检票口"; + result.put("地址", address); + } + } + return Result.ok(result); } @GetMapping("/geocode") diff --git a/navigate-8432/src/main/java/com/ivmiku/tutorial/service/NavigateService.java b/navigate-8432/src/main/java/com/ivmiku/tutorial/service/NavigateService.java index c942e1f..57cad45 100644 --- a/navigate-8432/src/main/java/com/ivmiku/tutorial/service/NavigateService.java +++ b/navigate-8432/src/main/java/com/ivmiku/tutorial/service/NavigateService.java @@ -64,7 +64,7 @@ public class NavigateService { OcrClient client = new OcrClient(cred, "ap-shanghai", clientProfile); SmartStructuralOCRV2Request req = new SmartStructuralOCRV2Request(); req.setImageBase64(base64Img); - String[] itemNames1 = {"登机口", "检票口"}; + String[] itemNames1 = {"登机口", "检票口", "左边车站", "右边车站"}; req.setItemNames(itemNames1); resp = client.SmartStructuralOCRV2(req); } catch (TencentCloudSDKException e) { @@ -106,4 +106,23 @@ public class NavigateService { JSONObject location = array.getJSONObject(0); return location.getString("location"); } + + public String deGeoCode(String fomattedLoc) { + Map params = new HashMap<>(); + params.put("key", key); + params.put("location", fomattedLoc); + params.put("poitype", "飞机场|火车站|地铁站"); + HttpResponse response = HttpRequest.get("https://restapi.amap.com/v3/geocode/regeo") + .form(params) + .execute(); + String result = response.body(); + response.close(); + JSONObject resultObj = JSONObject.parseObject(result); + if (resultObj.getInteger("status")==0) { + return null; + } + JSONObject reGeoCode = resultObj.getJSONObject("regeocode"); + String address = reGeoCode.getString("formatted_address"); + return address; + } } diff --git a/navigate-8432/src/main/java/com/ivmiku/tutorial/service/RecogintionService.java b/navigate-8432/src/main/java/com/ivmiku/tutorial/service/RecogintionService.java new file mode 100644 index 0000000..b4296ec --- /dev/null +++ b/navigate-8432/src/main/java/com/ivmiku/tutorial/service/RecogintionService.java @@ -0,0 +1,10 @@ +package com.ivmiku.tutorial.service; + +import org.springframework.stereotype.Service; + +@Service +public class RecogintionService { + static { + + } +} diff --git a/navigate-8432/src/main/resources/application-dep.properties b/navigate-8432/src/main/resources/application-dep.properties index c84c07e..79803be 100644 --- a/navigate-8432/src/main/resources/application-dep.properties +++ b/navigate-8432/src/main/resources/application-dep.properties @@ -13,7 +13,4 @@ spring.datasource.password=Shuodedaoli114514 spring.datasource.url=jdbc:mysql://mysql:4514/tutorial?useUnicode=true&characterEncoding=utf8&useSSL=false&ServerTimezone=Asia/Shanghai spring.cloud.nacos.discovery.server-addr=nacos:8848 -spring.cloud.nacos.discovery.enabled=true - -management.zipkin.tracing.endpoint=http://zipkin:9411/api/v2/spans -management.tracing.sampling.probability=1.0 \ No newline at end of file +spring.cloud.nacos.discovery.enabled=true \ No newline at end of file diff --git a/user-8072/pom.xml b/user-8072/pom.xml index 5ca0ed8..65a641f 100644 --- a/user-8072/pom.xml +++ b/user-8072/pom.xml @@ -79,31 +79,6 @@ org.springframework.cloud spring-cloud-starter-loadbalancer - - - io.micrometer - micrometer-tracing - - - - io.micrometer - micrometer-tracing-bridge-brave - - - - io.micrometer - micrometer-observation - - - - io.zipkin.reporter2 - zipkin-reporter-brave - - - org.apache.dubbo - dubbo-spring-boot-tracing-brave-zipkin-starter - 3.2.13 - com.alibaba.cloud spring-cloud-starter-alibaba-sentinel diff --git a/user-8072/src/main/java/com/ivmiku/tutorial/Main8072.java b/user-8072/src/main/java/com/ivmiku/tutorial/Main8072.java index 817c779..31a15fe 100644 --- a/user-8072/src/main/java/com/ivmiku/tutorial/Main8072.java +++ b/user-8072/src/main/java/com/ivmiku/tutorial/Main8072.java @@ -4,9 +4,7 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -@SpringBootApplication(exclude = { - org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration.class -}) +@SpringBootApplication @MapperScan("com.ivmiku.tutorial.mapper") public class Main8072 { public static void main(String[] args) { diff --git a/user-8072/src/main/resources/application-dep.properties b/user-8072/src/main/resources/application-dep.properties index d286cee..6810816 100644 --- a/user-8072/src/main/resources/application-dep.properties +++ b/user-8072/src/main/resources/application-dep.properties @@ -1,7 +1,7 @@ wx.miniapp.configs[0].appid=wx0d4fdb5c7bf3b12b wx.miniapp.configs[0].secret=989f155fcc3aee616568473faf1b1d3b -spring.data.redis.host=127.0.0.1 +spring.data.redis.host=redis spring.data.redis.port=6379 spring.data.redis.database=0 @@ -12,10 +12,9 @@ server.port=8072 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.username=root spring.datasource.password=123456 -spring.datasource.url=jdbc:mysql://127.0.0.1:3306/tutorial?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai +spring.datasource.url=jdbc:mysql://mysql:3306/tutorial?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai -spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 +spring.cloud.nacos.discovery.server-addr=nacos:8848 spring.cloud.nacos.discovery.enabled=true -management.zipkin.tracing.endpoint=http://127.0.0.1:9411/api/v2/spans -management.tracing.sampling.probability=1.0 +