From 82894c34fa9c3a822a33f9e9ebf0a139cdc1d4fc Mon Sep 17 00:00:00 2001 From: 王彬 Date: Fri, 2 Apr 2021 20:15:10 +0800 Subject: [PATCH] infra version update --- build.gradle | 13 +++++++------ src/test/java/com/taover/repository/test/TestAutoconfigure.java | 12 +++++++----- src/test/resources/application.properties | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 128bdc0..9ed035c 100644 --- a/build.gradle +++ b/build.gradle @@ -20,17 +20,18 @@ mainClassName = 'com.taover.repository.UtilsString' dependencies { compile("org.springframework.boot:spring-boot-starter:2.0.5.RELEASE") compile("org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final") - compile('org.springframework:spring-jdbc:5.1.9.RELEASE') - compile('mysql:mysql-connector-java:8.0.11') - compile('com.alibaba:druid:1.2.4') + compile('org.springframework:spring-jdbc:5.1.9.RELEASE') + compile('com.alibaba:druid:1.2.4') compile("org.apache.shardingsphere:shardingsphere-jdbc-core-spring-boot-starter:5.0.0-alpha") + compile("org.apache.shardingsphere:shardingsphere-infra-binder:6.0.0-alpha") + testCompile('mysql:mysql-connector-java:8.0.11') } repositories { - jcenter() - maven{ url 'http://repository.sonatype.org/content/groups/public/' } - maven{ url 'https://repository.jboss.org/nexus/content/groups/public/' } maven{ url 'http://nexus.taover.com:9001/repository/maven-releases/' } + jcenter() + //maven{ url 'http://repository.sonatype.org/content/groups/public/' } + //maven{ url 'https://repository.jboss.org/nexus/content/groups/public/' } } task sourcesJar(type: Jar, dependsOn: classes) { diff --git a/src/test/java/com/taover/repository/test/TestAutoconfigure.java b/src/test/java/com/taover/repository/test/TestAutoconfigure.java index c3fe135..ce2388d 100644 --- a/src/test/java/com/taover/repository/test/TestAutoconfigure.java +++ b/src/test/java/com/taover/repository/test/TestAutoconfigure.java @@ -3,7 +3,6 @@ package com.taover.repository.test; import java.util.List; import java.util.Map; -import org.apache.shardingsphere.infra.executor.sql.ExecutorConstant; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ConfigurableApplicationContext; @@ -26,10 +25,12 @@ public class TestAutoconfigure { // System.out.println(jdbcTemplate.queryForList("select * from wxorder_order limit 1", 2L)); // System.out.println(jdbcTemplate.queryForList("select * from wxorder_order_express limit 1", 1L)); - String sql = " SELECT wo.customer_network_name as customerNetworkName,wo.order_sn AS orderSn, wog.`goods_name` AS goodsName, wog.`sku_name` AS skuName, wog.`goods_number` AS saleNumber," - // woe.order_goods_id woe.order_goods_origin_id - //+ " (SELECT woe.`goods_number` from `wxorder_order_express` as woe WHERE woe.order_goods_id = wog.id and woe.tenant_id=16) as deliveryGoodsNumber, " - + " ww.name as wareName, ww.manager_nickname as wareManager, " + String sql = " SELECT " + + " wog.`goods_number` AS saleNumber," + + " (SELECT sum(woe.`goods_number`) from `wxorder_order_express` as woe WHERE woe.order_goods_id = wog.id and woe.tenant_id=16) as deliveryGoodsNumber, " + + " (SELECT sum(woe.`goods_number`) from `wxorder_order_express` as woe WHERE woe.order_goods_id = wog.id and woe.tenant_id=16) ee, " + + " ww.name as wareName," + + " ww.manager_nickname as wareManager, " + " wc.name as channelName, " + " wog.goods_base_sku_price as costSinglePrice, " + " wc.manager_nickname as channelManager," @@ -40,6 +41,7 @@ public class TestAutoconfigure { + " wog.channel_goods_price as channelGoodsPrice, " + " wog.money_paid as moneyPaid, " + " wo.create_time as orderTime " + //+ " 'aa' " + " FROM `wxorder_order` wo " + " INNER JOIN `wxorder_order_goods_origin` wog ON wo.id = wog.`order_id` and wo.tenant_id=16 and wog.tenant_id=16 " + " INNER JOIN wxorder_channel as wc on wc.id = wo.channel_id " diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index e92d7dc..7891f56 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -13,7 +13,7 @@ spring.gson.serialize-nulls=true spring.mvc.dispatch-options-request=true # shardingspere -spring.shardingsphere.datasource.names=ds1 +spring.shardingsphere.datasource.names=ds0 spring.shardingsphere.datasource.common.type=com.alibaba.druid.pool.DruidDataSource spring.shardingsphere.datasource.common.driver-class-name=com.mysql.cj.jdbc.Driver spring.shardingsphere.datasource.ds0.url=jdbc:mysql://rdsifmezqifmezqo.mysql.rds.aliyuncs.com:3306/bzyun_wxorder?characterEncoding=UTF-8 -- libgit2 0.21.2