Merge branch 'develop_tzs_register' of…

amos-boot-biz-common/pom.xml

@@ -142,11 +142,6 @@
             <groupId>com.yeejoin</groupId>
             <artifactId>amos-feign-systemctl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.seata</groupId>
-            <artifactId>seata-spring-boot-starter</artifactId>
-            <version>1.8.0</version>
-        </dependency>
     </dependencies>
 
 </project>

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/feign/XidFeignConfiguration.java → amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/config/XidFeignConfiguration.java

-package com.yeejoin.amos.boot.biz.common.feign;
+package com.yeejoin.amos.boot.module.jg.biz.config;
 
 import feign.RequestInterceptor;
 import feign.RequestTemplate;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/feign/TaskV2FeignService.java

 package com.yeejoin.amos.boot.module.jg.biz.feign;
 
-import com.yeejoin.amos.boot.biz.common.feign.XidFeignConfiguration;
+import com.yeejoin.amos.boot.module.jg.biz.config.XidFeignConfiguration;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/feign/WorkFlowFeignService.java

 package com.yeejoin.amos.boot.module.jg.biz.feign;
 
 import com.alibaba.fastjson.JSONObject;
-import com.yeejoin.amos.boot.biz.common.feign.XidFeignConfiguration;
+import com.yeejoin.amos.boot.module.jg.biz.config.XidFeignConfiguration;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.model.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 import java.util.Map;
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/XidFeignConfiguration.java

+package com.yeejoin.amos.boot.module.jyjc.biz.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import feign.codec.Encoder;
+import feign.form.spring.SpringFormEncoder;
+import io.seata.core.context.RootContext;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.support.SpringEncoder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.StringUtils;
+import org.springframework.web.context.request.RequestContextListener;
+
+@Configuration
+public class XidFeignConfiguration implements RequestInterceptor {
+    @Autowired
+    private ObjectFactory<HttpMessageConverters> messageConverters;
+
+    @Bean
+    public Encoder feignFormEncoder() {
+        return new SpringFormEncoder(new SpringEncoder(messageConverters));
+    }
+    /**
+     * 创建Feign请求拦截器，在发送请求前设置认证的token,各个微服务将token设置到环境变量中来达到通用
+     * @return
+     */
+    @Bean
+    public RequestContextListener requestInterceptor() {
+        return new RequestContextListener();
+    }
+
+    @Override
+    public void apply(RequestTemplate template) {
+        String xid = RootContext.getXID();
+        if(StringUtils.hasText(xid)){
+            template.header(RootContext.KEY_XID, xid);
+        }
+    }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/feign/WorkflowFeignClient.java

 package com.yeejoin.amos.boot.module.jyjc.biz.feign;
 
 import com.alibaba.fastjson.JSONObject;
-import com.yeejoin.amos.boot.biz.common.feign.XidFeignConfiguration;
+import com.yeejoin.amos.boot.module.jyjc.biz.config.XidFeignConfiguration;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -60,6 +60,7 @@ import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
+import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -159,6 +160,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
      * @return JyjcOpeningApplicationModel
      */
     @Transactional(rollbackFor = {Exception.class, BaseException.class})
+    @GlobalTransactional(rollbackFor = Exception.class)
     public JyjcOpeningApplicationModel saveOrUpdate(JyjcOpeningApplicationModel model, String unitCode) {
         if (model.getSequenceNbr() != null) {
             // 存json
@@ -198,6 +200,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
      * @return JyjcOpeningApplicationModel
      */
     @Transactional(rollbackFor = {Exception.class, BaseException.class})
+    @GlobalTransactional(rollbackFor = Exception.class)
     public JyjcOpeningApplicationModel submitApplication(JyjcOpeningApplicationModel model, String companyCode) {
         String instanceId = model.getWorkflowProstanceId();
         this.setDefaultFieldValue(model, companyCode);
@@ -641,6 +644,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
      * 接收/驳回通知检验单
      */
     @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     public JyjcOpeningApplication executeFlow(Map<String, Object> params) {
         String instanceId = params.get("instanceId").toString();
         String nextTaskId = params.get("nextTaskId").toString();
@@ -858,6 +862,8 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     /**
      * 撤回流程办理单
      */
+    @GlobalTransactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public JyjcOpeningApplication rollBackFlow(String sequenceNbr, String instanceId, String nextTaskId) {
         String lockKey = CommonServiceImpl.buildJcExecuteLockKey(instanceId);
         RLock lock = redissonClient.getLock(lockKey);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/application-dev.properties

@@ -49,7 +49,7 @@ elasticsearch.password= a123456
 
 #Seata Config
 seata.tx-service-group= tzs-seata
-seata.service.grouplist.tzs-seata=172.16.10.243:8091
+seata.service.grouplist.tzs-seata= 172.16.10.243:8091
 
 #检验检测流程KEY
 process-definition-key.jyjc.openapplication=inspectionBusinessOpened