Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: MVP1 development tasks. #54

Closed
wants to merge 17 commits into from
Closed

feat: MVP1 development tasks. #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
20abcca
use gop to build file and Distinguish between the deployment of diffe…
linjie7674 Jan 26, 2024
1c5dc21
Merge pull request #26 from linjie7674/bugfix/deploy
IRONICBo Jan 28, 2024
1d47835
feat: Add logout api.
IRONICBo Jan 28, 2024
a63c48e
update
linjie7674 Jan 28, 2024
cfc86ef
Get the content of the branch name with a slash at the end as the bra…
linjie7674 Jan 28, 2024
8d8ec8b
add share protocol
LiusCraft Jan 29, 2024
e81b98d
Merge pull request #28 from linjie7674/bugfix/push_docker
IRONICBo Jan 29, 2024
29b5300
Merge pull request #29 from LiusCraft/docs/share
IRONICBo Jan 29, 2024
567b344
Merge branch 'dev' into docs/function-modules
IRONICBo Jan 29, 2024
633a4f1
docs: Update arch and translation.
IRONICBo Jan 29, 2024
86569f1
docs: update web module
Kasey0727 Jan 29, 2024
c528c9c
Merge pull request #9 from Kasey0727/main
Baihhh Jan 30, 2024
259c6bc
Merge pull request #8 from IRONICBo/docs/function-modules
Baihhh Jan 30, 2024
dbef2ba
fix: Update to xlog.
IRONICBo Jan 30, 2024
2d5a618
fix: Refresh static path.
IRONICBo Jan 30, 2024
6a2829d
chore: Update vue demo.
IRONICBo Jan 30, 2024
19bb76f
Merge branch 'merge' into feat/mvp-20240119
IRONICBo Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@ jobs:
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Set branch name to an output variable
id: set_branch
run: echo "BRANCH_NAME=${GITHUB_REF##*/}" >> $GITHUB_ENV
-
name: Build and push
uses: docker/build-push-action@v5
with:
push: true
tags: ${{ secrets.DOCKERHUB_USERNAME }}/goplus-community-${{ github.ref_name }}:latest
tags: ${{ secrets.DOCKERHUB_USERNAME }}/goplus-community-${{ env.BRANCH_NAME }}:latest
69 changes: 45 additions & 24 deletions cmd/gopcomm/community_yap.gox
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/goplus/community/markdown"
"github.com/goplus/community/translation"
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
"go.uber.org/zap"
language "golang.org/x/text/language"
_ "github.com/joho/godotenv/autoload"
"github.com/qiniu/x/xlog"
)

var (
Expand All @@ -28,11 +28,11 @@ const (
todo := context.TODO()
endpoint := os.Getenv("GOP_COMMUNITY_ENDPOINT")
domain := os.Getenv("GOP_COMMUNITY_DOMAIN")
logger, _ := zap.NewProduction()
defer logger.Sync()
zlog := logger.Sugar()
xLog := xlog.New("")

static "/"
// Modify / to /static
// Support 404 handle
static "/static"

get "/success", ctx => {
ctx.yap "2xx", {}
Expand All @@ -46,6 +46,10 @@ get "/failed", ctx => {
ctx.yap "5xx", {}
}

get "/demo", ctx => {
ctx.yap "demo", {}
}

get "/p/:id", ctx => {
// todo middleware
// Get User Info
Expand All @@ -54,7 +58,7 @@ get "/p/:id", ctx => {
if err == nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is there no reverse judgment？ like

if err != nil {}

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I will update it.

user, err = community.getUser(token.Value)
if err != nil {
zlog.Error("get user error:", err)
xLog.Error("get user error:", err)
}
}

Expand Down Expand Up @@ -87,7 +91,7 @@ get "/user/:id", ctx => {
// Get current User Info by id
userClaim, err := community.getUserClaim(id)
if err != nil {
zlog.Error("get current user error:", err)
xLog.Error("get current user error:", err)
}
// todo middleware
// get user by token
Expand All @@ -96,7 +100,7 @@ get "/user/:id", ctx => {
if err == nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

handle err != nil scenario

user, err = community.getUser(token.Value)
if err != nil {
zlog.Error("get user error:", err)
xLog.Error("get user error:", err)
}
}
// get article list published by uid
Expand Down Expand Up @@ -124,7 +128,7 @@ get "/", ctx => {
if err == nil {
user, err = community.getUser(token.Value)
if err != nil {
zlog.Error("get user error:", err)
xLog.Error("get user error:", err)
}
}

Expand Down Expand Up @@ -172,7 +176,7 @@ get "/search", ctx => {
if err == nil {
user, err = community.getUser(token.Value)
if err != nil {
zlog.Error("get user error:", err)
xLog.Error("get user error:", err)
}
}

Expand Down Expand Up @@ -206,7 +210,7 @@ get "/edit/:id", ctx => {
id := ctx.param("id")
if id != "" {
if editable, _ := community.canEditable(todo, uid, id); !editable {
zlog.Error("no permissions")
xLog.Error("no permissions")
http.Redirect(ctx.ResponseWriter, ctx.Request, "/error", http.StatusTemporaryRedirect)
}
article, _ := community.article(todo, id)
Expand Down Expand Up @@ -340,15 +344,15 @@ post "/upload", ctx => {
ctx.ParseMultipartForm(10 << 20)

if err != nil {
zlog.Error("upload file error:", filename)
xLog.Error("upload file error:", filename)
ctx.JSON(500, err.Error())
return
}


dst, err := os.Create(filename)
if err != nil {
zlog.Error("create file error:", file)
xLog.Error("create file error:", file)
ctx.JSON(500, err.Error())
return
}
Expand All @@ -357,21 +361,21 @@ post "/upload", ctx => {
dst.Close()
err = os.Remove(filename)
if err != nil {
zlog.Error("delete file error:", filename)
xLog.Error("delete file error:", filename)
return
}
}()


_, err = io.Copy(dst, file)
if err != nil {
zlog.Error("copy file errer:", filename)
xLog.Error("copy file errer:", filename)
ctx.JSON(500, err.Error())
return
}
bytes, err := os.ReadFile(filename)
if err != nil {
zlog.Error("read file errer:", filename)
xLog.Error("read file errer:", filename)
ctx.JSON(500, err.Error())
return
}
Expand All @@ -391,7 +395,7 @@ post "/upload", ctx => {
}
id,err:=community.SaveMedia(context.Background(), uid, bytes)
if err!=nil {
zlog.Error("save file",err.Error())
xLog.Error("save file",err.Error())
ctx.JSON(500, err.Error())
return
}
Expand All @@ -402,19 +406,36 @@ post "/upload", ctx => {

get "/login", ctx => {
// Get URL from query string
redirectURL := ctx.URL.Query().Get("redirect_url")
// redirectURL := ctx.URL.Query().Get("redirect_url")
// Get current request page URL from
// Concatenate the current request page URL from refer
redirectURL := fmt.Sprintf("%s/%s", ctx.Request.Referer() + "callback")

loginURL := community.RedirectToCasdoor(redirectURL)
ctx.Redirect loginURL, http.StatusFound
}

get "/logout", ctx => {
tokenCookie, err := ctx.Request.Cookie("token")
if err != nil {
xLog.Error("get token error:", err)
}

// Delete token
tokenCookie.MaxAge = -1
http.SetCookie(ctx.ResponseWriter, tokenCookie)

// Redirect to home page
http.Redirect(ctx.ResponseWriter, ctx.Request, fmt.Sprintf("http://localhost:8080"), http.StatusFound)
}

get "/callback", ctx => {
code :=ctx.URL.Query().Get("code")
state :=ctx.URL.Query().Get("state")

token, error := community.GetAccessToken(code, state)
if error != nil {
zlog.Error("err",error) // Redirect to login
xLog.Error("err",error) // Redirect to login
}

cookie := http.Cookie{
Expand All @@ -427,7 +448,7 @@ get "/callback", ctx => {

// Redirect to home page
// TODO: Get redirect URL from state
http.Redirect(ctx.ResponseWriter, ctx.Request, fmt.Sprintf("http://localhost:8080?token=%s", token.AccessToken), http.StatusFound)
http.Redirect(ctx.ResponseWriter, ctx.Request, fmt.Sprintf("http://localhost:8080"), http.StatusFound)
}

conf := &core.Config{}
Expand All @@ -436,11 +457,11 @@ trans = translation.New(os.Getenv("NIUTRANS_API_KEY"), "", "")
core.CasdoorConfigInit()

// 404
// handle "/",ctx => {
// ctx.yap "4xx", {}
// }
handle "/",ctx => {
ctx.yap "4xx", {}
}

zlog.Info "Started in endpoint: ", endpoint
xLog.Info "Started in endpoint: ", endpoint

// 500
run(endpoint, func(h http.Handler) http.Handler {
Expand Down
Loading