Merge pull request #77 from codingapi/dev

Dev

Author: xlorne

example/example-application/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.3</version>
+        <version>3.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-application/src/main/java/com/codingapi/example/command/TestController.java

@@ -0,0 +1,30 @@
+package com.codingapi.example.command;
+
+import com.codingapi.example.event.TestEvent;
+import com.codingapi.example.infra.entity.TestEntity;
+import com.codingapi.example.infra.jpa.TestEntityRepository;
+import com.codingapi.springboot.framework.event.EventPusher;
+import lombok.AllArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/open/test")
+@AllArgsConstructor
+public class TestController {
+
+    private final TestEntityRepository testEntityRepository;
+
+
+    @GetMapping("/hi")
+    @Transactional
+    public void hi(){
+        TestEntity testEntity = new TestEntity("test");
+        testEntityRepository.save(testEntity);
+
+        TestEvent event = new TestEvent(testEntity.getName());
+        EventPusher.push(event);
+    }
+}

example/example-application/src/main/java/com/codingapi/example/event/AEvent.java

@@ -0,0 +1,8 @@
+package com.codingapi.example.event;
+
+import com.codingapi.springboot.framework.event.IEvent;
+
+public class AEvent implements IEvent {
+
+
+}

example/example-application/src/main/java/com/codingapi/example/event/BEvent.java

@@ -0,0 +1,8 @@
+package com.codingapi.example.event;
+
+import com.codingapi.springboot.framework.event.IEvent;
+
+public class BEvent implements IEvent {
+
+
+}

example/example-application/src/main/java/com/codingapi/example/event/CEvent.java

@@ -0,0 +1,7 @@
+package com.codingapi.example.event;
+
+import com.codingapi.springboot.framework.event.IEvent;
+
+public class CEvent implements IEvent {
+
+}

example/example-application/src/main/java/com/codingapi/example/event/TestEvent.java

@@ -0,0 +1,13 @@
+package com.codingapi.example.event;
+
+import com.codingapi.springboot.framework.event.IAsyncEvent;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class TestEvent implements IAsyncEvent {
+
+    private String name;
+
+}

example/example-application/src/main/java/com/codingapi/example/handler/AHandler.java

@@ -0,0 +1,21 @@
+package com.codingapi.example.handler;
+
+import com.codingapi.example.event.AEvent;
+import com.codingapi.example.event.BEvent;
+import com.codingapi.springboot.framework.event.EventPusher;
+import com.codingapi.springboot.framework.event.EventTraceContext;
+import com.codingapi.springboot.framework.event.IHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class AHandler implements IHandler<AEvent> {
+
+    @Override
+    public void handler(AEvent event) {
+        log.info("a event:{},eventKey:{}",event, EventTraceContext.getInstance().getEventKey());
+
+        EventPusher.push(new BEvent());
+    }
+}

example/example-application/src/main/java/com/codingapi/example/handler/BHandler.java

@@ -0,0 +1,21 @@
+package com.codingapi.example.handler;
+
+import com.codingapi.example.event.BEvent;
+import com.codingapi.example.event.CEvent;
+import com.codingapi.springboot.framework.event.EventPusher;
+import com.codingapi.springboot.framework.event.EventTraceContext;
+import com.codingapi.springboot.framework.event.IHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class BHandler implements IHandler<BEvent> {
+
+    @Override
+    public void handler(BEvent event) {
+        log.info("b event:{},eventKey:{}",event, EventTraceContext.getInstance().getEventKey());
+
+        EventPusher.push(new CEvent());
+    }
+}

example/example-application/src/main/java/com/codingapi/example/handler/CHandler.java

@@ -0,0 +1,26 @@
+package com.codingapi.example.handler;
+
+import com.codingapi.example.event.CEvent;
+import com.codingapi.springboot.framework.event.EventTraceContext;
+import com.codingapi.springboot.framework.event.IHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class CHandler implements IHandler<CEvent> {
+
+    @Override
+    public void handler(CEvent event) {
+        log.info("c event:{},eventKey:{}", event, EventTraceContext.getInstance().getEventKey());
+
+//        EventPusher.push(new AEvent());
+        throw new RuntimeException("c handler error");
+    }
+
+    @Override
+    public void error(Exception exception) throws Exception {
+        log.error("c handler error:{}", exception.getMessage());
+        throw exception;
+    }
+}

example/example-application/src/main/java/com/codingapi/example/handler/TestHandler.java

@@ -0,0 +1,33 @@
+package com.codingapi.example.handler;
+
+import com.codingapi.example.event.AEvent;
+import com.codingapi.example.event.TestEvent;
+import com.codingapi.example.infra.entity.TestEntity;
+import com.codingapi.example.infra.jpa.TestEntityRepository;
+import com.codingapi.springboot.framework.event.EventPusher;
+import com.codingapi.springboot.framework.event.IHandler;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@AllArgsConstructor
+public class TestHandler implements IHandler<TestEvent> {
+
+    private TestEntityRepository testEntityRepository;
+
+    @Override
+    public void handler(TestEvent event) {
+        TestEntity entity = new TestEntity(event.getName()+"123");
+        testEntityRepository.save(entity);
+
+        new Thread(()->{
+            EventPusher.push(new AEvent());
+        }).start();
+
+        new Thread(()->{
+            EventPusher.push(new AEvent());
+        }).start();
+    }
+
+
+}

example/example-domain/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.3</version>
+        <version>3.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-infra-flow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.3</version>
+        <version>3.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-infra-jpa/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.3</version>
+        <version>3.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-infra-jpa/src/main/java/com/codingapi/example/infra/entity/TestEntity.java

@@ -0,0 +1,26 @@
+package com.codingapi.example.infra.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Setter
+@Getter
+@Entity
+@NoArgsConstructor
+public class TestEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    private String name;
+
+    public TestEntity(String name) {
+        this.name = name;
+    }
+}

example/example-infra-jpa/src/main/java/com/codingapi/example/infra/jpa/TestEntityRepository.java

@@ -0,0 +1,8 @@
+package com.codingapi.example.infra.jpa;
+
+import com.codingapi.example.infra.entity.TestEntity;
+import com.codingapi.springboot.fast.jpa.repository.FastRepository;
+
+public interface TestEntityRepository extends FastRepository<TestEntity,Long> {
+
+}

example/example-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.3</version>
+        <version>3.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/pom.xml

@@ -13,11 +13,11 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.3</version>
+        <version>3.3.5</version>
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.5</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.3.3</version>
+    <version>3.3.5</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.3</version>
+        <version>3.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-flow/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.3</version>
+        <version>3.3.5</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/build/FlowWorkBuilder.java

@@ -10,7 +10,7 @@
 import com.codingapi.springboot.flow.matcher.OperatorMatcher;
 import com.codingapi.springboot.flow.trigger.OutTrigger;
 import com.codingapi.springboot.flow.user.IFlowOperator;
-import com.codingapi.springboot.flow.utils.RandomGenerator;
+import com.codingapi.springboot.framework.utils.RandomGenerator;
 
 /**
  * 流程工作构建器

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/domain/FlowWork.java

@@ -3,7 +3,7 @@
 import com.codingapi.springboot.flow.build.SchemaReader;
 import com.codingapi.springboot.flow.serializable.FlowWorkSerializable;
 import com.codingapi.springboot.flow.user.IFlowOperator;
-import com.codingapi.springboot.flow.utils.RandomGenerator;
+import com.codingapi.springboot.framework.utils.RandomGenerator;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;

springboot-starter-flow/src/main/java/com/codingapi/springboot/flow/record/FlowProcess.java

@@ -1,7 +1,7 @@
 package com.codingapi.springboot.flow.record;
 
 import com.codingapi.springboot.flow.user.IFlowOperator;
-import com.codingapi.springboot.flow.utils.RandomGenerator;
+import com.codingapi.springboot.framework.utils.RandomGenerator;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.3</version>
+        <version>3.3.5</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>3.3.3</version>
+        <version>3.3.5</version>
     </parent>
     <artifactId>springboot-starter</artifactId>