Merge remote-tracking branch 'origin/feature-20200720' into feature-20200720

infra/pom.xml

@@ -92,6 +92,10 @@
             <artifactId>sdk</artifactId>
             <version>${parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.hikcreate.edl.common</groupId>
+            <artifactId>image-builder</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/core/config/DrawConfig.java

+package com.hikcreate.edl.pub.web.mobile.infra.core.config;
+
+import com.hikcreate.edl.common.image.builder.refactor.material.DlMaterial;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author 赵东
+ * @date 2019/7/8 10:25
+ */
+@Configuration
+public class DrawConfig {
+
+    @Bean
+    @ConfigurationProperties("biz.image.builder.dl")
+    public DlMaterial dlMaterial() {
+        return new DlMaterial();
+    }
+
+}

infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/edl_pvt_service_drivinglicense/DrivingLicenseQrFeign.java

-package com.hikcreate.edl.pub.web.mobile.infra.data.feign.edl_pvt_service_drivinglicense;
-
-
-/**
- *
- */
-//@FeignClient(value = "edl-pvt-service-dl", path = "drivingLicense/qr")
-public interface DrivingLicenseQrFeign {
-
-//    @PostMapping("getQrInfo")
-//    Response<DlQrRes> getQrInfo(@RequestBody @Validated IdCardMicReq req);
-}