新增spring cloud 依赖，引入openfeign用于调用claw服务

pom.xml

@@ -16,9 +16,19 @@
 
     <properties>
         <java.version>13</java.version>
+        <spring-cloud.version>Hoxton.SR3</spring-cloud.version>
     </properties>
 
     <dependencies>
+
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-config</artifactId>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -89,6 +99,19 @@
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+
     <build>
         <plugins>
             <plugin>
@@ -106,14 +129,6 @@
                     <forceJavacCompilerUse>true</forceJavacCompilerUse>
                 </configuration>
             </plugin>
-<!--            <plugin>-->
-<!--                <groupId>org.apache.maven.plugins</groupId>-->
-<!--                <artifactId>maven-surefire-plugin</artifactId>-->
-<!--                <version>3.0.0-M3</version>-->
-<!--                <configuration>-->
-<!--                    <argLine>&#45;&#45;enable-preview</argLine>-->
-<!--                </configuration>-->
-<!--            </plugin>-->
         </plugins>
     </build>
 

src/main/java/com/galaxis/manatee/ManateeApplication.java

@@ -2,6 +2,7 @@ package com.galaxis.manatee;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
@@ -10,6 +11,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  */
 @EnableScheduling
 @SpringBootApplication
+@EnableFeignClients
 public class ManateeApplication {
 
     public static void main(String[] args) {

src/main/java/com/galaxis/manatee/configuration/ManateeSecurity.java

@@ -39,6 +39,7 @@ public class ManateeSecurity extends WebSecurityConfigurerAdapter {
         http.cors().and().csrf().disable().authorizeRequests()
                 .antMatchers(HttpMethod.POST, SIGN_UP_URL).permitAll()
                 .antMatchers(HttpMethod.GET,GO_CONFIRM).permitAll()
+                .antMatchers(HttpMethod.GET,"/test/**").permitAll()
                 .anyRequest().authenticated()
                 .and()
                 .addFilter(new JwtAuthenticationFilter(authenticationManager()))

src/main/java/com/galaxis/manatee/controller/ClawController.java

@@ -1,12 +1,19 @@
 package com.galaxis.manatee.controller;
 
+import com.galaxis.capsule.dto.ChuanyunProjectDTO;
+import com.galaxis.manatee.manager.ClawFeign;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.request.WebRequest;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @author zcj
  * @version 0.1
@@ -16,6 +23,12 @@ import org.springframework.web.context.request.WebRequest;
 @Slf4j
 public class ClawController {
 
+    private ClawFeign clawFeign;
+
+    public ClawController(ClawFeign clawFeign) {
+        this.clawFeign = clawFeign;
+    }
+
     /**
      * 接口调用异常
      * @param exception 系统抛出异常
@@ -24,7 +37,15 @@ public class ClawController {
      */
     @ExceptionHandler(value = {Exception.class})
     public ResponseEntity vehicleNotFound(Exception exception, WebRequest request) {
-        log.warn("异常");
+        log.warn("clawController异常");
+        exception.printStackTrace();
         return new ResponseEntity(exception, HttpStatus.BAD_REQUEST);
     }
+
+    @GetMapping("/test/claw")
+    public Page<ChuanyunProjectDTO> test(){
+        Map<String,String> map=new HashMap<>(1);
+        map.put("projectCode_eq","a00001");
+        return clawFeign.findChuanyunProjectPageable(map);
+    }
 }

src/main/java/com/galaxis/manatee/entity/User.java

@@ -18,8 +18,8 @@ import javax.persistence.Transient;
 public class User {
 
     @Id
-    @GeneratedValue(generator = "idGeneratorBasicTrade")
-    @GenericGenerator(name ="idGeneratorBasicTrade" ,strategy="com.galaxis.manatee.util.impl.GalaxisIdGenerator")
+    @GeneratedValue(generator = "idGeneratorUser")
+    @GenericGenerator(name ="idGeneratorUser" ,strategy="com.galaxis.capsule.util.GalaxisIdGenerator")
     private Long id;
 
     /**

src/main/java/com/galaxis/manatee/entity/ding/DingTalkRobot.java

@@ -14,8 +14,8 @@ import javax.persistence.*;
 @Entity
 public class DingTalkRobot {
     @Id
-    @GeneratedValue(generator = "idGeneratorBasicTrade")
-    @GenericGenerator(name ="idGeneratorBasicTrade" ,strategy="com.galaxis.capsule.util.GalaxisIdGenerator")
+    @GeneratedValue(generator = "idGeneratorDingTalkRobot")
+    @GenericGenerator(name ="idGeneratorDingTalkRobot" ,strategy="com.galaxis.capsule.util.GalaxisIdGenerator")
     private Long id;
 
     /**

src/main/java/com/galaxis/manatee/manager/ClawFeign.java

@@ -0,0 +1,25 @@
+package com.galaxis.manatee.manager;
+
+import com.galaxis.capsule.dto.ChuanyunProjectDTO;
+import com.galaxis.capsule.dto.PageDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+/**
+ * @author zcj
+ * @version 0.1
+ * @date 2020/4/8 4:22 下午
+ */
+@FeignClient(name = "claw",url = "http://localhost:8081")
+public interface ClawFeign {
+    /**
+     * 测试
+     * @param map
+     * @return
+     */
+    @GetMapping("/chuanyunProject/findAllByParameters")
+    PageDTO<ChuanyunProjectDTO> findChuanyunProjectPageable(@RequestParam Map<String,String> map);
+}

src/main/resources/application.yml

@@ -5,7 +5,6 @@ chuanYun:
     secret: BsuPomgoblb0gDdrCBmzkq5KcWlz+2OXgetN1gFgnZgXmdgHdDpGgA==
   url:
     invoke: https://www.h3yun.com/OpenApi/Invoke
-
 #钉钉
 dingTalk:
   #获取token的uri