完善.drone.yml

.drone.yml

@@ -0,0 +1,19 @@
+clone:
+  depth: 50
+  recursive: true
+  path: light-apiengine
+build:
+  image: docker.qianqiusoft.com/golang:1.12
+  commands:
+    - git clone https://git.qianqiusoft.com/qianqiusoft/light-apiengine.git $GOPATH/src/git.qianqiusoft.com/qianqiusoft/light-apiengine
+    - git clone https://git.qianqiusoft.com/qianqiusoft/light-apiengine-client.git $GOPATH/src/git.qianqiusoft.com/qianqiusoft/light-apiengine-client
+    - godep
+    - CGO_ENABLED=0 go build -a -ldflags '-s'
+    - tar zcf light-apiengine.tar.gz conf sqlconfig doc web light-apiengine
+publish:
+  docker:
+    registry: docker.qianqiusoft.com
+    email: develop@qianqiusoft.com
+    repo: docker.qianqiusoft.com/light-apiengine
+    tag:
+      - latest

Dockerfile

@@ -0,0 +1,8 @@
+FROM alpine
+
+ADD light-apiengine.tar.gz /app/
+
+VOLUME [ "/app/conf" ]
+EXPOSE 6166
+WORKDIR /app
+CMD ["/app/light-apiengine"]

controllers/partial/SystemController.go

@@ -212,14 +212,14 @@ func System_FindUserPage(c *entitys.CtrlContext) {
 	var users []sysmodel.UserInfo
 
 	dbSession := c.Db.Table("sys_user")
-	dbSession.Select("sys_user.*, sys_org.name org_name")
+	dbSession.Select("sys_user.*, sys_organization.name org_name")
 
 	countSession := c.Db.Table("sys_user")
 
 	JoinTables := []models.Join{}
 	//JoinTables = append(JoinTables, models.Join{TabelName: "sys_user_role", Condition: "sys_user_role.user_id = sys_user.id", JoinOperator: "left"})
 	//JoinTables = append(JoinTables, models.Join{TabelName: "sys_role", Condition: "sys_user_role.role_id = sys_role.id", JoinOperator: "left"})
-	JoinTables = append(JoinTables, models.Join{TabelName: "sys_org", Condition: "sys_org.id = sys_user.org_id", JoinOperator: "left"})
+	JoinTables = append(JoinTables, models.Join{TabelName: "sys_organization", Condition: "sys_organization.id = sys_user.org_id", JoinOperator: "left"})
 
 	for _, join := range JoinTables {
 		dbSession = dbSession.Join(join.JoinOperator, join.TabelName, join.Condition)
@@ -944,10 +944,10 @@ func System_PageOrg(c *entitys.CtrlContext) {
 
 	page := sysmodel.PageResult{}
 	var orgs []sysmodel.SysOrganization
-	dbSession := c.Db.Table("sys_org")
-	dbSession = dbSession.Select("sys_org.*")
+	dbSession := c.Db.Table("sys_organization")
+	dbSession = dbSession.Select("sys_organization.*")
 
-	countSession := c.Db.Table("sys_org")
+	countSession := c.Db.Table("sys_organization")
 
 	JoinTables := []sysmodel.Join{}
 	//JoinTables = append(JoinTables, sysmodel.Join{TabelName: "subject", Condition: "lesson.subject_id = subject.id", JoinOperator: "left"})

godep.yaml

@@ -0,0 +1,34 @@
+package: light-apiengine
+ignore:
+  - git.qianqiusoft.com/qianqiusoft/light-apiengine
+import:
+  - package: github.com/go-sql-driver/mysql
+    repo: https://git.qianqiusoft.com/github.com/go-sql-driver__mysql.git
+  - package: github.com/gin-gonic/gin
+    repo: https://git.qianqiusoft.com/github.com/gin-gonic__gin.git
+  - package: github.com/xormplus/xorm
+    repo: https://git.qianqiusoft.com/github.com/xormplus__xorm.git
+  - package: golang.org/x/sys
+    repo: https://git.qianqiusoft.com/golang.org/sys.git
+  - package: git.qianqiusoft.com/qianqiusoft/go-uuid
+    repo: https://git.qianqiusoft.com/qianqiusoft/go-uuid.git
+  - package: github.com/mattn/go-isatty
+    repo: https://git.qianqiusoft.com/github.com/mattn__go-isatty.git
+  - package: github.com/gin-contrib/sse
+    repo: https://git.qianqiusoft.com/github.com/gin-contrib__sse.git
+  - package: github.com/gin-contrib/cors
+    repo: https://git.qianqiusoft.com/github.com/gin-contrib__cors.git
+  - package: github.com/golang/protobuf
+    repo: https://git.qianqiusoft.com/github.com/golang__protobuf.git
+  - package: github.com/mattn/go-sqlite3
+    repo: https://git.qianqiusoft.com/public/go-sqlite3.git
+  - package: gopkg.in/go-playground/validator.v8
+    repo: https://git.qianqiusoft.com/gopkg.in/go-playground__validator.v8.git
+  - package: github.com/ugorji/go
+    repo: https://git.qianqiusoft.com/github.com/ugorji__go.git
+  - package: gopkg.in/yaml.v2
+    repo: https://git.qianqiusoft.com/gopkg.in/yaml.v2.git
+  - package: github.com/xormplus/builder
+    repo: https://git.qianqiusoft.com/github.com/xormplus__builder.git
+  - package: github.com/xormplus/core
+    repo: https://git.qianqiusoft.com/github.com/xormplus__core.git