Merge branch 'lichang' into lite

build/default/omc.yaml

@@ -46,35 +46,33 @@ trace:
 
 # data source
 database:
+  dataSource:
+    # std: standard
+    std:
+      type: "mysql"
+      host: "127.0.0.1"
+      port: 33066
+      username: "root"
+      password: "1000omc@kp!"
+      database: "omc_db"
+    # lite: lite
+    lite:
+      type: "sqlite"
+      database: "/usr/local/etc/omc/database/omc_db.sqlite" 
   # default data source name
   defaultDataSourceName: "lite"
-  # dataSource:
-  #   # std: standard
-  #   std:
-  #     type: "mysql"
-  #     host: "127.0.0.1"
-  #     port: 3306
-  #     username: "<username>"
-  #     password: "<password>"
-  #     database: "<database>"
-  #     logging: false
-  #   # lite: lite
-  #   lite:
-  #     type: "sqlite"
-  #     database: "<database path>" 
-  #     logging: false
 
 
 # redis cached data
 redis:
+  dataSource:
+    default:
+      port: 6379 # Redis port
+      host: "127.0.0.1" # Redis host
+      password: "helloearth"
+      db: 10 # Redis db_num
   # default data source name
   defaultDataSourceName: "default"
-  # dataSource:
-  #   default:
-  #     port: 6379 # port
-  #     host: "127.0.0.1" # host
-  #     password: "<password>"
-  #     db: 10 # db_num
 
 
 # file: log file name