以2.2.1.BUILD-SNAPSHOT 为基准，适配Greenwich版本的Spring Cloud

spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/AccountApplication.java

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2019 the original author or authors.
+ * Copyright 2013-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/AccountController.java

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2019 the original author or authors.
+ * Copyright 2013-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.alibaba.cloud.examples;
 
 import java.util.Random;
@@ -34,9 +35,11 @@ public class AccountController {
 	private static final Logger LOGGER = LoggerFactory.getLogger(AccountController.class);
 
 	private static final String SUCCESS = "SUCCESS";
+
 	private static final String FAIL = "FAIL";
 
 	private final JdbcTemplate jdbcTemplate;
+
 	private Random random;
 
 	public AccountController(JdbcTemplate jdbcTemplate) {

spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2019 the original author or authors.
+ * Copyright 2013-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,18 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.alibaba.cloud.examples;
 
-import java.sql.SQLException;
+import javax.sql.DataSource;
 
 import com.alibaba.druid.pool.DruidDataSource;
 
-import io.seata.rm.datasource.DataSourceProxy;
-
-import org.springframework.context.ApplicationContext;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
+import org.springframework.context.annotation.Primary;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 /**
@@ -33,55 +32,16 @@ import org.springframework.jdbc.core.JdbcTemplate;
 @Configuration
 public class DatabaseConfiguration {
 
-	private final ApplicationContext applicationContext;
-
-	public DatabaseConfiguration(ApplicationContext applicationContext) {
-		this.applicationContext = applicationContext;
-	}
-
-	@Bean(initMethod = "init", destroyMethod = "close")
-	public DruidDataSource storageDataSource() throws SQLException {
-
-		Environment environment = applicationContext.getEnvironment();
-
-		String ip = environment.getProperty("mysql.server.ip");
-		String port = environment.getProperty("mysql.server.port");
-		String dbName = environment.getProperty("mysql.db.name");
-
-		String userName = environment.getProperty("mysql.user.name");
-		String password = environment.getProperty("mysql.user.password");
-
-		DruidDataSource druidDataSource = new DruidDataSource();
-		druidDataSource.setUrl(
-				"jdbc:mysql://" + ip + ":" + port + "/" + dbName + "?serverTimezone=UTC");
-		druidDataSource.setUsername(userName);
-		druidDataSource.setPassword(password);
-		druidDataSource.setDriverClassName("com.mysql.jdbc.Driver");
-		druidDataSource.setInitialSize(0);
-		druidDataSource.setMaxActive(180);
-		druidDataSource.setMaxWait(60000);
-		druidDataSource.setMinIdle(0);
-		druidDataSource.setValidationQuery("Select  'x' from DUAL");
-		druidDataSource.setTestOnBorrow(false);
-		druidDataSource.setTestOnReturn(false);
-		druidDataSource.setTestWhileIdle(true);
-		druidDataSource.setTimeBetweenEvictionRunsMillis(60000);
-		druidDataSource.setMinEvictableIdleTimeMillis(25200000);
-		druidDataSource.setRemoveAbandoned(true);
-		druidDataSource.setRemoveAbandonedTimeout(1800);
-		druidDataSource.setLogAbandoned(true);
-		druidDataSource.setFilters("mergeStat");
-		return druidDataSource;
+	@Bean
+	@Primary
+	@ConfigurationProperties("spring.datasource")
+	public DataSource storageDataSource() {
+		return new DruidDataSource();
 	}
 
 	@Bean
-	public DataSourceProxy dataSourceProxy(DruidDataSource druidDataSource) {
-		return new DataSourceProxy(druidDataSource);
-	}
-
-	@Bean
-	public JdbcTemplate jdbcTemplate(DataSourceProxy dataSourceProxy) {
-		JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSourceProxy);
+	public JdbcTemplate jdbcTemplate(DataSource dataSource) {
+		JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 
 		jdbcTemplate.update("delete from account_tbl where user_id = 'U100001'");
 		jdbcTemplate.update(

spring-cloud-alibaba-examples/seata-example/account-service/src/main/resources/application.properties

@@ -1,9 +1,30 @@
 spring.application.name=account-service
 server.port=18084
+spring.cloud.nacos.discovery.server-addr=localhost:8848
 
-mysql.server.ip=127.0.0.1
-mysql.server.port=3306
-mysql.db.name=demo
+spring.datasource.name="accountDataSource"
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.url=jdbc:mysql://xxx:3306/seata?useSSL=false&serverTimezone=UTC
+spring.datasource.username=xxx
+spring.datasource.password=xxx
+spring.datasource.druid.max-active=20
+spring.datasource.druid.min-idle=2
+spring.datasource.druid.initial-size=2
+
+seata.enabled=true
+spring.cloud.alibaba.seata.tx-service-group=account-service
+seata.service.vgroup-mapping.account-service=default
+seata.service.grouplist.default=127.0.0.1:8091
+seata.service.disable-global-transaction=false
+
+## if use registry center
+#seata.registry.type=nacos
+#seata.registry.nacos.cluster=default
+#seata.registry.nacos.server-addr=localhost
+#
+## if use config center
+#seata.config.type=apollo
+#seata.config.apollo.apollo-meta=http://192.168.1.204:8801
+#seata.config.apollo.app-id=seata-server
 
-mysql.user.name=root
-mysql.user.password=123456