pump version to 1.1.0, add start script

UlordChain · Oct 31, 2018 · c9edc81 · c9edc81
1 parent cc3adcd
commit c9edc81
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 199 deletions.
diff --git a/upaas/ucwallet-sdk/ReadMe.md b/upaas/ucwallet-sdk/ReadMe.md
@@ -70,4 +70,16 @@ Three line: ucwallet-service have checked the transaction above have confirm by
 You may receive a error response if your address have no enough sUT or the nonce is invalid.
 The ucwallet-service can re-execute transaction after some blocks while transaction was not package by USC.
 
+## Install
+- Install Redis server
+- Install RabbitMQ Server
+- Add manage plugin for rabbitmq
+- Add rabbitmq user for / host
+- Install Java 1.8 environment
+- Start ucwallet-service
+- Update properties for current configuration
+- Start ucwallet-sdk
+
+
+
 
diff --git a/upaas/ucwallet-sdk/src/main/java/one/ulord/upaas/ucwallet/sdk/utils/Provider.java b/upaas/ucwallet-sdk/src/main/java/one/ulord/upaas/ucwallet/sdk/utils/Provider.java
@@ -16,16 +16,9 @@
 @Component
 public class Provider {
 
-    @Value("${mq.dapp.node.name}")
-    private String nodeName;
-
     @Value("${udfs.gateway}")
     private String udfsGateway;
 
-    public String getNodeName() {
-        return nodeName;
-    }
-
     public String getUdfsGateway() {
         return udfsGateway;
     }

diff --git a/upaas/ucwallet-service/ReadMe.md b/upaas/ucwallet-service/ReadMe.md
@@ -166,3 +166,12 @@ is no problem.
 ucwallet-service periodlly check block height, and to check transaction confirm result, and send response to queue.
 
 ucwallet-sdk recieve response from queue to check current transaction execute result.
+
+
+## Install
+- Install Redis Server
+- Install RabbitMQ Server
+- Install RabbitMQ management 插件
+- Add a user for root(/) host
+- Install Java environment
+- Start ucwallet-service
diff --git a/upaas/ucwallet-service/ReadMe_zh.md b/upaas/ucwallet-service/ReadMe_zh.md
@@ -289,3 +289,10 @@ resultMsg：返回结果消息
 result：返回值
 ```
 
+## Install
+- 安装Redis Server
+- 安装RabbitMQ Server
+- 安装RabbitMQ management 插件
+- 添加一个/ host的用户
+- 安装Java环境
+- 运行ucwallet-service
diff --git a/upaas/ucwallet-service/build.gradle b/upaas/ucwallet-service/build.gradle
@@ -1,5 +1,5 @@
 group 'one.ulord.upaas'
-version '1.0.0'
+version '1.1.0'
 
 buildscript {
     ext {

diff --git a/...c/main/java/one/ulord/upaas/ucwallet/service/base/intercetor/UserSecurityInterceptor.java b/...c/main/java/one/ulord/upaas/ucwallet/service/base/intercetor/UserSecurityInterceptor.java
diff --git a/...ervice/src/main/java/one/ulord/upaas/ucwallet/service/base/threadpool/ExecutorConfig.java b/...ervice/src/main/java/one/ulord/upaas/ucwallet/service/base/threadpool/ExecutorConfig.java
diff --git a/.../java/one/ulord/upaas/ucwallet/service/base/threadpool/VisibleThreadPoolTaskExecutor.java b/.../java/one/ulord/upaas/ucwallet/service/base/threadpool/VisibleThreadPoolTaskExecutor.java
diff --git a/upaas/ucwallet-service/src/main/resources/start.bat b/upaas/ucwallet-service/src/main/resources/start.bat
@@ -0,0 +1,2 @@
+title upaas-ucwallet-service
+java -Dspring.profiles.active=dev -jar ucwallet-service-1.1.0.jar
diff --git a/upaas/ucwallet-service/src/main/resources/start.sh b/upaas/ucwallet-service/src/main/resources/start.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+java -Dspring.profiles.active=dev -jar ucwallet-service-1.1.0.jar  > /dev/null 2>&1 &
diff --git a/upaas/ucwallet-service/src/main/resources/stop.sh b/upaas/ucwallet-service/src/main/resources/stop.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+PROG=ucwallet-service-1.1
+
+pid=`ps aux | grep $PROG | grep -v "grep" | awk '{print $2}'`
+
+echo "PID is " $pid
+kill $pid
+
diff --git a/upaas/ucwallet-service/src/main/resources/view.sh b/upaas/ucwallet-service/src/main/resources/view.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+PROG="ucwallet-service-1.1"
+
+ps aux | grep $PROG | grep -v "grep"