'commit'

dsSupport/Config/Config.ini

@@ -41,6 +41,7 @@ project_name = dsSupport
 ip = 127.0.0.1
 port = 8001
 
+# 后台登陆账号密码
 [account]
 users = admin:dsideal,administrator:dsideal123@321
 

dsSupport/MyModel/Account/AccountController/DataerrorController.go

@@ -18,6 +18,7 @@ func Routers(r *gin.RouterGroup) {
 	rr := r.Group("/openapi")
 
 	rr.POST("/account/login", AccountOpenAPI.Login)
+	rr.POST("/account/currentUser", AccountOpenAPI.CurrentUser)
 
 	return
 }

dsSupport/MyModel/Account/AccountDAO/AccountDAO.go

@@ -43,3 +43,18 @@ func Login(username string, password string) (bool, string) {
 	return flag, msg
 }
 
+func CurrentUser(username string) (bool, string) {
+	var flag bool
+	var msg string
+
+	if username == ""{
+		flag = false
+		msg = "账号或密码不能为空"
+	} else {
+		flag = true
+		msg = "{\"name\":\"管理员\",\"avatar\":\"admin.png\",\"userid\":\"00000001\",\"email\":\"admin@edusoa.com\",\"signature\":\"海纳百川，有容乃大\",\"title\":\"大数据专家\",\"group\":\"东北师大理想股份有限公司-数智创新中心\",\"tags\":[{\"key\":\"0\",\"label\":\"大数据\"},{\"key\":\"1\",\"label\":\"人工智能\"},{\"key\":\"2\",\"label\":\"物联网\"},{\"key\":\"3\",\"label\":\"架构\"},{\"key\":\"4\",\"label\":\"数据分析\"},{\"key\":\"5\",\"label\":\"海纳百川\"}],\"notifyCount\":12,\"unreadCount\":11,\"country\":\"China\",\"geographic\":{\"province\":{\"label\":\"吉林省\",\"key\":\"130000\"},\"city\":{\"label\":\"长春市\",\"key\":\"130000\"}},\"address\":\"净月开发区\",\"phone\":\"400-0400-662\"}"
+	}
+
+	return flag, msg
+}
+

dsSupport/MyModel/Account/AccountOpenAPI/AccountOpenAPI.go

@@ -60,3 +60,35 @@ func Login(c *gin.Context) {
 
 	return
 }
+
+// 当前登陆者信息 godoc
+// @Summary 当前登陆者信息
+// @Tags account
+// @ID currentUser
+// @Accept  json
+// @Produce  json
+// @Success 200 {object} MySwagger.Result
+// @Failure 400 {object} MySwagger.Result
+// @Router /v1/openapi/account/currentUser [post]
+func CurrentUser(c *gin.Context) {
+
+	success, message := AccountService.CurrentUser()
+
+	if success {
+		c.JSON(http.StatusOK, gin.H{
+			"status" : "ok",
+			"message" : message,
+		})
+
+		return
+	} else {
+		c.JSON(http.StatusOK, gin.H{
+			"status" : "error",
+			"message" : "失败",
+		})
+
+		return
+	}
+
+	return
+}

dsSupport/MyModel/Account/AccountService/AccountService.go

@@ -19,3 +19,10 @@ func Login(username string, password string) (bool, string) {
 	return result, message
 }
 
+func CurrentUser() (bool, string) {
+	username := "admin"
+	result, message := AccountDAO.CurrentUser(username)
+
+	return result, message
+}
+

dsSupport/docs/docs.go

@@ -1227,6 +1227,35 @@ var doc = `{
                 ]
             }
         },
+        "/v1/openapi/account/currentUser": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "account"
+                ],
+                "summary": "当前登陆者信息",
+                "operationId": "currentUser",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/MySwagger.Result"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/MySwagger.Result"
+                        }
+                    }
+                }
+            }
+        },
         "/v1/openapi/account/login": {
             "post": {
                 "description": "json:\"username\" xorm:\"not null comment('账号') VARCHAR(100)\" example:\"example\"\njson:\"password\" xorm:\"not null comment('密码') VARCHAR(100)\" example:\"123456\"",

dsSupport/docs/swagger.json

@@ -1211,6 +1211,35 @@
                 ]
             }
         },
+        "/v1/openapi/account/currentUser": {
+            "post": {
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "account"
+                ],
+                "summary": "当前登陆者信息",
+                "operationId": "currentUser",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/MySwagger.Result"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request",
+                        "schema": {
+                            "$ref": "#/definitions/MySwagger.Result"
+                        }
+                    }
+                }
+            }
+        },
         "/v1/openapi/account/login": {
             "post": {
                 "description": "json:\"username\" xorm:\"not null comment('账号') VARCHAR(100)\" example:\"example\"\njson:\"password\" xorm:\"not null comment('密码') VARCHAR(100)\" example:\"123456\"",

dsSupport/docs/swagger.yaml

@@ -1136,6 +1136,25 @@ paths:
       - 2
       x-tablename:
       - t_app_base
+  /v1/openapi/account/currentUser:
+    post:
+      consumes:
+      - application/json
+      operationId: currentUser
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/MySwagger.Result'
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/MySwagger.Result'
+      summary: 当前登陆者信息
+      tags:
+      - account
   /v1/openapi/account/login:
     post:
       consumes: