Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: gogf/gf
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.5.7
Choose a base ref
...
head repository: gogf/gf
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.6.4
Choose a head ref
Loading
Showing 424 changed files with 12,129 additions and 5,044 deletions.
File renamed without changes.
38 changes: 0 additions & 38 deletions .github/ISSUE_TEMPLATE.MD

This file was deleted.

41 changes: 41 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug
assignees: ''

---

<!-- Please answer these questions before submitting your issue. Thanks! -->

<!-- 为高效处理 Bug,请您务必提供可复现该问题的最小可运行代码!否则 issue 可能会被延期处理! -->
<!-- 为高效处理 Bug,请您务必提供可复现该问题的最小可运行代码!否则 issue 可能会被延期处理! -->
<!-- 为高效处理 Bug,如请您务必提供可复现该问题的最小可运行代码!否则 issue 可能会被延期处理! -->
<!-- 重要的事情说三遍! -->

**What version of `Go` and system type/arch are you using?**
<!--
Please paste the output of command `go version` from your terminal.
What expects to see is like: `go 1.12, linux/amd64`
-->


**What version of `GoFrame` are you using?**
<!-- You can find the GF version from your `go.mod`, or from the `version.go` in `GF` -->


**Can this bug be re-produced with the latest release?**


**What did you do?**
<!--
If possible, provide a copy of shortest codes for reproducing the error.
A complete runnable program is best.
-->


**What did you expect to see?**


**What did you see instead?**
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/enhancement-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: Enhancement request
about: Enhance an idea for this project
title: ''
labels: enhancement
assignees: ''

---

**Package that You wish to enhance**


**Enhancement description**


**Additional**
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: feature
assignees: ''

---

**Is your feature request related to a problem? Please describe.**


**Describe the solution you'd like**


**Describe alternatives you've considered**


**Additional**
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
name: Question
about: I want to ask a question
title: ''
labels: question
assignees: ''

---

<!-- 请优先仔细阅读文档 -->
**What do you want to ask**
48 changes: 37 additions & 11 deletions .github/workflows/ci-main.yml
Original file line number Diff line number Diff line change
@@ -66,10 +66,23 @@ jobs:
ports:
- 3306:3306

# MariaDb backend server.
mariadb:
image: loads/mariadb:10.4
env:
MARIADB_DATABASE: test
MARIADB_ROOT_PASSWORD: 12345678
ports:
- 3307:3306

# PostgreSQL backend server.
# docker run -d --name postgres -p 5432:5432 \
# -e POSTGRES_PASSWORD=12345678 -e POSTGRES_USER=postgres -e POSTGRES_DB=test \
# -v postgres:/Users/john/Temp/postgresql/data loads/postgres:13
# docker run -d --name postgres \
# -p 5432:5432 \
# -e POSTGRES_PASSWORD=12345678 \
# -e POSTGRES_USER=postgres \
# -e POSTGRES_DB=test \
# -v postgres:/Users/john/Temp/postgresql/data \
# loads/postgres:13
postgres:
image: loads/postgres:13
env:
@@ -87,7 +100,8 @@ jobs:
--health-retries 5
# MSSQL backend server.
# docker run -d --name mssql -p 1433:1433 \
# docker run \
# -p 1433:1433 \
# -e ACCEPT_EULA=Y \
# -e SA_PASSWORD=LoremIpsum86 \
# -e MSSQL_DB=test \
@@ -123,8 +137,13 @@ jobs:
- 9001:9001

# Polaris backend server.
# docker run -d --name polaris -p 8090:8090 -p 8091:8091 -p 8093:8093 -p 9090:9090 -p 9091:9091 loads/polaris-server-standalone:1.11.2
# docker run -d --name polaris -p 8090:8090 -p 8091:8091 -p 8093:8093 -p 9090:9090 -p 9091:9091 loads/polaris-standalone:v1.16.3
# docker run -d --name polaris \
# -p 8090:8090 -p 8091:8091 -p 8093:8093 -p 9090:9090 -p 9091:9091 \
# loads/polaris-server-standalone:1.11.2
#
# docker run -d --name polaris \
# -p 8090:8090 -p 8091:8091 -p 8093:8093 -p 9090:9090 -p 9091:9091 \
# loads/polaris-standalone:v1.16.3
polaris:
image: loads/polaris-standalone:v1.17.2
ports:
@@ -134,7 +153,14 @@ jobs:
- 9090:9090
- 9091:9091

# Oracle 11g server
# Oracle 11g server.
# docker run \
# -e ORACLE_ALLOW_REMOTE=true \
# -e ORACLE_SID=XE \
# -e ORACLE_DB_USER_NAME=system \
# -e ORACLE_DB_PASSWORD=oracle \
# -p 1521:1521 \
# loads/oracle-xe-11g-r2:11.2.0
oracle-server:
image: loads/oracle-xe-11g-r2:11.2.0
env:
@@ -146,7 +172,7 @@ jobs:
- 1521:1521

# dm8 server
# docker run -d --name dm -p 5236:5236 loads/dm:v8.1.2.128_ent_x86_64_ctm_pack4
# docker run -p 5236:5236 loads/dm:v8.1.2.128_ent_x86_64_ctm_pack4
dm-server:
image: loads/dm:v8.1.2.128_ent_x86_64_ctm_pack4
ports:
@@ -159,7 +185,7 @@ jobs:

strategy:
matrix:
go-version: [ "1.18", "1.19", "1.20", "1.21" ]
go-version: [ "1.18", "1.19", "1.20", "1.21", "1.22" ]
goarch: [ "386", "amd64" ]

steps:
@@ -185,7 +211,7 @@ jobs:
run: docker-compose -f ".github/workflows/consul/docker-compose.yml" up -d --build

- name: Setup Golang ${{ matrix.go-version }}
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go-version }}
cache-dependency-path: '**/go.sum'
@@ -214,7 +240,7 @@ jobs:
run: docker-compose -f ".github/workflows/consul/docker-compose.yml" down

- name: Report Coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
with:
flags: go-${{ matrix.go-version }}-${{ matrix.goarch }}
4 changes: 2 additions & 2 deletions .github/workflows/ci-sub.yml
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ jobs:

strategy:
matrix:
go-version: [ "1.18", "1.19", "1.20", "1.21" ]
go-version: [ "1.18", "1.19", "1.20", "1.22" ]
goarch: [ "386", "amd64" ]

steps:
@@ -53,7 +53,7 @@ jobs:
uses: medyagh/setup-minikube@master

- name: Setup Golang ${{ matrix.go-version }}
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go-version }}
cache-dependency-path: '**/go.sum'
38 changes: 38 additions & 0 deletions .github/workflows/doc-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Deploy to GitHub Pages

on:
push:
branches:
- 'doc-build'
schedule:
- cron: '0 15 * * *'

jobs:
deploy:
name: Deploy to GitHub Pages
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
ref: doc-build
- uses: actions/setup-node@v3
with:
node-version: 18
cache: npm
- name: Set Up Golang Environment
uses: actions/setup-go@v4
with:
go-version: 1.20.4
cache: false
- name: download goframe docs
run: ./download.sh
- name: Install dependencies
run: npm ci
- name: Build website
run: npm run build
- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./build
cname: pages.goframe.org
6 changes: 3 additions & 3 deletions .github/workflows/gitee-sync.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- main
- master
tags:
- "*"

@@ -13,8 +13,8 @@ jobs:
steps:
- name: Checkout source code
uses: actions/checkout@v4
- name: Mirror Github to Gitee
uses: Yikun/hub-mirror-action@v1.2
- name: Mirror GitHub to Gitee
uses: Yikun/hub-mirror-action@v1.3
with:
src: github/gogf
dst: gitee/johng
8 changes: 4 additions & 4 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
@@ -36,19 +36,19 @@ jobs:
golangci:
strategy:
matrix:
go-version: [ '1.18','1.19','1.20','1.21' ]
go-version: [ '1.18','1.19','1.20','1.21.4','1.22' ]
name: golangci-lint
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Golang ${{ matrix.go-version }}
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go-version }}
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v4
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: v1.52.2
version: v1.56.2
args: --timeout 3m0s
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@v4

- name: Set Up Golang Environment
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.20.8

@@ -34,7 +34,7 @@ jobs:
- name: Build CLI Binary For All Platform
run: |
cd cmd/gf
gf build main.go -n gf -a all -s all
gf build main.go -n gf -a all -s all -p temp
- name: Move Files Before Release
run: |
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -16,4 +16,9 @@ cmd/gf/gf
temp/
go.work
go.work.sum
!cmd/gf/go.work
!cmd/gf/go.work

# Ignore for docs
node_modules
.docusaurus
output
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -262,7 +262,7 @@ linters-settings:
# Select the Go version to target.
# Default: "1.13"
# Deprecated: use the global `run.go` instead.
go: "1.15"
go: "1.20"
# SAxxxx checks in https://staticcheck.io/docs/configuration/options/#checks
# Default: ["*"]
checks: [ "all","-SA1019","-SA4015","-SA1029","-SA1016","-SA9003","-SA4006","-SA6003" ]
Loading