分布式事务引入由boot改为config

SLN/%PUBPRJ%-app/%PUBPRJ%-app-%APP_PKGPATH%/src/main/java/%SYS_PKGPATH%/%APP_PKGPATH%/%APP%Application.java.ftl

@@ -27,7 +27,6 @@ import java.util.List;
 
 @Slf4j
 @Import({
-    com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration.class,
     FeignClientsConfiguration.class
 })
 @EnableDiscoveryClient

SLN/%PUBPRJ%-boot/src/main/java/%SYS_PKGPATH%/DevBootApplication.java.ftl

@@ -53,7 +53,6 @@ import java.util.List;
 //        }
 )
 @Import({
-        com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration.class,
         org.springframework.cloud.openfeign.FeignClientsConfiguration.class
 })
 @EnableAsync

SLN/%PUBPRJ%-core/pom.xml.ftl

@@ -101,6 +101,29 @@ TARGET=PSSYSTEM
             <artifactId>jobs-spring-boot-starter</artifactId>
         </dependency>
 
+        <!--  阿里seata分布式事务 -->
+        <dependency>
+            <groupId>io.seata</groupId>
+            <artifactId>seata-spring-boot-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba</groupId>
+                    <artifactId>druid</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.seata</groupId>
+                    <artifactId>seata-spring-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
 	</dependencies>
 
     <properties>

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/extensions/service/%DE%ExService.java.ftl

@@ -54,7 +54,7 @@ public class ${item.codeName}ExService extends ${item.codeName}ServiceImpl {
      * @return
      */
     @Override
-    @Transactional
+    <@transactionalAnno deaction/>
     public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) {
         return super.${srfmethodname(deaction.getCodeName())}(et);
     }
@@ -170,4 +170,13 @@ public class ${item.codeName}ExService extends ${item.codeName}ServiceImpl {
     </#if>
 </#macro>
 
+<#comment>事务注解</#comment>
+<#macro transactionalAnno deaction>
+    <#if deaction.getUserTag?? && deaction.getUserTag()?? && deaction.getUserTag()='GlobalTransactional'>
+    @GlobalTransactional
+    <#else>
+    @Transactional
+    </#if>
+</#macro>
+
 

SLN/%PUBPRJ%-dependencies/pom.xml.ftl

@@ -300,6 +300,31 @@ TARGET=PSSYSTEM
                 <version>${r'${baomidou-jobs.version}'}</version>
             </dependency>
 
+            <!--  阿里seata分布式事务 -->
+            <dependency>
+                <groupId>io.seata</groupId>
+                <artifactId>seata-spring-boot-starter</artifactId>
+                <version>${r'${alibaba-seata.version}'}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.alibaba</groupId>
+                        <artifactId>druid</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
+                <version> ${r'${spring-cloud-alibaba.version}'}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>io.seata</groupId>
+                        <artifactId>seata-spring-boot-starter</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -395,31 +420,6 @@ TARGET=PSSYSTEM
         </dependency>
         </#if>
 
-        <!--  阿里seata分布式事务 -->
-        <dependency>
-            <groupId>io.seata</groupId>
-            <artifactId>seata-spring-boot-starter</artifactId>
-            <version>${r'${alibaba-seata.version}'}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.alibaba</groupId>
-                    <artifactId>druid</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
-            <version> ${r'${spring-cloud-alibaba.version}'}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.seata</groupId>
-                    <artifactId>seata-spring-boot-starter</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
     </dependencies>
 
 </project>

SLN/%PUBPRJ%-provider/%PUBPRJ%-provider-%SYSAPI_PKGPATH%/src/main/java/%SYS_PKGPATH%/%SYSAPI_PKGPATH%/%SYS%%API%Application.java.ftl

@@ -57,7 +57,6 @@ import java.util.List;
         </#if>
 })
 @Import({
-        com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration.class,
         org.springframework.cloud.openfeign.FeignClientsConfiguration.class
 })
 @EnableFeignClients(basePackages = {"${pub.getPKGCodeName()}" })

SLN/%PUBPRJ%-provider/%PUBPRJ%-provider-%SYSAPI_PKGPATH%/src/main/java/%SYS_PKGPATH%/%SYSAPI_PKGPATH%/config/%API%AutoConfiguration.java.ftl

@@ -16,7 +16,11 @@ import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadPoolExecutor;
+import org.springframework.context.annotation.Import;
 
+@Import({
+    com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration.class,
+})
 @Configuration
 @ConditionalOnClass(${item.codeName}RestConfiguration.class)
 @ConditionalOnWebApplication

SLN/%PUBPRJ%-provider/pom.xml.ftl

@@ -32,6 +32,30 @@ TARGET=PSSYSTEM
 			<artifactId>javax.servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
+
+        <!--  阿里seata分布式事务 -->
+        <dependency>
+            <groupId>io.seata</groupId>
+            <artifactId>seata-spring-boot-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba</groupId>
+                    <artifactId>druid</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.seata</groupId>
+                    <artifactId>seata-spring-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
 	</dependencies>
 
 </project>