rbac

features/dbrest/dbrest.go

@@ -29,26 +29,26 @@ type XormInsertResponse struct {
 
 var (
 	// database management rest pattern， discard
-	XormGetDataUri    = config.DefaultUriPrefix + "/databaseManagement/{apiVersion}/elementType/{databaseName}/objectType/{tableName}"
-	XormSelectDataUri = config.DefaultUriPrefix + "/databaseManagement/{apiVersion}/select/{databaseName}/{tableName}"
-	XormInsertDataUri = config.DefaultUriPrefix + "/databaseManagement/{apiVersion}/insert/{databaseName}/{tableName}"
-	XormUpdateDataUri = config.DefaultUriPrefix + "/databaseManagement/{apiVersion}/update/{databaseName}/{tableName}"
-	XormDeleteDataUri = config.DefaultUriPrefix + "/databaseManagement/{apiVersion}/delete/{databaseName}/{tableName}"
+	XormGetDataUri    = config.DefaultUriPrefix + "/databaseManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/{objectTypeValue}"
+	XormSelectDataUri = config.DefaultUriPrefix + "/databaseManagement/{apiVersion}/select/{elementTypeValue}/{objectTypeValue}"
+	XormInsertDataUri = config.DefaultUriPrefix + "/databaseManagement/{apiVersion}/insert/{elementTypeValue}/{objectTypeValue}"
+	XormUpdateDataUri = config.DefaultUriPrefix + "/databaseManagement/{apiVersion}/update/{elementTypeValue}/{objectTypeValue}"
+	XormDeleteDataUri = config.DefaultUriPrefix + "/databaseManagement/{apiVersion}/delete/{elementTypeValue}/{objectTypeValue}"
 
-	CustomXormGetDataUri    = config.UriPrefix + "/databaseManagement/{apiVersion}/elementType/{databaseName}/objectType/{tableName}"
-	CustomXormSelectDataUri = config.UriPrefix + "/databaseManagement/{apiVersion}/select/{databaseName}/{tableName}"
-	CustomXormInsertDataUri = config.UriPrefix + "/databaseManagement/{apiVersion}/insert/{databaseName}/{tableName}"
-	CustomXormUpdateDataUri = config.UriPrefix + "/databaseManagement/{apiVersion}/update/{databaseName}/{tableName}"
-	CustomXormDeleteDataUri = config.UriPrefix + "/databaseManagement/{apiVersion}/delete/{databaseName}/{tableName}"
+	CustomXormGetDataUri    = config.UriPrefix + "/databaseManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/{objectTypeValue}"
+	CustomXormSelectDataUri = config.UriPrefix + "/databaseManagement/{apiVersion}/select/{elementTypeValue}/{objectTypeValue}"
+	CustomXormInsertDataUri = config.UriPrefix + "/databaseManagement/{apiVersion}/insert/{elementTypeValue}/{objectTypeValue}"
+	CustomXormUpdateDataUri = config.UriPrefix + "/databaseManagement/{apiVersion}/update/{elementTypeValue}/{objectTypeValue}"
+	CustomXormDeleteDataUri = config.UriPrefix + "/databaseManagement/{apiVersion}/delete/{elementTypeValue}/{objectTypeValue}"
 
-	XormCommonUri   = config.DefaultUriPrefix + "/databaseManagement/{apiVersion}/{databaseName}/{tableName}" // for internal
-	XormDatabaseUri = config.DefaultUriPrefix + "/database/{apiVersion}/{databaseName}/{tableName}"           // for crontask
-	XormExtDataUri  = config.DefaultUriPrefix + "/dataManagement/{apiVersion}/{dataStorage}/{dataObject}"     // for external
-	XormDataSQLUri  = config.DefaultUriPrefix + "/dataManagement/{apiVersion}/{dataStorage}/{dataObject}"     // for external
+	XormCommonUri   = config.DefaultUriPrefix + "/databaseManagement/{apiVersion}/{elementTypeValue}/{objectTypeValue}" // for internal
+	XormDatabaseUri = config.DefaultUriPrefix + "/database/{apiVersion}/{elementTypeValue}/{objectTypeValue}"           // for crontask
+	XormExtDataUri  = config.DefaultUriPrefix + "/dataManagement/{apiVersion}/{elementTypeValue}/{objectTypeValue}"     // for external
+	XormDataSQLUri  = config.DefaultUriPrefix + "/dataManagement/{apiVersion}/{elementTypeValue}/{objectTypeValue}"     // for external
 
-	CustomXormCommonUri  = config.UriPrefix + "/databaseManagement/{apiVersion}/{databaseName}/{tableName}" // for internal
-	CustomXormExtDataUri = config.UriPrefix + "/dataManagement/{apiVersion}/{dataStorage}/{dataObject}"     // for external
-	CustomXormDataSQLUri = config.UriPrefix + "/dataManagement/{apiVersion}/{dataStorage}/{dataObject}"     // for external
+	CustomXormCommonUri  = config.UriPrefix + "/databaseManagement/{apiVersion}/{elementTypeValue}/{objectTypeValue}" // for internal
+	CustomXormExtDataUri = config.UriPrefix + "/dataManagement/{apiVersion}/{elementTypeValue}/{objectTypeValue}"     // for external
+	CustomXormDataSQLUri = config.UriPrefix + "/dataManagement/{apiVersion}/{elementTypeValue}/{objectTypeValue}"     // for external
 
 	// 查询数据库连接情况
 	UriDbConnection = config.DefaultUriPrefix + "/dataManagement/{apiVersion}/dbConnection"
@@ -58,33 +58,6 @@ var (
 
 var xormResponse XormResponse
 
-// func init() {
-// 	// database management
-// 	routes.Register("GET", XormGetDataUri, DatabaseGetData, nil)
-// 	routes.Register("GET", XormSelectDataUri, DatabaseGetData, nil)
-// 	routes.Register("POST", XormInsertDataUri, DatabaseInsertData, nil)
-// 	routes.Register("PUT", XormUpdateDataUri, DatabaseUpdateData, nil)
-// 	routes.Register("DELETE", XormDeleteDataUri, DatabaseDeleteData, nil)
-// 	// corss orgin domain
-// 	routes.Register("OPTIONS", XormGetDataUri, routes.OptionsProc, nil)
-// 	routes.Register("OPTIONS", XormSelectDataUri, routes.OptionsProc, nil)
-// 	routes.Register("OPTIONS", XormInsertDataUri, routes.OptionsProc, nil)
-// 	routes.Register("OPTIONS", XormUpdateDataUri, routes.OptionsProc, nil)
-// 	routes.Register("OPTIONS", XormDeleteDataUri, routes.OptionsProc, nil)
-
-// 	routes.Register("GET", XormCommonUri, DatabaseGetData, nil)
-// 	routes.Register("POST", XormCommonUri, DatabaseInsertData, nil)
-// 	routes.Register("PUT", XormCommonUri, DatabaseUpdateData, nil)
-// 	routes.Register("DELETE", XormCommonUri, DatabaseDeleteData, nil)
-
-// 	// corss orgin domain
-// 	routes.Register("OPTIONS", XormInsertDataUri, routes.OptionsProc, nil)
-// 	routes.Register("OPTIONS", XormUpdateDataUri, routes.OptionsProc, nil)
-// 	routes.Register("OPTIONS", XormDeleteDataUri, routes.OptionsProc, nil)
-
-// 	routes.Register("OPTIONS", XormCommonUri, routes.OptionsProc, nil)
-// }
-
 var XEngine *xorm.Engine
 
 type DatabaseClient struct {
@@ -203,7 +176,7 @@ func ExtDatabaseExecSQL(w http.ResponseWriter, r *http.Request) {
 	}
 
 	//vars := mux.Vars(r)
-	//tblName := vars["dataObject"]
+	//tblName := vars["objectTypeValue"]
 	sql = GetUriSQLArray(r)
 	// select as must, todo ...
 
@@ -263,9 +236,9 @@ func ExtDatabaseGetData(w http.ResponseWriter, r *http.Request) {
 
 	pack := "dbrest"
 	vars := mux.Vars(r)
-	module := vars["managementModule"]
-	dbname := vars["dataStorage"]
-	tbname := vars["dataObject"]
+	module := ""
+	dbname := vars["elementTypeValue"]
+	tbname := vars["objectTypeValue"]
 
 	log.Debugf("token:%s, method:%s, dbname:%s, tbname:%s", token, r.Method, module, dbname, tbname, pack)
 
@@ -352,9 +325,9 @@ func ExtDatabaseInsertData(w http.ResponseWriter, r *http.Request) {
 	}
 
 	vars := mux.Vars(r)
-	module := vars["managementModule"]
-	dbname := vars["dataStorage"]
-	tbname := vars["dataObject"]
+	module := ""
+	dbname := vars["elementTypeValue"]
+	tbname := vars["objectTypeValue"]
 	pack := "dbrest"
 
 	log.Debugf("token:%s, method:%s, dbname:%s, tbname:%s pack:%s", token, r.Method, module, dbname, tbname, pack)
@@ -408,9 +381,9 @@ func ExtDatabaseUpdateData(w http.ResponseWriter, r *http.Request) {
 	}
 
 	vars := mux.Vars(r)
-	module := vars["managementModule"]
-	dbname := vars["dataStorage"]
-	tbname := vars["dataObject"]
+	module := ""
+	dbname := vars["elementTypeValue"]
+	tbname := vars["objectTypeValue"]
 	pack := "dbrest"
 
 	log.Debugf("token:%s, method:%s, dbname:%s, tbname:%s pack:%s", token, r.Method, module, dbname, tbname, pack)
@@ -471,9 +444,9 @@ func ExtDatabaseDeleteData(w http.ResponseWriter, r *http.Request) {
 	}
 
 	vars := mux.Vars(r)
-	module := vars["managementModule"]
-	dbname := vars["dataStorage"]
-	tbname := vars["dataObject"]
+	module := ""
+	dbname := vars["elementTypeValue"]
+	tbname := vars["objectTypeValue"]
 	pack := "dbreset"
 
 	log.Debugf("token:%s, method:%s, module:%, dbname:%s, tbname:%s pack:%s", token, r.Method, module, dbname, tbname, pack)
@@ -524,7 +497,7 @@ func DatabaseGetData(w http.ResponseWriter, r *http.Request) {
 	}
 
 	vars := mux.Vars(r)
-	tblName := vars["tableName"]
+	tblName := vars["objectTypeValue"]
 	sql = GetUriSQLArray(r)
 	// select as must, todo ...
 
@@ -591,7 +564,7 @@ func DatabaseInsertData(w http.ResponseWriter, r *http.Request) {
 	}
 
 	vars := mux.Vars(r)
-	tableName := vars["tableName"]
+	tableName := vars["objectTypeValue"]
 	log.Debug("Request body:", string(body), "tableName:", tableName)
 	insertData := make(map[string]interface{})
 	_ = json.Unmarshal(body, &insertData)
@@ -631,7 +604,7 @@ func DatabaseUpdateData(w http.ResponseWriter, r *http.Request) {
 	}
 
 	vars := mux.Vars(r)
-	tblName := vars["tableName"]
+	tblName := vars["objectTypeValue"]
 	wc := services.GetUriWhereString(r)
 
 	log.Debug("Request body:", string(body), "Table name:", tblName, "wc:", wc)
@@ -664,7 +637,7 @@ func DatabaseDeleteData(w http.ResponseWriter, r *http.Request) {
 	log.Debug("DatabaseDeleteData processing... ")
 
 	vars := mux.Vars(r)
-	tblName := vars["tableName"]
+	tblName := vars["objectTypeValue"]
 	wc := services.GetUriWhereString(r)
 
 	log.Debug("Table name:", tblName, "wc:", wc)
@@ -743,7 +716,7 @@ func TaskDatabaseGetData(w http.ResponseWriter, r *http.Request) {
 	var err error
 
 	vars := mux.Vars(r)
-	tblName := vars["tableName"]
+	tblName := vars["objectTypeValue"]
 	sql = GetUriSQLArray(r)
 	// select as must, todo ...
 
@@ -810,7 +783,7 @@ func TaskDatabaseInsertData(w http.ResponseWriter, r *http.Request) {
 	}
 
 	vars := mux.Vars(r)
-	tableName := vars["tableName"]
+	tableName := vars["objectTypeValue"]
 	log.Debug("Request body:", string(body), "tableName:", tableName)
 	insertData := make(map[string]interface{})
 	_ = json.Unmarshal(body, &insertData)
@@ -850,7 +823,7 @@ func TaskDatabaseUpdateData(w http.ResponseWriter, r *http.Request) {
 	}
 
 	vars := mux.Vars(r)
-	tblName := vars["tableName"]
+	tblName := vars["objectTypeValue"]
 	wc := services.GetUriWhereString(r)
 
 	log.Debug("Request body:", string(body), "Table name:", tblName, "wc:", wc)
@@ -883,7 +856,7 @@ func TaskDatabaseDeleteData(w http.ResponseWriter, r *http.Request) {
 	log.Debug("DatabaseDeleteData processing... ")
 
 	vars := mux.Vars(r)
-	tblName := vars["tableName"]
+	tblName := vars["objectTypeValue"]
 	wc := services.GetUriWhereString(r)
 
 	log.Debug("Table name:", tblName, "wc:", wc)