Merge remote-tracking branch 'origin/develop' into main-github

account.go

@@ -200,6 +200,7 @@ func NewAccountHandler(userDetailsService IUserDetailsService, ser http.Handler,
 	srv.HandleFunc("/logout", accountHandler.logoutHandler)
 	srv.HandleFunc("/api/", accountHandler.Api)
 	srv.HandleFunc("/profession/", accountHandler.Api)
+	srv.HandleFunc("/setting/", accountHandler.Api)
 	srv.HandleFunc("/", accountHandler.View)
 	return srv
 }

app/apinto-dashboard/config.go

@@ -2,11 +2,12 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
+	"strings"
+
 	apinto "github.com/eolinker/apinto-dashboard"
 	"github.com/eolinker/apinto-dashboard/modules/professions"
 	yaml "gopkg.in/yaml.v2"
-	"io/ioutil"
-	"strings"
 )
 
 type ProfessionConfigItem struct {
@@ -15,6 +16,7 @@ type ProfessionConfigItem struct {
 	Titles     map[string][]string `yaml:"titles"`
 	Fields     []string            `yaml:"fields"`
 	Profession string              `yaml:"profession"`
+	Disable    bool                `yaml:"disable"`
 }
 
 type UserDetailsConfig struct {
@@ -91,7 +93,7 @@ func toModule(c *Config) []*apinto.Module {
 			Handler:  professions.NewProfession(cm.Name, cm.Profession, titles, fields, nil),
 			Name:     cm.Name,
 			I18nName: make(map[apinto.ZoneName]string),
-			NotView:  false,
+			//NotView:  cm.Disable,
 		}
 		for k, v := range cm.I18nNames {
 			m.I18nName[apinto.ZoneName(strings.ToLower(k))] = v

app/apinto-dashboard/main.go

@@ -4,11 +4,14 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/eolinker/apinto-dashboard/modules/apps"
+
 	apinto "github.com/eolinker/apinto-dashboard"
 	"github.com/eolinker/apinto-dashboard/internal/activity-log/sqlite"
 	apintoClient "github.com/eolinker/apinto-dashboard/internal/apinto"
 	"github.com/eolinker/apinto-dashboard/internal/security"
 	activity_log "github.com/eolinker/apinto-dashboard/modules/activity-log"
+	"github.com/eolinker/apinto-dashboard/modules/render"
 
 	"net/http"
 	"strings"
@@ -85,6 +88,25 @@ func main() {
 		Handler: routersModule,
 		Path:    "/skill/routers",
 	})
+	appModule := apps.NewApps("apps")
+	config.Modules = append(config.Modules, &apinto.Module{
+		Path:    "/apps/list",
+		Handler: appModule,
+		Name:    "apps",
+		I18nName: map[apinto.ZoneName]string{
+			apinto.ZhCn: "应用",
+			apinto.EnUs: "Apps",
+		},
+	}, &apinto.Module{
+		Handler: appModule,
+		Path:    "/profession/apps/",
+		NotView: true,
+	}, &apinto.Module{
+		NotView: true,
+		Handler: appModule,
+		Path:    "/skill/apps",
+	})
+
 	ms := toModule(cf)
 	config.Modules = append(config.Modules, ms...)
 
@@ -99,6 +121,13 @@ func main() {
 		},
 	})
 
+	renderModule := render.NewRender()
+	config.Modules = append(config.Modules, &apinto.Module{
+		Handler: renderModule,
+		Path:    "/setting/",
+		NotView: true,
+	})
+
 	activityLogModule, err := activity_log.NewActivityLog("activity-log", activityHandler)
 	if err != nil {
 		log.Panic(err)
@@ -125,12 +154,6 @@ func main() {
 		},
 	})
 
-	config.Statics = map[string]string{
-		"":    "./static",
-		"js":  "./static/js",
-		"umd": "./static/umd",
-		//"css":"./static/css",
-	}
 	service, err := apinto.Create(config)
 
 	if err != nil {

builds/.gitignore

@@ -1 +1,2 @@
 /data/
+*.DS_Store

builds/config.yml

@@ -13,16 +13,16 @@ professions:
     i18n_name:
       zh_cn: 上游服务
       en_us: upstream services
+  - name: templates
+    profession: template
+    i18n_name:
+      zh_cn: 模版
+      en_us: template
   - name: discoveries
     profession: discovery
     i18n_name:
       zh_cn: 服务发现
       en_us: discoveries
-  - name: auths
-    profession: auth
-    i18n_name:
-      zh_cn: 鉴权
-      en_us: auths
   - name: outputs
     profession: output
     i18n_name:

builds/static/js/dashboard.js

@@ -79,7 +79,10 @@ let dashboard = {
     },
     searchSkill:function (module,skill,success,error){
         this.get(`/skill/${module}?skill=${skill}`, success, error)
-    }
+    },
+    additionRender:function (driver,success,error){
+        this.get(`/setting/${driver}`, success, error)
+    },
 }
 let common = {
     /**