=新增接口

ssaw520 · Jun 10, 2019 · f5c3275 · f5c3275
1 parent 3993fbe
commit f5c3275
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/app/app.go b/app/app.go
@@ -101,6 +101,7 @@ type DefaultApp struct {
 	settings      conf.Config
 	serverList    sync.Map
 	processId     string
+	workDir     	string
 	opts          module.Options
 	routes        map[string]func(app module.App, Type string, hash string) module.ServerSession
 	defaultRoutes func(app module.App, Type string, hash string) module.ServerSession
@@ -139,7 +140,7 @@ func (app *DefaultApp) Run(debug bool, mods ...module.Module) error {
 		}
 
 	}
-
+	app.workDir=ApplicationDir
 	defaultConfPath := fmt.Sprintf("/%s/bin/conf/server.json", ApplicationDir)
 	defaultLogPath := fmt.Sprintf("%s/bin/logs", ApplicationDir)
 	defaultBIPath := fmt.Sprintf("%s/bin/bi", ApplicationDir)
@@ -388,6 +389,9 @@ func (app *DefaultApp) GetSettings() conf.Config {
 func (app *DefaultApp) GetProcessID() string {
 	return app.processId
 }
+func (app *DefaultApp) WorkDir() string {
+	return app.workDir
+}
 func (app *DefaultApp) RpcInvoke(module module.RPCModule, moduleType string, _func string, params ...interface{}) (result interface{}, err string) {
 	server, e := app.GetRouteServer(moduleType, module.GetServerId())
 	if e != nil {

diff --git a/module/module.go b/module/module.go
@@ -84,6 +84,7 @@ type App interface {
 	ProtocolMarshal(Trace string, Result interface{}, Error string) (ProtocolMarshal, string)
 	NewProtocolMarshal(data []byte) ProtocolMarshal
 	GetProcessID() string
+	WorkDir() string
 }
 
 type Module interface {

diff --git a/rpc/base/nats_server.go b/rpc/base/nats_server.go
@@ -111,6 +111,7 @@ func (s *NatsServer) on_request_handle() error {
 	for {
 		m, err := subs.NextMsg(time.Minute)
 		if err != nil && err == nats.ErrTimeout {
+			//log.Warning("NatsServer error with '%v'",err)
 			continue
 		} else if err != nil {
 			//log.Error("NatsServer error with '%v'",err)