Merge pull request #26 from IceWhaleTech/v0.2.1

add sync function

pkg/utils/httper/httper.go

@@ -53,10 +53,13 @@ func Get(url string, head map[string]string) (response string) {
 //发送POST请求
 //url:请求地址，data:POST请求提交的数据,contentType:请求体格式，如：application/json
 //content:请求放回的内容
-func Post(url string, data interface{}, contentType string) (content string) {
-	jsonStr, _ := json.Marshal(data)
-	req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonStr))
+func Post(url string, data []byte, contentType string, head map[string]string) (content string) {
+
+	req, err := http.NewRequest("POST", url, bytes.NewBuffer(data))
 	req.Header.Add("content-type", contentType)
+	for k, v := range head {
+		req.Header.Add(k, v)
+	}
 	if err != nil {
 		panic(err)
 	}

route/route.go

@@ -175,7 +175,7 @@ func InitRouter() *gin.Engine {
 			v1AppGroup.GET("/rely/:id/info", v1.ContainerRelyInfo)
 			v1AppGroup.GET("/install/config", v1.GetDockerInstallConfig)
 			//v1AppGroup.POST("/custom/install", v1.CustomInstallApp)
-
+			v1AppGroup.POST("/share", v1.ShareAppFile)
 		}
 
 		v1SysGroup := v1Group.Group("/sys")
@@ -266,7 +266,9 @@ func InitRouter() *gin.Engine {
 		{
 			v1SearchGroup.GET("/search", v1.GetSearchList)
 		}
-		v1Group.Any("/sync/*url", v1.SyncToSyncthing)
+		v1Group.GET("/sync/config", v1.GetSyncConfig)
+		v1Group.Any("/syncthing/*url", v1.SyncToSyncthing)
+
 	}
 	return r
 }

route/v1/app.go

@@ -1,6 +1,8 @@
 package v1
 
 import (
+	"encoding/json"
+	"io/ioutil"
 	"net/http"
 	"strconv"
 
@@ -197,3 +199,16 @@ func CategoryList(c *gin.Context) {
 	list = append(list, rear...)
 	c.JSON(http.StatusOK, &model.Result{Success: oasis_err2.SUCCESS, Message: oasis_err2.GetMsg(oasis_err2.SUCCESS), Data: list})
 }
+
+// @Summary 分享该应用配置
+// @Produce  application/json
+// @Accept application/json
+// @Tags app
+// @Security ApiKeyAuth
+// @Success 200 {string} string "ok"
+// @Router /app/share [post]
+func ShareAppFile(c *gin.Context) {
+	str, _ := ioutil.ReadAll(c.Request.Body)
+	content := service.MyService.OAPI().ShareAppFile(str)
+	c.JSON(http.StatusOK, json.RawMessage(content))
+}

route/v1/sync.go

@@ -1,22 +1,35 @@
 package v1
 
 import (
+	"net/http"
 	"net/http/httputil"
 	"net/url"
+	"strings"
 
+	"github.com/IceWhaleTech/CasaOS/model"
 	"github.com/IceWhaleTech/CasaOS/pkg/config"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/oasis_err"
 	"github.com/gin-gonic/gin"
 )
 
 func SyncToSyncthing(c *gin.Context) {
 	u := c.Param("url")
-	target := "http://127.0.0.1:" + config.SystemConfigInfo.SyncPort
+	target := "http://" + strings.Split(c.Request.Host, ":")[0] + ":" + config.SystemConfigInfo.SyncPort
 	remote, err := url.Parse(target)
 	if err != nil {
 		return
 	}
 	proxy := httputil.NewSingleHostReverseProxy(remote)
 	c.Request.Header.Add("X-API-Key", config.SystemConfigInfo.SyncKey)
+	//c.Request.Header.Add("X-API-Key", config.SystemConfigInfo.SyncKey)
 	c.Request.URL.Path = u
+
 	proxy.ServeHTTP(c.Writer, c.Request)
 }
+
+func GetSyncConfig(c *gin.Context) {
+	data := make(map[string]string)
+	data["key"] = config.SystemConfigInfo.SyncKey
+	data["port"] = config.SystemConfigInfo.SyncPort
+	c.JSON(http.StatusOK, model.Result{Success: oasis_err.SUCCESS, Message: oasis_err.GetMsg(oasis_err.SUCCESS), Data: data})
+}

service/casa.go

@@ -16,11 +16,21 @@ type CasaService interface {
 	GetServerCategoryList() []model.ServerCategoryList
 	GetTaskList(size int) []model2.TaskDBModel
 	GetServerAppInfo(id string) model.ServerAppList
+	ShareAppFile(body []byte) string
 }
 
 type casaService struct {
 }
 
+func (o *casaService) ShareAppFile(body []byte) string {
+	head := make(map[string]string)
+
+	head["Authorization"] = GetToken()
+
+	content := httper2.Post(config.ServerInfo.ServerApi+"/v1/community/add", body, "application/json", head)
+	return content
+}
+
 func (o *casaService) GetTaskList(size int) []model2.TaskDBModel {
 	head := make(map[string]string)
 

types/system.go

@@ -1,4 +1,4 @@
 package types
 
-const CURRENTVERSION = "0.1.11"
-const BODY = "<li>Resolve application installation path errors</li><li>Mobile Adaptation</li><li>Optimize user experience</li>"
+const CURRENTVERSION = "0.2.0"
+const BODY = "<li>add sync function</li><li>fixed some error</li>"