Modify database script

Change-Id: Ice12c7810a183c4dbb501f7f6fd38499be9aaff7
Issue-ID:HOLMES-47
Signed-off-by: tangpeng <tang.peng5@zte.com.cn>

diff --git a/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml b/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml
index 91d6eb4..7b8b883 100644 (file)
--- a/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml
+++ b/rulemgt-standalone/src/main/assembly/conf/rulemgt.yml
@@ -9,7 +9,7 @@ apidescription: ZTE Holmes rule Management rest API
 
 server:
   type: simple
-  rootPath:  '/api/correlation-mgt/v1/*'
+  rootPath:  '/api/holmes-rulemgt/v1/*'
   applicationContextPath: /
   adminContextPath: /admin
   connector:
@@ -49,9 +49,8 @@ logging:
 database:
   driverClass: com.mysql.jdbc.Driver
   user: root
-  password: root
-  #url: jdbc:mysql://${db_ip}:${db_port}/mysql?useUnicode=relationtesttrue&characterEncoding=UTF8
-  url: jdbc:mysql://localhost:3306/relationtest?useUnicode=true&characterEncoding=UTF8
+  password: rootpass
+  url: jdbc:mysql://10.74.156.206:3306/holmes
   properties:
     charSet: UTF-8
   maxWaitForConnection: 1s
@@ -61,67 +60,5 @@ database:
   checkConnectionWhileIdle: false
   evictionInterval: 10s
   minIdleTime: 1s
-  #dbServiceName: dbService
- # dbServiceVersion: v1
-
-#mqConfig:
-#  brokerIp: 127.0.0.1
-#  brokerPort: 61616
-#  autoDiscover: false
-#  mqServiceName: activemq
-#  mqServiceVersion: v1
-#
-#cacheConfig:
-#  cacheServerIp: 10.74.156.206
-#  cacheServerPort: 27017
-#  autoDiscover: false
-#  cacheServiceName: mongodbService
-#  cacheServiceVersion: v1
-#  asNamespace: zenap
-#  type: mongodb
-#  userName: zenap
-#  password: zenap
-#
 # the micro service ip
-
-#msbClientConfig:
- # msbSvrIp: 10.74.156.206
- # msbSvrPort: 10081
-
-#kafkaClientConf:
-#  bootstrapServers: 10.74.151.190:9092
-#  autoDiscover: true
-#  kafkaServiceName: kafka
-#  kafkaServiceVersion: v1
-#  consumerConf:
-#    properties:
-#      value.deserializer: org.apache.kafka.common.serialization.StringDeserializer
-#  producerConf:
-#    properties:
-#      value.serializer: org.apache.kafka.common.serialization.StringSerializer
-#
-#zkConfig:
-#  connectString: 10.74.151.195:2181
-#  retryPolicy:
-#    type: boundedExponentialBackoff
-#    baseSleepTimeMs: 50
-#    maxSleepTimeMs: 500
-#    maxRetries: 3
-#  sessionTimeout: 60
-#  connectionTimeout: 15
-#    autoDiscover: true
-#  zkServiceName: zk
-#  zkServiceVersion: v1
-#
-#ftpServiceConfig:
-#  type: ftp
-#  pasv: false
-#  userName: uep
-#  userPassword: U_tywg_2008_ftp
-#  ftpServerAddress: 10.74.148.251
-#  ftpServerPort: 20021
-#  ftpsServerAddress: 10.74.148.251
-#  ftpsServerPort: 20021
-#  sftpServerAddress: 10.74.148.251
-#  sftpServerPort: 20021
-#
+msbServerAddr: http://127.0.0.1:80

diff --git a/rulemgt-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_rulemgt-createobj.sql b/rulemgt-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_rulemgt-createobj.sql
index c8ba2bd..4d6b296 100644 (file)
--- a/rulemgt-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_rulemgt-createobj.sql
+++ b/rulemgt-standalone/src/main/assembly/dbscripts/mysql/openo-holmes_rulemgt-createobj.sql
@@ -13,46 +13,48 @@
 -- See the License for the specific language governing permissions and\r
 -- limitations under the License.\r
 --\r
-/******************drop old database and user***************************/\r
-use mysql;\r
-drop database IF  EXISTS holmes;\r
-delete from user where User='holmes';\r
+/******************DROP OLD DATABASE AND USER***************************/\r
+USE MYSQL;\r
+DROP DATABASE IF  EXISTS HOLMES;\r
+DELETE FROM USER WHERE USER='HOLMES';\r
 FLUSH PRIVILEGES;\r
 \r
-/******************create new database and user***************************/\r
-create database holmes CHARACTER SET utf8;\r
+/******************CREATE NEW DATABASE AND USER***************************/\r
+CREATE DATABASE HOLMES CHARACTER SET UTF8;\r
 \r
-GRANT ALL PRIVILEGES ON holmes.* TO 'holmes'@'%' IDENTIFIED BY 'holmes' WITH GRANT OPTION;\r
-GRANT ALL PRIVILEGES ON mysql.* TO 'holmes'@'%' IDENTIFIED BY 'holmes' WITH GRANT OPTION;\r
+GRANT ALL PRIVILEGES ON HOLMES.* TO 'HOLMES'@'%' IDENTIFIED BY 'HOLMES' WITH GRANT OPTION;\r
+GRANT ALL PRIVILEGES ON MYSQL.* TO 'HOLMES'@'%' IDENTIFIED BY 'HOLMES' WITH GRANT OPTION;\r
 \r
-GRANT ALL PRIVILEGES ON catalog.* TO 'holmes'@'localhost' IDENTIFIED BY 'holmes' WITH GRANT OPTION;\r
-GRANT ALL PRIVILEGES ON mysql.* TO 'holmes'@'localhost' IDENTIFIED BY 'holmes' WITH GRANT OPTION;\r
+GRANT ALL PRIVILEGES ON CATALOG.* TO 'HOLMES'@'LOCALHOST' IDENTIFIED BY 'HOLMES' WITH GRANT OPTION;\r
+GRANT ALL PRIVILEGES ON MYSQL.* TO 'HOLMES'@'LOCALHOST' IDENTIFIED BY 'HOLMES' WITH GRANT OPTION;\r
 FLUSH PRIVILEGES;\r
 \r
-use holmes;\r
-set Names 'utf8';\r
-/******************delete old table and create new***************************/\r
-use holmes;\r
-DROP TABLE IF EXISTS aplus_rule;\r
-CREATE TABLE aplus_rule (\r
-  rid varchar(30) NOT NULL,\r
-  name varchar(150) NOT NULL,\r
-  description varchar(4000)  DEFAULT NULL,\r
-  enable int(1) NOT NULL,\r
-  templateID int(10) NOT NULL,\r
-  engineType varchar(20)  NOT NULL,\r
-  creator varchar(20)  NOT NULL,\r
-  createTime datetime NOT NULL,\r
-  updator varchar(20)  DEFAULT NULL,\r
-  updateTime datetime DEFAULT NULL,\r
-  params varchar(4000)  DEFAULT NULL,\r
-  content varchar(4000)  NOT NULL,\r
-  vendor varchar(100)  NOT NULL,\r
-  package varchar(255) NULL,\r
-  PRIMARY KEY (rid),\r
-  UNIQUE KEY name (name),\r
-  KEY IDX_APLUS_RULE_ENABLE (enable),\r
-  KEY IDX_APLUS_RULE_TEMPLATEID (templateID),\r
-  KEY IDX_APLUS_RULE_ENGINETYPE (engineType)\r
+USE HOLMES;\r
+SET NAMES 'UTF8';\r
+/******************DELETE OLD TABLE AND CREATE NEW***************************/\r
+USE HOLMES;\r
+DROP TABLE IF EXISTS APLUS_RULE;\r
+CREATE TABLE APLUS_RULE (\r
+  RID VARCHAR(30) NOT NULL,\r
+  NAME VARCHAR(150) NOT NULL,\r
+  DESCRIPTION VARCHAR(4000) NULL,\r
+  ENABLE INT(1) NOT NULL,\r
+  TEMPLATEID INT(10) NOT NULL,\r
+  ENGINEID VARCHAR(20)  NOT NULL,\r
+  ENGINETYPE VARCHAR(20)  NOT NULL,\r
+  CREATOR VARCHAR(20)  NOT NULL,\r
+  CREATETIME DATETIME NOT NULL,\r
+  UPDATOR VARCHAR(20)  NULL,\r
+  UPDATETIME DATETIME NULL,\r
+  PARAMS VARCHAR(4000) NULL,\r
+  CONTENT VARCHAR(4000) NOT NULL,\r
+  VENDOR VARCHAR(100)  NOT NULL,\r
+  PACKAGE VARCHAR(255) NULL,\r
+  PRIMARY KEY (RID),\r
+  UNIQUE KEY NAME (NAME),\r
+  KEY IDX_APLUS_RULE_ENABLE (ENABLE),\r
+  KEY IDX_APLUS_RULE_TEMPLATEID (TEMPLATEID),\r
+  KEY IDX_APLUS_RULE_ENGINEID (ENGINEID),\r
+  KEY IDX_APLUS_RULE_ENGINETYPE (ENGINETYPE)\r
 )\r
 \r