diff --git a/xdclass-common/pom.xml b/xdclass-common/pom.xml
index aeee595..08332d3 100644
--- a/xdclass-common/pom.xml
+++ b/xdclass-common/pom.xml
@@ -120,21 +120,21 @@
-
- com.alibaba.cloud
- spring-cloud-starter-alibaba-seata
-
-
- io.seata
- seata-spring-boot-starter
-
-
-
-
- io.seata
- seata-spring-boot-starter
- 1.3.0
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xdclass-coupon-service/src/main/resources/application.yml b/xdclass-coupon-service/src/main/resources/application.yml
index 02ac841..14ab8a0 100644
--- a/xdclass-coupon-service/src/main/resources/application.yml
+++ b/xdclass-coupon-service/src/main/resources/application.yml
@@ -34,10 +34,10 @@ logging:
#seata配置
-seata:
- tx-service-group: ${spring.application.name}-group
- service:
- grouplist:
- xdclass: 134.175.219.253:8091
- vgroup-mapping:
- xdclass-coupon-service-group: xdclass
\ No newline at end of file
+#seata:
+# tx-service-group: ${spring.application.name}-group
+# service:
+# grouplist:
+# xdclass: 134.175.219.253:8091
+# vgroup-mapping:
+# xdclass-coupon-service-group: xdclass
\ No newline at end of file
diff --git a/xdclass-user-service/src/main/java/net/jieyuu/service/impl/UserServiceImpl.java b/xdclass-user-service/src/main/java/net/jieyuu/service/impl/UserServiceImpl.java
index 159ed92..59ffd6f 100644
--- a/xdclass-user-service/src/main/java/net/jieyuu/service/impl/UserServiceImpl.java
+++ b/xdclass-user-service/src/main/java/net/jieyuu/service/impl/UserServiceImpl.java
@@ -1,9 +1,6 @@
package net.jieyuu.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import io.seata.spring.annotation.GlobalTransactional;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import net.jieyuu.enums.BizCodeEnum;
import net.jieyuu.enums.SendCodeEnum;
@@ -69,7 +66,8 @@ public class UserServiceImpl extends ServiceImpl implements
* @return
*/
@Override
- @GlobalTransactional
+// @GlobalTransactional
+ @Transactional(rollbackFor = RuntimeException.class, propagation = Propagation.REQUIRED)
public JsonData register(UserRegisterRequest registerRequest) {
boolean checkCode = false;
@@ -140,9 +138,9 @@ public class UserServiceImpl extends ServiceImpl implements
request.setName(userDO.getName());
request.setUserId(userDO.getId());
JsonData jsonData = couponFeignService.addNewUserCoupon(request);
- if (jsonData.getCode() != 0) {
- throw new RuntimeException("发放优惠券异常");
- }
+// if (jsonData.getCode() != 0) {
+// throw new RuntimeException("发放优惠券异常");
+// }
log.info("发放新用户注册优惠券: {},结果:{}", request.toString(), jsonData.toString());
}
diff --git a/xdclass-user-service/src/main/resources/application.yml b/xdclass-user-service/src/main/resources/application.yml
index 86b0244..e77b2a4 100644
--- a/xdclass-user-service/src/main/resources/application.yml
+++ b/xdclass-user-service/src/main/resources/application.yml
@@ -52,10 +52,10 @@ minio:
#seata配置
-seata:
- tx-service-group: ${spring.application.name}-group
- service:
- grouplist:
- xdclass: 134.175.219.253:8091
- vgroup-mapping:
- xdclass-user-service-group: xdclass
\ No newline at end of file
+#seata:
+# tx-service-group: ${spring.application.name}-group
+# service:
+# grouplist:
+# xdclass: 134.175.219.253:8091
+# vgroup-mapping:
+# xdclass-user-service-group: xdclass
\ No newline at end of file