|
|
@@ -16,8 +16,11 @@ type ApiEngine struct {
|
|
|
func NewApiEngine(driverName, dataSourceName string, addr string) *ApiEngine {
|
|
|
|
|
|
engine := &ApiEngine{}
|
|
|
-
|
|
|
- engine.OrmEngine, _ = xorm.NewEngine(driverName, dataSourceName)
|
|
|
+ var err error
|
|
|
+ engine.OrmEngine, err = xorm.NewEngine(driverName, dataSourceName)
|
|
|
+ if err!=nil{
|
|
|
+ fmt.Println(err.Error())
|
|
|
+ }
|
|
|
initOrmEngine(engine.OrmEngine, driverName)
|
|
|
engine.GinEngine = gin.Default()
|
|
|
engine.listen_addr = addr
|
|
|
@@ -25,19 +28,27 @@ func NewApiEngine(driverName, dataSourceName string, addr string) *ApiEngine {
|
|
|
}
|
|
|
|
|
|
func initOrmEngine(orm *xorm.Engine, driverName string) {
|
|
|
- sqldir := "./sql/" + driverName
|
|
|
+ sqldir := "./sqlconfig"
|
|
|
//注册SqlMap配置,xml格式
|
|
|
err := orm.RegisterSqlMap(xorm.Xml(sqldir, ".xml"))
|
|
|
printError(err)
|
|
|
//注册SqlTemplate配置,使用Pongo2模板引擎
|
|
|
- err = orm.RegisterSqlTemplate(xorm.Pongo2(sqldir, ".stpl"))
|
|
|
+ err = orm.RegisterSqlTemplate(xorm.Pongo2(sqldir, "_"+driverName+".stpl"))
|
|
|
printError(err)
|
|
|
//注册SqlTemplate配置,使用Jet模板引擎
|
|
|
- err = orm.RegisterSqlTemplate(xorm.Jet(sqldir, ".jet"))
|
|
|
+ err = orm.RegisterSqlTemplate(xorm.Jet(sqldir, "_"+driverName+".jet"))
|
|
|
printError(err)
|
|
|
//注册SqlTemplate配置,使用html/template模板引擎
|
|
|
- err = orm.RegisterSqlTemplate(xorm.Default(sqldir, ".tpl"))
|
|
|
+ err = orm.RegisterSqlTemplate(xorm.Default(sqldir, "_"+driverName+".tpl"))
|
|
|
printError(err)
|
|
|
+
|
|
|
+ orm.StartFSWatcher()
|
|
|
+
|
|
|
+ orm.ShowSQL(true)
|
|
|
+ /*for k,_:=range orm.SqlMap.Sql{
|
|
|
+ fmt.Println(k)
|
|
|
+ }*/
|
|
|
+ //orm.ShowExecTime(true)
|
|
|
}
|
|
|
|
|
|
func printError(err error) {
|