Merge branch 'master' of https://gitee.com/290198252/background
# Conflicts: # .idea/workspace.xml # .vscode/launch.json # main.gomaster
commit
8bb59b135d
|
|
@ -2,9 +2,13 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="7cf7b6b3-0082-44ef-bb0f-bfcc57e19eb1" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/fork.go" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<change beforePath="$PROJECT_DIR$/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/main.go" afterDir="false" />
|
||||
>>>>>>> aeb0b55a434d20bb6af252ba0528414a00fe60d8
|
||||
</list>
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
|
|
@ -31,13 +35,23 @@
|
|||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<<<<<<< HEAD
|
||||
<component name="GOROOT" path="C:\Go" />
|
||||
=======
|
||||
<component name="GOROOT" path="$PROJECT_DIR$/../../../../Program Files/go" />
|
||||
>>>>>>> aeb0b55a434d20bb6af252ba0528414a00fe60d8
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="ProjectId" id="1OeBjD7R4KFQzfWAqpMf9jlmzxr" />
|
||||
<component name="ProjectViewState">
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="DefaultGoTemplateProperty" value="Go File" />
|
||||
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
||||
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
||||
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="configurable.Global.GOPATH.is.expanded" value="true" />
|
||||
|
|
@ -45,23 +59,18 @@
|
|||
<property name="configurable.Project.GOPATH.is.expanded" value="true" />
|
||||
<property name="go.import.settings.migrated" value="true" />
|
||||
<property name="go.sdk.automatically.set" value="true" />
|
||||
<<<<<<< HEAD
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
||||
<property name="restartRequiresConfirmation" value="false" />
|
||||
<property name="settings.editor.selected.configurable" value="vcs.Git" />
|
||||
=======
|
||||
<property name="go.tried.to.enable.integration.vgo.integrator" value="true" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/../gobase" />
|
||||
<property name="nodejs_package_manager_path" value="npm" />
|
||||
<property name="settings.editor.selected.configurable" value="go.sdk" />
|
||||
>>>>>>> aeb0b55a434d20bb6af252ba0528414a00fe60d8
|
||||
</component>
|
||||
<component name="RunDashboard">
|
||||
<option name="ruleStates">
|
||||
<list>
|
||||
<RuleState>
|
||||
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
|
||||
</RuleState>
|
||||
<RuleState>
|
||||
<option name="name" value="StatusDashboardGroupingRule" />
|
||||
</RuleState>
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager">
|
||||
<component name="RunManager" selected="Go Build.background">
|
||||
<configuration name="background" type="GoApplicationRunConfiguration" factoryName="Go Application">
|
||||
<module name="background" />
|
||||
<working_directory value="$PROJECT_DIR$/" />
|
||||
|
|
@ -74,21 +83,94 @@
|
|||
<output_directory value="$PROJECT_DIR$/" />
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
<configuration name="fork2" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true">
|
||||
<module name="background" />
|
||||
<working_directory value="$PROJECT_DIR$/" />
|
||||
<parameters value="background.exe" />
|
||||
<kind value="FILE" />
|
||||
<filePath value="$PROJECT_DIR$/fork.go" />
|
||||
<package value="background" />
|
||||
<directory value="$PROJECT_DIR$/" />
|
||||
<output_directory value="$PROJECT_DIR$" />
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
<list>
|
||||
<item itemvalue="Go Build.background" />
|
||||
<item itemvalue="Go Build.fork2" />
|
||||
</list>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="Go Build.fork2" />
|
||||
</list>
|
||||
</recent_temporary>
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="1" />
|
||||
<option name="version" value="2" />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="TAB_STATES">
|
||||
<map>
|
||||
<entry key="MAIN">
|
||||
<value>
|
||||
<State>
|
||||
<option name="COLUMN_ORDER" />
|
||||
</State>
|
||||
<State />
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
<option name="oldMeFiltersMigrated" value="true" />
|
||||
</component>
|
||||
<component name="WindowStateProjectService">
|
||||
<state x="767" y="429" key="#Go_Modules" timestamp="1595431702688">
|
||||
<screen x="0" y="40" width="2048" height="1112" />
|
||||
</state>
|
||||
<state x="767" y="429" key="#Go_Modules/0.40.2048.1112@0.40.2048.1112" timestamp="1595431702688" />
|
||||
<state x="479" y="251" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1595778748175">
|
||||
<screen x="0" y="40" width="2048" height="1112" />
|
||||
</state>
|
||||
<state x="479" y="251" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.40.2048.1112@0.40.2048.1112" timestamp="1595778748175" />
|
||||
<state x="805" y="351" key="FileChooserDialogImpl" timestamp="1595857317209">
|
||||
<screen x="0" y="40" width="2048" height="1112" />
|
||||
</state>
|
||||
<state x="805" y="351" key="FileChooserDialogImpl/0.40.2048.1112@0.40.2048.1112" timestamp="1595857317209" />
|
||||
<state width="2005" height="305" key="GridCell.Tab.0.bottom" timestamp="1595778772403">
|
||||
<screen x="0" y="40" width="2048" height="1112" />
|
||||
</state>
|
||||
<state width="2005" height="305" key="GridCell.Tab.0.bottom/0.40.2048.1112@0.40.2048.1112" timestamp="1595778772403" />
|
||||
<state width="2005" height="305" key="GridCell.Tab.0.center" timestamp="1595778772403">
|
||||
<screen x="0" y="40" width="2048" height="1112" />
|
||||
</state>
|
||||
<state width="2005" height="305" key="GridCell.Tab.0.center/0.40.2048.1112@0.40.2048.1112" timestamp="1595778772403" />
|
||||
<state width="2005" height="305" key="GridCell.Tab.0.left" timestamp="1595778772403">
|
||||
<screen x="0" y="40" width="2048" height="1112" />
|
||||
</state>
|
||||
<state width="2005" height="305" key="GridCell.Tab.0.left/0.40.2048.1112@0.40.2048.1112" timestamp="1595778772403" />
|
||||
<state width="2005" height="305" key="GridCell.Tab.0.right" timestamp="1595778772403">
|
||||
<screen x="0" y="40" width="2048" height="1112" />
|
||||
</state>
|
||||
<state width="2005" height="305" key="GridCell.Tab.0.right/0.40.2048.1112@0.40.2048.1112" timestamp="1595778772403" />
|
||||
<state width="2005" height="376" key="GridCell.Tab.1.bottom" timestamp="1595433941254">
|
||||
<screen x="0" y="40" width="2048" height="1112" />
|
||||
</state>
|
||||
<state width="2005" height="376" key="GridCell.Tab.1.bottom/0.40.2048.1112@0.40.2048.1112" timestamp="1595433941254" />
|
||||
<state width="2005" height="376" key="GridCell.Tab.1.center" timestamp="1595433941254">
|
||||
<screen x="0" y="40" width="2048" height="1112" />
|
||||
</state>
|
||||
<state width="2005" height="376" key="GridCell.Tab.1.center/0.40.2048.1112@0.40.2048.1112" timestamp="1595433941254" />
|
||||
<state width="2005" height="376" key="GridCell.Tab.1.left" timestamp="1595433941254">
|
||||
<screen x="0" y="40" width="2048" height="1112" />
|
||||
</state>
|
||||
<state width="2005" height="376" key="GridCell.Tab.1.left/0.40.2048.1112@0.40.2048.1112" timestamp="1595433941254" />
|
||||
<state width="2005" height="376" key="GridCell.Tab.1.right" timestamp="1595433941254">
|
||||
<screen x="0" y="40" width="2048" height="1112" />
|
||||
</state>
|
||||
<state width="2005" height="376" key="GridCell.Tab.1.right/0.40.2048.1112@0.40.2048.1112" timestamp="1595433941254" />
|
||||
<state x="526" y="240" key="SettingsEditor" timestamp="1595432383541">
|
||||
<screen x="0" y="40" width="2048" height="1112" />
|
||||
</state>
|
||||
<state x="526" y="240" key="SettingsEditor/0.40.2048.1112@0.40.2048.1112" timestamp="1595432383541" />
|
||||
<state x="687" y="283" width="672" height="678" key="search.everywhere.popup" timestamp="1595757093391">
|
||||
<screen x="0" y="40" width="2048" height="1112" />
|
||||
</state>
|
||||
<state x="687" y="283" width="672" height="678" key="search.everywhere.popup/0.40.2048.1112@0.40.2048.1112" timestamp="1595757093391" />
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
listen_api: 4596
|
||||
runmode: debug
|
||||
max_conn: 121
|
||||
logs:
|
||||
dir: /var/log/user
|
||||
file: user.log
|
||||
level: 1
|
||||
savefile: false
|
||||
redis1:
|
||||
addr: 49.235.25.67:16379
|
||||
password: ~
|
||||
db: 1
|
||||
mysql:
|
||||
addr: 49.235.25.67
|
||||
user: caiyu
|
||||
password: 12345678
|
||||
db: background
|
||||
max_open: 100
|
||||
MaxIdle: 99
|
||||
elasticsearch:
|
||||
address: http://hyrtc.net:9200
|
||||
mysql1:
|
||||
addr: 49.235.25.67
|
||||
user: caiyu
|
||||
password: 12345678
|
||||
db: background
|
||||
max_open: 100
|
||||
MaxIdle: 99
|
||||
mongo:
|
||||
addr: 49.235.25.67
|
||||
port: 27017
|
||||
user: root
|
||||
password: root
|
||||
db: test
|
||||
max_open: 100
|
||||
MaxIdle: 99
|
||||
ca_cert: ""
|
||||
client_cert: ""
|
||||
client_key: ""
|
||||
test_arr:
|
||||
- 1
|
||||
- 23
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
{
|
||||
"swagger": "2.0",
|
||||
"info": {
|
||||
"description": "{{.Description}}",
|
||||
"title": "大厅功能api",
|
||||
"contact": {},
|
||||
"license": {},
|
||||
"version": "1.0"
|
||||
},
|
||||
"host": "localhost:8080",
|
||||
"basePath": "/api/v1",
|
||||
"paths": {}
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
basePath: /api/v1
|
||||
host: localhost:8080
|
||||
info:
|
||||
contact: {}
|
||||
description: '{{.Description}}'
|
||||
license: {}
|
||||
title: 大厅功能api
|
||||
version: "1.0"
|
||||
paths: {}
|
||||
swagger: "2.0"
|
||||
|
|
@ -5,9 +5,10 @@ import (
|
|||
"background/logs"
|
||||
"background/model"
|
||||
"fmt"
|
||||
"strconv"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"qiniupkg.com/x/log.v7"
|
||||
"strconv"
|
||||
)
|
||||
|
||||
func GetPageParaFromQuery(c *gin.Context) (int, int) {
|
||||
|
|
@ -112,7 +113,7 @@ func GetArticleCount(c *gin.Context) {
|
|||
type Cnt struct {
|
||||
Cnt int64 `sql:"cnt" json:"cnt"`
|
||||
}
|
||||
cnt := []Cnt{};
|
||||
cnt := []Cnt{}
|
||||
|
||||
e := db.GetMysqlClient().Query2(query, &cnt)
|
||||
if nil != e {
|
||||
|
|
@ -158,7 +159,7 @@ func GetArticle(c *gin.Context) {
|
|||
}
|
||||
|
||||
func UpdateArtilce(c *gin.Context) {
|
||||
rsp := RespBase{Msg:"FAIL", Status:210,}
|
||||
rsp := RespBase{Msg: "FAIL", Status: 210}
|
||||
type ReqUpdateArticle struct {
|
||||
Id int64 `json:"id"`
|
||||
Title string `json:"title"`
|
||||
|
|
@ -199,13 +200,13 @@ func UpdateArtilce(c *gin.Context) {
|
|||
|
||||
}
|
||||
func SearchArticle(c *gin.Context) {
|
||||
rsp := RespBase{Msg:"FAIL", Status:210,}
|
||||
rsp := RespBase{Msg: "FAIL", Status: 210}
|
||||
defer func() {
|
||||
c.JSON(200, rsp)
|
||||
}()
|
||||
}
|
||||
func AddArticle(c *gin.Context) {
|
||||
rsp := RespBase{Msg:"FAIL", Status:210,}
|
||||
rsp := RespBase{Msg: "FAIL", Status: 210}
|
||||
type ReqAddArticle struct {
|
||||
Id int64 `json:"id"`
|
||||
Title string `json:"title"`
|
||||
|
|
@ -244,9 +245,8 @@ func AddArticle(c *gin.Context) {
|
|||
rsp.Status = 0
|
||||
}
|
||||
|
||||
|
||||
func ArticlesType(c *gin.Context) {
|
||||
rsp := RespBase{Msg:"FAIL", Status:210,}
|
||||
rsp := RespBase{Msg: "FAIL", Status: 210}
|
||||
defer func() {
|
||||
c.JSON(200, rsp)
|
||||
}()
|
||||
|
|
@ -280,6 +280,11 @@ func AddArticleType(c *gin.Context) {
|
|||
}()
|
||||
|
||||
typeName := c.Query("name")
|
||||
group := c.Query("group")
|
||||
groupid, e := strconv.Atoi(group)
|
||||
if nil != e {
|
||||
return
|
||||
}
|
||||
id := c.Query("id")
|
||||
if id != "" {
|
||||
if typeName == "" {
|
||||
|
|
@ -288,6 +293,7 @@ func AddArticleType(c *gin.Context) {
|
|||
articleType := model.ArticleType{
|
||||
Id: 0,
|
||||
Name: typeName,
|
||||
Group: int32(groupid),
|
||||
}
|
||||
rsp.Data = model.UpdateArticleType(articleType)
|
||||
rsp.Msg = "OK"
|
||||
|
|
@ -299,17 +305,16 @@ func AddArticleType(c *gin.Context) {
|
|||
articleType := model.ArticleType{
|
||||
Id: 0,
|
||||
Name: typeName,
|
||||
Group: int32(groupid),
|
||||
}
|
||||
rsp.Data = model.AddArticleType(articleType)
|
||||
rsp.Msg = "OK"
|
||||
rsp.Status = 0
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
func DeleteArticle(c *gin.Context) {
|
||||
rsp := RespBase{Msg:"FAIL", Status:210,}
|
||||
rsp := RespBase{Msg: "FAIL", Status: 210}
|
||||
defer func() {
|
||||
c.JSON(200, rsp)
|
||||
}()
|
||||
|
|
@ -329,7 +334,6 @@ func DeleteArticle(c *gin.Context) {
|
|||
rsp.Msg = "OK"
|
||||
}
|
||||
|
||||
|
||||
func ArticlesTypes(c *gin.Context) {
|
||||
resp := RespBase{"unkown error", -231, nil}
|
||||
defer func() {
|
||||
|
|
@ -350,3 +354,144 @@ func ArticlesTypes(c *gin.Context) {
|
|||
resp.Msg = "OK"
|
||||
resp.Status = 0
|
||||
}
|
||||
|
||||
func CreateMemo(c *gin.Context) {
|
||||
resp := RespBase{"unkown error", -231, nil}
|
||||
defer func() {
|
||||
c.JSON(200, resp)
|
||||
}()
|
||||
var req model.Memo
|
||||
e := c.BindJSON(&req)
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
resp.Msg = "wrong input"
|
||||
return
|
||||
}
|
||||
e = model.CreateMemo(req)
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
return
|
||||
}
|
||||
resp.Data = nil
|
||||
resp.Msg = "OK"
|
||||
resp.Status = 0
|
||||
}
|
||||
|
||||
func UpdateMemo(c *gin.Context) {
|
||||
resp := RespBase{"unkown error", -231, nil}
|
||||
defer func() {
|
||||
c.JSON(200, resp)
|
||||
}()
|
||||
var req model.Memo
|
||||
e := c.BindJSON(&req)
|
||||
if nil != e {
|
||||
resp.Msg = "wrong input"
|
||||
return
|
||||
}
|
||||
e = model.UpdateMemo(req)
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
return
|
||||
}
|
||||
resp.Data = nil
|
||||
resp.Msg = "OK"
|
||||
resp.Status = 0
|
||||
}
|
||||
|
||||
func GetDocGroup(c *gin.Context) {
|
||||
rsp := RespBase{"ERR", -1, nil}
|
||||
defer func() {
|
||||
c.JSON(200, rsp)
|
||||
}()
|
||||
group, e := model.GetAllGroup()
|
||||
if nil != e {
|
||||
log.Print(e.Error())
|
||||
return
|
||||
}
|
||||
rsp.Data = group
|
||||
rsp.Status = 0
|
||||
rsp.Msg = "OK"
|
||||
}
|
||||
|
||||
func GetTemplates(c *gin.Context) {
|
||||
rsp := RespBase{"ERR", -1, nil}
|
||||
defer func() {
|
||||
c.JSON(200, rsp)
|
||||
}()
|
||||
|
||||
}
|
||||
|
||||
func GetMemos(c *gin.Context) {
|
||||
rsp := RespBase{"ERR", -1, nil}
|
||||
defer func() {
|
||||
c.JSON(200, rsp)
|
||||
}()
|
||||
type ReqMemos struct {
|
||||
Title string `json:"title"`
|
||||
}
|
||||
req := ReqMemos{}
|
||||
e := c.BindJSON(&req)
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
return
|
||||
}
|
||||
limit, offset := GetPageParaFromQuery(c)
|
||||
if limit != 0 && offset != 0 {
|
||||
dat, e := model.GetMemos(req.Title, 10, 0)
|
||||
if nil != e {
|
||||
return
|
||||
}
|
||||
rsp.Data = dat
|
||||
rsp.Status = 0
|
||||
rsp.Msg = "OK"
|
||||
} else {
|
||||
dat, e := model.GetMemos(req.Title, 10, 0)
|
||||
if nil != e {
|
||||
return
|
||||
}
|
||||
rsp.Data = dat
|
||||
rsp.Status = 0
|
||||
rsp.Msg = "OK"
|
||||
}
|
||||
|
||||
}
|
||||
func GetDocTemplate(c *gin.Context) {
|
||||
|
||||
}
|
||||
func GetMemo(c *gin.Context) {
|
||||
rsp := RespBase{"ERR", -1, nil}
|
||||
defer func() {
|
||||
c.JSON(200, rsp)
|
||||
}()
|
||||
id := c.Query("id")
|
||||
dat, e := model.ReadMemo(int32(db.Atoi(id)))
|
||||
if nil != e {
|
||||
return
|
||||
}
|
||||
rsp.Msg = "OK"
|
||||
rsp.Status = 0
|
||||
rsp.Data = dat
|
||||
}
|
||||
func DeleteMemos(c *gin.Context) {
|
||||
resp := RespBase{"unkown error", -231, nil}
|
||||
defer func() {
|
||||
c.JSON(200, resp)
|
||||
}()
|
||||
type DelReq struct {
|
||||
Id int32 `json:"id"`
|
||||
}
|
||||
var req DelReq
|
||||
e := c.BindJSON(&req)
|
||||
if nil != e {
|
||||
resp.Msg = "wrong input"
|
||||
return
|
||||
}
|
||||
e = model.DeleteMemo(req.Id)
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
return
|
||||
}
|
||||
resp.Data = nil
|
||||
resp.Msg = "OK"
|
||||
resp.Status = 0
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package controller
|
|||
import (
|
||||
"background/logs"
|
||||
"background/model"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"qiniupkg.com/x/log.v7"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
package helper
|
||||
|
||||
import (
|
||||
"background/controller/params"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
func GetPageParam(c *gin.Context) (int, int) {
|
||||
var limit, offset int
|
||||
var ok bool
|
||||
limit, ok = c.Keys[params.K_OFFSET].(int)
|
||||
if !ok {
|
||||
}
|
||||
offset, ok = c.Keys[params.K_OFFSET].(int)
|
||||
if !ok {
|
||||
}
|
||||
return limit, offset
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
package params
|
||||
|
||||
const K_OFFSET = "offset"
|
||||
const K_LIMIT = "limit"
|
||||
|
||||
|
|
@ -1,16 +1,17 @@
|
|||
package controller
|
||||
|
||||
import (
|
||||
"background/config"
|
||||
"background/db"
|
||||
"background/logs"
|
||||
"background/model"
|
||||
"background/redis"
|
||||
"background/utils"
|
||||
"bytes"
|
||||
"crypto/md5"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/fatih/structs"
|
||||
"github.com/gin-gonic/gin"
|
||||
_ "github.com/go-sql-driver/mysql"
|
||||
"github.com/tommy351/gin-sessions"
|
||||
"io"
|
||||
"log"
|
||||
"math/rand"
|
||||
|
|
@ -20,15 +21,14 @@ import (
|
|||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
"background/config"
|
||||
"background/db"
|
||||
"background/logs"
|
||||
"background/model"
|
||||
"background/redis"
|
||||
|
||||
"github.com/fatih/structs"
|
||||
"github.com/gin-gonic/gin"
|
||||
_ "github.com/go-sql-driver/mysql"
|
||||
sessions "github.com/tommy351/gin-sessions"
|
||||
)
|
||||
|
||||
type UserController struct {
|
||||
|
||||
}
|
||||
|
||||
type ReqSendEmailCode struct {
|
||||
|
|
@ -75,25 +75,10 @@ func (this *UserController) Auth(c *gin.Context) {
|
|||
}
|
||||
}
|
||||
|
||||
// SetUser godoc
|
||||
// @Summary SetUser
|
||||
// @Description set userinfo
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Param q query string false "name search by q"
|
||||
// @Success 200 {array} util.RespBase
|
||||
// @Router /setUser [get]
|
||||
func (this *UserController) SetUser(c *gin.Context) {
|
||||
|
||||
}
|
||||
// SetUser godoc
|
||||
// @Summary SetUser
|
||||
// @Description set userinfo
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Param q query string false "name search by q"
|
||||
// @Success 200 {array} util.RespBase
|
||||
// @Router /setUser [get]
|
||||
|
||||
func (this *UserController) ModifyPasswd(c *gin.Context) {
|
||||
type ReqModifyPasswd struct {
|
||||
id int `json:"id"`
|
||||
|
|
@ -123,14 +108,7 @@ func (this *UserController) ModifyPasswd(c *gin.Context) {
|
|||
resp.Status = 0
|
||||
|
||||
}
|
||||
// DelUser godoc
|
||||
// @Summary Delete a user from database
|
||||
// @Description you must have a token in your parameter
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Param q query string false "name search by q"
|
||||
// @Success 200 {array} util.RespBase
|
||||
// @Router /setUser [get]
|
||||
|
||||
func (this *UserController) DelUser(c *gin.Context) {
|
||||
|
||||
}
|
||||
|
|
@ -159,17 +137,6 @@ func (this *UserController) GetUser(c *gin.Context) {
|
|||
resp.Data = users
|
||||
}
|
||||
|
||||
// GetUsers godoc
|
||||
// @Summary GetUsers
|
||||
// @Description Get all user with query
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Param page query int 1 "分页的页数"
|
||||
// @Param pageSize query int 10 "name search by q"
|
||||
// @Param displayname query string false "name search by q"
|
||||
// @Param department_id query string false "name search by q"
|
||||
// @Param permission_type query string false "name search by q"
|
||||
// @Router /api/users [get]
|
||||
func (this *UserController) Users(c *gin.Context) {
|
||||
var statuscode int
|
||||
var resp RespBase
|
||||
|
|
@ -201,17 +168,6 @@ func (this *UserController) Users(c *gin.Context) {
|
|||
resp.Data = dat
|
||||
}
|
||||
|
||||
// GetUsers godoc
|
||||
// @Summary GetUsers
|
||||
// @Description Get all user with query
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Param page query int 1 "分页的页数"
|
||||
// @Param pageSize query int 10 "name search by q"
|
||||
// @Param displayname query string false "name search by q"
|
||||
// @Param department_id query string false "name search by q"
|
||||
// @Param permission_type query string false "name search by q"
|
||||
// @Router /api/users [get]
|
||||
func (this *UserController) SerarchUsers(c *gin.Context) {
|
||||
var statuscode int
|
||||
var resp RespBase
|
||||
|
|
@ -276,17 +232,6 @@ func DefaultOption(c *gin.Context) {
|
|||
}()
|
||||
}
|
||||
|
||||
// Login godoc
|
||||
// @Summary Login
|
||||
// @Description login
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Param logininfo query {object} LoginReq "登录请求参数"
|
||||
// @Success 200 {array} util.RespBase
|
||||
// @Failure 400 {object} util.RespBase
|
||||
// @Failure 404 {object} util.RespBase
|
||||
// @Failure 500 {object} util.RespBase
|
||||
// @Router /api/login [post]
|
||||
func (this *UserController) Login(c *gin.Context) {
|
||||
type LoginReq struct {
|
||||
RememberMe int32 `json:"remember_me"`
|
||||
|
|
|
|||
|
|
@ -7,36 +7,50 @@ import (
|
|||
"crypto/x509"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"github.com/go-sql-driver/mysql"
|
||||
_ "github.com/go-sql-driver/mysql"
|
||||
"gopkg.in/mgo.v2"
|
||||
"gopkg.in/olivere/elastic.v7"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"os"
|
||||
|
||||
"github.com/go-sql-driver/mysql"
|
||||
_ "github.com/go-sql-driver/mysql"
|
||||
"github.com/jinzhu/gorm"
|
||||
"gopkg.in/mgo.v2"
|
||||
"gopkg.in/olivere/elastic.v7"
|
||||
)
|
||||
|
||||
var gEla ElkEngine
|
||||
var gDb Database
|
||||
var blogDb Database
|
||||
var gMongo *mgo.Session
|
||||
var gElkEngine ElkEngine
|
||||
|
||||
var gOrm *gorm.DB
|
||||
|
||||
func Init() {
|
||||
var e error
|
||||
mysqlconf := config.GetMysqlConfig()
|
||||
blogConf := config.GetMysqlBlogConfig()
|
||||
//InitMongoDb()
|
||||
fmt.Print("api runmode is " + config.ApiConfig().RunMode)
|
||||
log.Print("api runmode is " + config.ApiConfig().RunMode)
|
||||
if config.ApiConfig().RunMode == "debug" {
|
||||
blogDb = Database{Type: string(""), DB: initMysqlTLS(blogConf)}
|
||||
}else{
|
||||
blogDb = Database{Type: string(""), DB: initMysqlTLS(blogConf)}
|
||||
gDb = Database{Type: string(""), DB: initMysql(mysqlconf)}
|
||||
sqls := fmt.Sprintf("%s:%s@(%s)/%s?charset=utf8&parseTime=True&loc=Local",
|
||||
mysqlconf.UserName, mysqlconf.Password, mysqlconf.Addr,
|
||||
mysqlconf.Db)
|
||||
log.Print(sqls)
|
||||
gOrm, e = gorm.Open("mysql", sqls)
|
||||
if nil != e {
|
||||
log.Print(e.Error())
|
||||
os.Exit(-1)
|
||||
}
|
||||
if config.ApiConfig().RunMode == "debug"{
|
||||
gDb = Database{Type: string(""), DB: initMysqlTLS(mysqlconf)}
|
||||
} else {
|
||||
gDb = Database{Type: string(""), DB: initMysqlTLS(mysqlconf)}
|
||||
sqls := fmt.Sprintf("%s:%s@/%s?charset=utf8&parseTime=True&loc=Local", mysqlconf.UserName, mysqlconf.Password,
|
||||
mysqlconf.Db)
|
||||
gOrm, e = gorm.Open("mysql", sqls)
|
||||
if nil != e {
|
||||
log.Print(e.Error())
|
||||
os.Exit(-1)
|
||||
}
|
||||
}
|
||||
|
||||
InitELK()
|
||||
}
|
||||
|
||||
|
|
@ -47,7 +61,7 @@ func InitELK() {
|
|||
gElkEngine.cli, e = elastic.NewClient(
|
||||
elastic.SetURL(elkconf.Address),
|
||||
// Must turn off sniff in docker
|
||||
elastic.SetSniff(false),)
|
||||
elastic.SetSniff(false))
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
gElkEngine.cli = nil
|
||||
|
|
@ -150,3 +164,6 @@ func InitMongoDb() {
|
|||
func GetElastic() *ElkEngine {
|
||||
return &gElkEngine
|
||||
}
|
||||
func GetOrm() *gorm.DB {
|
||||
return gOrm
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,57 @@
|
|||
// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
|
||||
// This file was generated by swaggo/swag at
|
||||
// 2020-06-24 21:33:14.5754792 +0800 CST m=+0.035031801
|
||||
|
||||
package docs
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
|
||||
"github.com/alecthomas/template"
|
||||
"github.com/swaggo/swag"
|
||||
)
|
||||
|
||||
var doc = `{
|
||||
"swagger": "2.0",
|
||||
"info": {
|
||||
"description": "{{.Description}}",
|
||||
"title": "大厅功能api",
|
||||
"contact": {},
|
||||
"license": {},
|
||||
"version": "1.0"
|
||||
},
|
||||
"host": "localhost:8080",
|
||||
"basePath": "/api/v1",
|
||||
"paths": {}
|
||||
}`
|
||||
|
||||
type swaggerInfo struct {
|
||||
Version string
|
||||
Host string
|
||||
BasePath string
|
||||
Title string
|
||||
Description string
|
||||
}
|
||||
|
||||
// SwaggerInfo holds exported Swagger Info so clients can modify it
|
||||
var SwaggerInfo swaggerInfo
|
||||
|
||||
type s struct{}
|
||||
|
||||
func (s *s) ReadDoc() string {
|
||||
t, err := template.New("swagger_info").Parse(doc)
|
||||
if err != nil {
|
||||
return doc
|
||||
}
|
||||
|
||||
var tpl bytes.Buffer
|
||||
if err := t.Execute(&tpl, SwaggerInfo); err != nil {
|
||||
return doc
|
||||
}
|
||||
|
||||
return tpl.String()
|
||||
}
|
||||
|
||||
func init() {
|
||||
swag.Register(swag.Name, &s{})
|
||||
}
|
||||
34
main.go
34
main.go
|
|
@ -5,15 +5,24 @@ import (
|
|||
"background/controller"
|
||||
"background/controller/middle"
|
||||
"background/db"
|
||||
_ "background/docs"
|
||||
"background/logs"
|
||||
"background/model"
|
||||
"log"
|
||||
"os"
|
||||
"strconv"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
swaggerFiles "github.com/swaggo/files" // swagger embed files
|
||||
ginSwagger "github.com/swaggo/gin-swagger" // gin-swagger middleware
|
||||
sessions "github.com/tommy351/gin-sessions"
|
||||
)
|
||||
|
||||
// @title 大厅功能api
|
||||
// @version 1.0
|
||||
// @host localhost:8080
|
||||
// @BasePath /api/v1
|
||||
|
||||
var (
|
||||
userController = controller.UserController{}
|
||||
mailContoller = controller.MailController{}
|
||||
|
|
@ -82,6 +91,8 @@ func InitLogs() {
|
|||
logs.Init(config.GetLogConfig().Dir, config.GetLogConfig().File, config.GetLogConfig().Level, config.GetLogConfig().SaveFile)
|
||||
}
|
||||
func main() {
|
||||
log.Print("gid is", os.Getegid())
|
||||
|
||||
InitConfig()
|
||||
InitLogs()
|
||||
InitRedisConfig()
|
||||
|
|
@ -95,6 +106,14 @@ func main() {
|
|||
store := sessions.NewCookieStore([]byte("secret123"))
|
||||
r.Use(sessions.Middleware("sess_store", store))
|
||||
r.Use(CORSMiddleware)
|
||||
|
||||
go func() {
|
||||
// programatically set swagger info
|
||||
r := gin.New()
|
||||
// use ginSwagger middleware to serve the API docs
|
||||
r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
|
||||
r.Run(":9992")
|
||||
}()
|
||||
api := r.Group("/api")
|
||||
{
|
||||
/** 添加或修改用户 **/
|
||||
|
|
@ -120,9 +139,9 @@ func main() {
|
|||
api.POST("/articles", controller.GetArticles) // 获取所有文章
|
||||
api.PUT("/article", controller.AddArticle) // 添加文章
|
||||
api.PUT("/article_search", controller.SearchArticle) // 添加文章
|
||||
api.GET("article_type", controller.ArticlesType) //获取所有文章分类
|
||||
api.PUT("article_type", controller.AddArticleType)
|
||||
api.DELETE("article_type", controller.DeleteArticleType)
|
||||
api.GET("/article_type", controller.ArticlesType) //获取所有文章分类
|
||||
api.PUT("/article_type", controller.AddArticleType)
|
||||
api.DELETE("/article_type", controller.DeleteArticleType)
|
||||
|
||||
api.POST("/article_update", controller.UpdateArtilce) //更新文章
|
||||
api.GET("/articleCount", controller.GetArticleCount) //获取所有文章个数
|
||||
|
|
@ -140,6 +159,15 @@ func main() {
|
|||
api.GET("/filelist", fileController.FileList) // 文件列表
|
||||
api.GET("/fileType", fileController.FileType) // 文件类型
|
||||
|
||||
api.PUT("/memo", controller.CreateMemo) // 备忘录新建
|
||||
api.POST("/memo", controller.UpdateMemo) // 备忘录更新
|
||||
api.POST("/memos", controller.GetMemos) // 备忘录批量
|
||||
api.POST("/delmemo", controller.DeleteMemos) //删除备忘录
|
||||
api.GET("/memo", controller.GetMemo) // 单独读取
|
||||
api.GET("doc_groups", controller.GetDocGroup) // 获取所有的文章分组
|
||||
api.GET("templates", controller.GetDocTemplate) // 获取所有文章的模板
|
||||
|
||||
api.GET("doc_versions", nil) // 获取文章的某个版本
|
||||
}
|
||||
hookapi := r.Group("hookapi")
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,8 +4,9 @@ import (
|
|||
"background/db"
|
||||
"background/logs"
|
||||
"fmt"
|
||||
"qiniupkg.com/x/log.v7"
|
||||
"strings"
|
||||
|
||||
"qiniupkg.com/x/log.v7"
|
||||
)
|
||||
|
||||
type Doc struct {
|
||||
|
|
@ -17,16 +18,30 @@ type Doc struct {
|
|||
IsPublic int `sql:"is_public" json:"is_public"`
|
||||
}
|
||||
|
||||
type DocGroup struct {
|
||||
Int int32 `sql:"int"`
|
||||
Name string `sql:"name"`
|
||||
}
|
||||
type ArticleType struct {
|
||||
Id int64 `sql:"id" json:"id"`
|
||||
Name string `sql:"type_name" json:"type_name"`
|
||||
Author string `sql:"author" json:"author"`
|
||||
Group int32 `sql:"group" json:"group"`
|
||||
GroupName string `json:"group_name"`
|
||||
}
|
||||
|
||||
func GetArticlesType() []ArticleType {
|
||||
ret := []ArticleType{}
|
||||
sql := fmt.Sprintf("select * from doc_type")
|
||||
e := db.GetBlogMysql().Query2(sql, &ret)
|
||||
for k, _ := range ret {
|
||||
group := []DocGroup{}
|
||||
sql = fmt.Sprintf("select * from doc_group where doc_group.int = %d", ret[k].Group)
|
||||
db.GetBlogMysql().Query2(sql, &group)
|
||||
if len(group) > 0 {
|
||||
ret[k].GroupName = group[0].Name
|
||||
}
|
||||
}
|
||||
log.Print(ret)
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
|
|
@ -78,7 +93,8 @@ func DeleteDoc(id int64) error{
|
|||
}
|
||||
|
||||
func AddArticleType(t ArticleType) error {
|
||||
sql := fmt.Sprintf("insert into doc_type(id,type_name) values ('%d','%s')",t.Id,t.Name)
|
||||
sql := fmt.Sprintf("insert into doc_type(id,type_name,`group`) values ('%d','%s','%d')", t.Id, t.Name, t.Group)
|
||||
log.Print(sql)
|
||||
_, e := db.GetMysqlClient().Query(sql)
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
|
|
@ -87,7 +103,7 @@ func AddArticleType(t ArticleType) error{
|
|||
return nil
|
||||
}
|
||||
func UpdateArticleType(t ArticleType) error {
|
||||
sql := fmt.Sprintf("update doc_type set type_name = '%s' where id = %d",t.Name,t.Id)
|
||||
sql := fmt.Sprintf("update doc_type set type_name = '%s' and group = '%d' where id = %d", t.Name, t.Group, t.Id)
|
||||
_, e := db.GetMysqlClient().Query(sql)
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
|
|
@ -117,3 +133,13 @@ func GetAllDocs() ([]Doc,error) {
|
|||
return ret, nil
|
||||
|
||||
}
|
||||
func GetAllGroup() ([]DocGroup, error) {
|
||||
ret := []DocGroup{}
|
||||
sql := fmt.Sprintf("select * from doc_group")
|
||||
e := db.GetMysqlClient().Query2(sql, &ret)
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
return nil, e
|
||||
}
|
||||
return ret, nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,78 @@
|
|||
package model
|
||||
|
||||
import (
|
||||
"background/db"
|
||||
"background/logs"
|
||||
"fmt"
|
||||
"qiniupkg.com/x/log.v7"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type Memo struct {
|
||||
ID int64 `sql:"id" json:"id"`
|
||||
Title string `sql:"title" json:"title"`
|
||||
CreateTime string `sql:"create_time" json:"create_time"`
|
||||
Content string `sql:"content" json:"content"`
|
||||
}
|
||||
|
||||
func CreateMemo(memo Memo) error{
|
||||
sql := fmt.Sprintf(`insert into memo(title,create_time,content) select '%s','%s','%s'
|
||||
from dual where not exists (select * from memo where memo.title='%s') `,
|
||||
memo.Title,memo.CreateTime,strings.Replace(memo.Content, "'", "\\'", -1),memo.Title)
|
||||
log.Print(sql)
|
||||
_, e := db.GetMysqlClient().Query(sql)
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
return e
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func UpdateMemo(memo Memo) error{
|
||||
sql := fmt.Sprintf(`update memo set title = '%s',
|
||||
create_time = '%s',
|
||||
content = '%s' where memo.id = %d`,
|
||||
memo.Title,memo.CreateTime,strings.Replace(memo.Content, "'", "\\'", -1),memo.ID)
|
||||
_, e := db.GetMysqlClient().Query(sql)
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
return e
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func DeleteMemo(id int32) error{
|
||||
sql := fmt.Sprintf(`delete from memo where memo.id = '%d'`,id)
|
||||
log.Print(sql)
|
||||
_, e := db.GetMysqlClient().Query(sql)
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
return e
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func ReadMemo(id int32) ([]Memo,error){
|
||||
memo := []Memo{}
|
||||
sql := fmt.Sprintf(`select * from memo where memo.id = '%d'`,id)
|
||||
e := db.GetMysqlClient().Query2(sql,&memo)
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
return nil,e
|
||||
}
|
||||
return memo,nil
|
||||
}
|
||||
|
||||
func GetMemos(title string,limit int,offset int) ([]Memo,error) {
|
||||
memo := []Memo{}
|
||||
sql := fmt.Sprintf(`select * from memo where memo.title like '%s%%' limit %d offset %d`,
|
||||
title,limit,offset)
|
||||
log.Print(sql)
|
||||
e := db.GetMysqlClient().Query2(sql,&memo)
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
return nil,e
|
||||
}
|
||||
return memo,nil
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,73 @@
|
|||
package model
|
||||
|
||||
import (
|
||||
"background/db"
|
||||
"background/logs"
|
||||
"fmt"
|
||||
"log"
|
||||
)
|
||||
|
||||
type DocTemplate struct {
|
||||
Id int32 `sql:"id" json:"id"`
|
||||
Content string `sql:"content" json:"content"`
|
||||
Name string `sql:"content" json:"name"`
|
||||
}
|
||||
|
||||
|
||||
func CreateDocTemplate(templ DocTemplate) error{
|
||||
sql := fmt.Sprintf(`insert into doc_template(content,name) select '%s','%s
|
||||
from dual where not exists (select * from doc_template where doc_template.name='%s') `,
|
||||
templ.Content,templ.Name,templ.Name)
|
||||
log.Print(sql)
|
||||
_, e := db.GetMysqlClient().Query(sql)
|
||||
if nil != e {
|
||||
log.Print(sql)
|
||||
return e
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func UpdateDocTemplate(templ DocTemplate) error{
|
||||
sql := fmt.Sprintf(`update doc_template set content = %s,
|
||||
name = %s, where memo.id = '%d'`,templ.Content,templ.Name,templ.Id)
|
||||
_, e := db.GetMysqlClient().Query(sql)
|
||||
if nil != e {
|
||||
log.Print(e.Error())
|
||||
return e
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func DeleteDocTemplate(id int32) error{
|
||||
sql := fmt.Sprintf(`delete from doc_template doc_template memo.id = '%d'`,id)
|
||||
_, e := db.GetMysqlClient().Query(sql)
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
return e
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func ReadDocTemplate(id int32) ([]DocTemplate,error){
|
||||
memo := []DocTemplate{}
|
||||
sql := fmt.Sprintf(`select * from doc_template where doc_template.id = '%d'`,id)
|
||||
e := db.GetMysqlClient().Query2(sql,&memo)
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
return nil,e
|
||||
}
|
||||
return memo,nil
|
||||
}
|
||||
|
||||
func GetDocTemplate(title string,limit int,offset int) ([]DocTemplate,error) {
|
||||
memo := []DocTemplate{}
|
||||
sql := fmt.Sprintf(`select * from doc_template where doc_template.name like '%s%%' limit %d offset %d`,
|
||||
title,limit,offset)
|
||||
log.Print(sql)
|
||||
e := db.GetMysqlClient().Query2(sql,&memo)
|
||||
if nil != e {
|
||||
logs.Error(e.Error())
|
||||
return nil,e
|
||||
}
|
||||
return memo,nil
|
||||
}
|
||||
Loading…
Reference in New Issue