Merge pull request #71 from FISCO-BCOS/release-1.0.2

Release 1.0.2

.travis.yml

@@ -3,9 +3,16 @@ branches:
   only:
       - /.*/
 
+matrix:
+  fast_finish: true
+  include:
+      - os: linux
+        dist: xenial
+        sudo: required
+
 language: java
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -20,12 +27,11 @@ before_install:
   - gradle wrapper
 
 script: |
-  sudo apt install -y openssl curl
-  curl -LO https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/master/tools/build_chain.sh && chmod u+x build_chain.sh
-  bash <(curl -s https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/master/tools/ci/download_bin.sh)
+  curl -LO https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/release-2.0.0-rc2/tools/build_chain.sh && chmod u+x build_chain.sh
+  bash <(curl -s https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/release-2.0.0-rc2/tools/ci/download_bin.sh) -b release-2.0.0-rc2
   echo "127.0.0.1:4 agency1 1,2,3" > ipconf
   ./build_chain.sh -e bin/fisco-bcos -f ipconf -p 30300,20200,8545
-  cd nodes/127.0.0.1
-  ./start_all.sh
+  ./nodes/127.0.0.1/start_all.sh
   cp nodes/127.0.0.1/sdk/* src/main/resources/
+  mv src/main/resources/applicationContext-sample.xml src/main/resources/applicationContext.xml
   ./gradlew build

Changelog.md

@@ -1,3 +1,19 @@
+### v1.0.2
+
+(2019-04-19)
+
+* Update
+
+1. `console/conf`目录下移除`applicationContext.xml`配置文件和`ca.crt`， `node.crt`，`node.key`文件。新增`applicationContext-sample.xml`配置文件。
+2. 一个控制台部署合约，另一个控制台可以直接调用合约。
+3. `callByCNS`支持在不传合约版本号时调用最新版本合约。传入版本号时，其合约名与版本号使用英文冒号分隔，例如`HelloWorld:1.0`
+4. 重复创建用户表会提示表已存在的错误信息，无权限的账号对用户表进行增删改操作会提示无权限信息。（适配fisco bcos 2.0.0-rc2）
+5. 调用合约时，传入错误合约地址会获取错误提示信息。（适配fisco bcos 2.0.0-rc2）
+6. 部署合约后，显示的合约地址前面加字符串`contract address:`。
+7. 合约地址只能省略前缀0，不能省略`0x`。例如`0x000ac78`可以简写成`0xac78`。
+8. `help`命令显示的命令列表进行了字典排序。
+
+
 ### v1.0.1
 
 (2019-04-08)
@@ -9,8 +25,9 @@
 3. `start.sh`脚本中增加对Java版本检测。
 
 * Update
+
 1. 支持合约引入Solidity library库。
-2. 支持合约地址可以省略0x以及前缀0。例如，0x000ac78可以简写成0xac78或ac78。
+2. 支持合约地址可以省略前缀0。例如，`0x000ac78`可以简写成`0xac78`。
 3. 优化命令的帮助信息。
 
 ### v1.0.0

build.gradle

@@ -11,7 +11,7 @@ targetCompatibility = 1.8
 repositories {
     maven { url "http://maven.aliyun.com/nexus/content/groups/public/" }
     maven { url "https://dl.bintray.com/ethereum/maven/" }
-//    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
     mavenCentral()
 }
 
@@ -39,16 +39,16 @@ dependencies {
 	compile logger,spring
 	runtime logger,spring
 
-//	compile group:"org.fisco-bcos", name:"web3sdk", version:"2.0-SNAPSHOT", changing: true
-	compile	'org.fisco-bcos:web3sdk:2.0.0-rc1'
-	compile 'org.jline:jline:3.9.0'
+	compile group:"org.fisco-bcos", name:"web3sdk", version:"2.0.3-SNAPSHOT", changing: true
+//	compile	'org.fisco-bcos:web3sdk:2.0.0-rc1'
+	compile 'org.jline:jline:3.10.0'
 	compile 'io.bretty:console-table-builder:1.2'
 	testCompile 'junit:junit:4.12'
 }
 
-//configurations.all {
-//	resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
-//}
+configurations.all {
+	resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+}
 sourceSets {
 	main {
 		java {
@@ -74,7 +74,9 @@ jar {
 			into 'dist/lib'
 		}
 		copy {
-			from file('src/main/resources/')
+			from file('src/main/resources/applicationContext-sample.xml')
+      from file('src/main/resources/log4j.properties')
+      from file('src/main/resources/privateKey.properties')
 			into 'dist/conf'
 		}
 		copy {
@@ -87,14 +89,12 @@ jar {
 			into 'dist/tools/'
 		}
 		copy {
-			from file('src/main/resources/contract/HelloWorld.sol')
-			from file('src/main/resources/contract/Table.sol')
-			from file('src/main/resources/contract/TableTest.sol')
-			into 'dist/solidity/contracts'
+			from file('src/main/resources/contract/')
+			into 'dist/solidity/contracts/'
 		}
 		copy {
 			from file('src/main/resources/contract/Table.sol')
-			into 'dist/tools/contracts'
+			into 'dist/tools/contracts/'
 		}
 	}
 }

release_note.txt

@@ -1 +1 @@
-v1.0.1
+v1.0.2