Merge pull request #55 from zhangthen/tcc-samples
fix sofarpc tcc demo problems
diff --git a/dubbo/src/main/resources/sql/undo_log.sql b/dubbo/src/main/resources/sql/undo_log.sql
index bede844..23d801a 100644
--- a/dubbo/src/main/resources/sql/undo_log.sql
+++ b/dubbo/src/main/resources/sql/undo_log.sql
@@ -1,3 +1,4 @@
+-- 注意此处0.3.0+ 增加唯一索引 ux_undo_log
CREATE TABLE `undo_log` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`branch_id` bigint(20) NOT NULL,
@@ -8,5 +9,5 @@
`log_modified` datetime NOT NULL,
`ext` varchar(100) DEFAULT NULL,
PRIMARY KEY (`id`),
- KEY `idx_unionkey` (`xid`,`branch_id`)
+ UNIQUE KEY `ux_undo_log` (`xid`,`branch_id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
\ No newline at end of file
diff --git a/nacos/Readme.md b/nacos/Readme.md
index 5224c17..cce7252 100644
--- a/nacos/Readme.md
+++ b/nacos/Readme.md
@@ -85,6 +85,7 @@
相关建表脚本可在 [resources/sql/](https://github.com/fescar-group/fescar-samples/tree/master/nacos/src/main/resources/sql) 下获取，在相应数据库中执行 [dubbo_biz.sql](https://github.com/fescar-group/fescar-samples/blob/master/nacos/src/main/resources/sql/dubbo_biz.sql) 中的业务建表脚本，在每个数据库执行 [undo_log.sql](https://github.com/fescar-group/fescar-samples/blob/master/nacos/src/main/resources/sql/undo_log.sql) 建表脚本。
```sql
+-- 注意此处0.3.0+ 增加唯一索引 ux_undo_log
CREATE TABLE `undo_log` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`branch_id` bigint(20) NOT NULL,
@@ -95,7 +96,7 @@
`log_modified` datetime NOT NULL,
`ext` varchar(100) DEFAULT NULL,
PRIMARY KEY (`id`),
- KEY `idx_unionkey` (`xid`,`branch_id`)
+ UNIQUE KEY `ux_undo_log` (`xid`,`branch_id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
```
diff --git a/nacos/pom.xml b/nacos/pom.xml
index 3bd44b2..932019e 100644
--- a/nacos/pom.xml
+++ b/nacos/pom.xml
@@ -27,7 +27,7 @@
<artifactId>fescar-samples-nacos</artifactId>
<name>fescar-samples-nacos ${project.version}</name>
<properties>
- <fescar.version>0.2.1</fescar.version>
+ <fescar.version>0.3.0</fescar.version>
<dubbo.alibaba.version>2.6.5</dubbo.alibaba.version>
<dubbo.registry.nacos.version>0.0.2</dubbo.registry.nacos.version>
</properties>
diff --git a/nacos/src/main/resources/sql/undo_log.sql b/nacos/src/main/resources/sql/undo_log.sql
index bede844..23d801a 100644
--- a/nacos/src/main/resources/sql/undo_log.sql
+++ b/nacos/src/main/resources/sql/undo_log.sql
@@ -1,3 +1,4 @@
+-- 注意此处0.3.0+ 增加唯一索引 ux_undo_log
CREATE TABLE `undo_log` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`branch_id` bigint(20) NOT NULL,
@@ -8,5 +9,5 @@
`log_modified` datetime NOT NULL,
`ext` varchar(100) DEFAULT NULL,
PRIMARY KEY (`id`),
- KEY `idx_unionkey` (`xid`,`branch_id`)
+ UNIQUE KEY `ux_undo_log` (`xid`,`branch_id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
\ No newline at end of file
diff --git a/springboot-dubbo-fescar/samples-account/src/main/java/com/alibaba/fescar/samples/integration/account/service/TAccountServiceImpl.java b/springboot-dubbo-fescar/samples-account/src/main/java/com/alibaba/fescar/samples/integration/account/service/TAccountServiceImpl.java
index 68b794c..ce3f7b6 100644
--- a/springboot-dubbo-fescar/samples-account/src/main/java/com/alibaba/fescar/samples/integration/account/service/TAccountServiceImpl.java
+++ b/springboot-dubbo-fescar/samples-account/src/main/java/com/alibaba/fescar/samples/integration/account/service/TAccountServiceImpl.java
@@ -24,6 +24,7 @@
int account = baseMapper.decreaseAccount(accountDTO.getUserId(), accountDTO.getAmount().doubleValue());
ObjectResponse<Object> response = new ObjectResponse<>();
if (account > 0){
+ response.setStatus(RspStatusEnum.SUCCESS.getCode());
response.setMessage(RspStatusEnum.SUCCESS.getMessage());
return response;
}
diff --git a/springboot-dubbo-fescar/samples-storage/src/main/java/com/alibaba/fescar/samples/integration/storage/service/TStorageServiceImpl.java b/springboot-dubbo-fescar/samples-storage/src/main/java/com/alibaba/fescar/samples/integration/storage/service/TStorageServiceImpl.java
index 0c13e93..7423199 100644
--- a/springboot-dubbo-fescar/samples-storage/src/main/java/com/alibaba/fescar/samples/integration/storage/service/TStorageServiceImpl.java
+++ b/springboot-dubbo-fescar/samples-storage/src/main/java/com/alibaba/fescar/samples/integration/storage/service/TStorageServiceImpl.java
@@ -24,6 +24,7 @@
int storage = baseMapper.decreaseStorage(commodityDTO.getCommodityCode(), commodityDTO.getCount());
ObjectResponse<Object> response = new ObjectResponse<>();
if (storage > 0){
+ response.setStatus(RspStatusEnum.SUCCESS.getCode());
response.setMessage(RspStatusEnum.SUCCESS.getMessage());
return response;
}
diff --git a/springboot-dubbo-fescar/sql/db_gts_fescar.sql b/springboot-dubbo-fescar/sql/db_gts_fescar.sql
index 8e2fb59..414877c 100644
--- a/springboot-dubbo-fescar/sql/db_gts_fescar.sql
+++ b/springboot-dubbo-fescar/sql/db_gts_fescar.sql
@@ -69,6 +69,7 @@
-- ----------------------------
-- Table structure for undo_log
+-- 注意此处0.3.0+ 增加唯一索引 ux_undo_log
-- ----------------------------
DROP TABLE IF EXISTS `undo_log`;
CREATE TABLE `undo_log` (
@@ -81,7 +82,7 @@
`log_modified` datetime NOT NULL,
`ext` varchar(100) DEFAULT NULL,
PRIMARY KEY (`id`),
- KEY `idx_unionkey` (`xid`,`branch_id`)
+ UNIQUE KEY `ux_undo_log` (`xid`,`branch_id`)
) ENGINE=InnoDB AUTO_INCREMENT=94 DEFAULT CHARSET=utf8;
-- ----------------------------
diff --git a/springboot/src/main/resources/sql/initial_db.sql b/springboot/src/main/resources/sql/initial_db.sql
index cb7696d..fe70a73 100644
--- a/springboot/src/main/resources/sql/initial_db.sql
+++ b/springboot/src/main/resources/sql/initial_db.sql
@@ -34,6 +34,7 @@
INSERT INTO `t_asset` VALUES ('DF001', 'e2d1c4512d554db9ae4a5f30cbc2e4b1', '1');
-- ----------------------------
-- Table structure for undo_log
+-- 注意此处0.3.0+ 增加唯一索引 ux_undo_log
-- ----------------------------
CREATE TABLE `undo_log` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
@@ -45,7 +46,7 @@
`log_modified` datetime NOT NULL,
`ext` varchar(100) DEFAULT NULL,
PRIMARY KEY (`id`),
- KEY `idx_unionkey` (`xid`,`branch_id`)
+ UNIQUE KEY `ux_undo_log` (`xid`,`branch_id`)
) ENGINE=InnoDB AUTO_INCREMENT=159;
-- ----------------------------
