lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-22 13:30:56 +00:00
Code Issues Releases Activity

fix path issue

Browse Source
This commit is contained in:
coseyo 2016-01-24 00:18:16 +08:00
parent 57d522a96a
commit 4c1cfc1386
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config.go
View File

@ -103,6 +103,8 @@ var (
BConfig *Config BConfig *Config
// AppConfig is the instance of Config, store the config information from file // AppConfig is the instance of Config, store the config information from file
AppConfig *beegoAppConfig AppConfig *beegoAppConfig
// AppPath is the absolute path to the app
AppPath string
// AppConfigPath is the path to the config files // AppConfigPath is the path to the config files
AppConfigPath string AppConfigPath string
// AppConfigProvider is the provider for the config, default is ini // AppConfigProvider is the provider for the config, default is ini
@ -179,9 +181,16 @@ func init() {
// ParseConfig parsed default config file. // ParseConfig parsed default config file.
// now only support ini, next will support json. // now only support ini, next will support json.
func ParseConfig() (err error) { func ParseConfig() (err error) {
AppPath, _ := filepath.Abs(filepath.Dir(os.Args[0]))
workPath, _ := os.Getwd()
workPath, _ = filepath.Abs(workPath)
if workPath != AppPath {
os.Chdir(AppPath)
}
if AppConfigPath == "" { if AppConfigPath == "" {
// initialize default configurations // initialize default configurations
AppPath, _ := filepath.Abs(filepath.Dir(os.Args[0]))
AppConfigPath = filepath.Join(AppPath, "conf", "app.conf") AppConfigPath = filepath.Join(AppPath, "conf", "app.conf")
if !utils.FileExists(AppConfigPath) { if !utils.FileExists(AppConfigPath) {
AppConfig = &beegoAppConfig{config.NewFakeConfig()} AppConfig = &beegoAppConfig{config.NewFakeConfig()}

6
parser.go
View File

@ -130,7 +130,7 @@ func parserComments(comments *ast.CommentGroup, funcName, controllerName, pkgpat
} }
func genRouterCode() { func genRouterCode() {
os.Mkdir("routers", 0755) os.Mkdir(path.Join(AppPath, "routers"), 0755)
Info("generate router from comments") Info("generate router from comments")
var ( var (
globalinfo string globalinfo string
@ -172,7 +172,7 @@ func genRouterCode() {
} }
} }
if globalinfo != "" { if globalinfo != "" {
f, err := os.Create(path.Join("routers", commentFilename)) f, err := os.Create(path.Join(AppPath, "routers", commentFilename))
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -182,7 +182,7 @@ func genRouterCode() {
} }
func compareFile(pkgRealpath string) bool { func compareFile(pkgRealpath string) bool {
if !utils.FileExists(path.Join("routers", commentFilename)) { if !utils.FileExists(path.Join(AppPath, "routers", commentFilename)) {
return true return true
} }
if utils.FileExists(lastupdateFilename) { if utils.FileExists(lastupdateFilename) {