完善健康档案

conf/app.conf

@@ -15,9 +15,9 @@ qiniu_secretkey = DmZSp_Bmnp-9aUB7xUvoyViZpzmx1Rs2RL69GvlW
 qiniu_domain = https://images.shengws.com/
 qiniu_bucket = syhclub-storage
 
-appid = "wxcdf53b48b7df107e"
+#appid = "wxcdf53b48b7df107e"
 key="Yz1HgsFX3yJvWPJSEdwJDA=="
-appsecret="94e944a69ad1d43ac447f5a8769ab801"
+#appsecret="94e944a69ad1d43ac447f5a8769ab801"
 
 [test]
 redishost = kuyi6666.redis.rds.aliyuncs.com
@@ -38,5 +38,5 @@ writemysqlpass = 1Q2W3e4r!@#$
 writemysqlname = sws_xcx
 
 
-#appid = "wx25576346fbca6905"
-#appsecret="f6d53ccb4a529dc4d3bd543a7634b6bd"
+appid = "wx25576346fbca6905"
+appsecret="f6d53ccb4a529dc4d3bd543a7634b6bd"

controllers/api_base_controller.go

@@ -66,7 +66,7 @@ func (c *BaseApiAuthController) Prepare() {
 		tokenString = authHeader[len("Bearer "):]
 	}
 
-	token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {
+	token, err := jwt.ParseWithClaims(tokenString, &CustomClaims{}, func(token *jwt.Token) (interface{}, error) {
 		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
 			return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
 		}
@@ -82,7 +82,7 @@ func (c *BaseApiAuthController) Prepare() {
 	}
 
 	// 假设JWT中包含了用户ID
-	claims, ok := token.Claims.(CustomClaims)
+	claims, ok := token.Claims.(*CustomClaims)
 	if !ok {
 		c.ServeFailJsonSendAndStop(http.StatusUnauthorized, enums.ErrorCodeNotLogin, "无法解析Token中的信息")
 		return
@@ -92,7 +92,7 @@ func (c *BaseApiAuthController) Prepare() {
 	c.sessionKey = key
 	redisCli := service.RedisClient()
 	defer redisCli.Close()
-	uJson, err := redisCli.Get(key).Bytes()
+	uJson, err := redisCli.Get(fmt.Sprintf("session:%v", key)).Bytes()
 
 	if err != nil {
 		c.ServeFailJsonSendAndStop(http.StatusUnauthorized, enums.ErrorCodeNotLogin, fmt.Sprintf("redis err:%v", err))
@@ -172,13 +172,13 @@ func (c *BaseApiController) login(u models.XcxUser) (string, error) {
 	uJson, _ := json.Marshal(u)
 	redisCli := service.RedisClient()
 	defer redisCli.Close()
-	service.RedisClient().Set(key, uJson, time.Second*time.Duration(expire))
+	redisCli.Set(fmt.Sprintf("session:%v", key), uJson, time.Hour*time.Duration(expire))
 	// 创建一个我们自己的声明
 	claims := CustomClaims{
 		UserID: key,
 		StandardClaims: jwt.StandardClaims{
-			ExpiresAt: time.Now().Add(time.Second * time.Duration(expire)).Unix(), // Token有效期（默认为7200秒）
-			Issuer:    "sws_xcx",                                                  // 签发者
+			ExpiresAt: time.Now().Add(time.Hour * time.Duration(expire)).Unix(), // Token有效期（默认为7200秒）
+			Issuer:    "sws_xcx",                                                // 签发者
 		},
 	}
 
@@ -205,7 +205,7 @@ func (c *BaseApiAuthController) updateCurrentUser(updateAction func(*models.XcxU
 	if expire == 0 {
 		expire = 7200
 	}
-	err = redisCli.Set(c.sessionKey, uJson, time.Second*time.Duration(expire)).Err()
+	err = redisCli.Set(fmt.Sprintf("session:%v", c.sessionKey), uJson, time.Second*time.Duration(expire)).Err()
 	if err != nil {
 		return err
 	}

controllers/user_api_controller.go

@@ -17,6 +17,7 @@ type UserApiController struct {
 // @Description 获取个人中心信息
 // @Success 200 {object} models.UserInfoResp success
 // @Failure 500 error
+// @Security token
 // @router /getuserinfo [get]
 func (c *UserApiController) GetUserInfo() {
 
@@ -43,6 +44,7 @@ func (c *UserApiController) GetUserInfo() {
 // @Param	body	body 	models.WxXcxLoginReq	true  "小程序登录请求参数"
 // @Success 200 {object} models.XcxUser success
 // @Failure 500 error
+// @Security token
 // @router /updatephonebycode [post]
 func (c *UserApiController) UpdatePhoneByCode() {
 	dataBody := models.WxXcxLoginReq{}
@@ -82,6 +84,7 @@ func (c *UserApiController) UpdatePhoneByCode() {
 // @Param	body	body 	models.SaveUserInfoReq	true  "小程序登录请求参数"
 // @Success 200  success
 // @Failure 500 error
+// @Security token
 // @router /saveuserinfo [post]
 func (c *UserApiController) SaveUserInfo() {
 	req := &models.SaveUserInfoReq{}
@@ -123,6 +126,7 @@ func (c *UserApiController) SaveUserInfo() {
 // @Param	body	body 	models.SaveHealthProfileReq	true  "小程序登录请求参数"
 // @Success 200  success
 // @Failure 500 error
+// @Security token
 // @router /savehealthprofile [post]
 func (c *UserApiController) SaveHealthProfile() {
 
@@ -144,6 +148,7 @@ func (c *UserApiController) SaveHealthProfile() {
 // @Description 获取健康档案
 // @Success 200 {object} models.HealthProfileResp success
 // @Failure 500 error
+// @Security token
 // @router /gethealthprofile [get]
 func (c *UserApiController) GetHealthProfile() {
 	p, err := service.NewUserHealthProfileService().GetUserHealthProfileByUserId(c.CurrentUser.Id)

enums/error_code.go

@@ -496,7 +496,7 @@ func MakeFailResponseJSON(errMsg string, errCode int) CommonResp {
 }
 
 func MakeDynamicFailResponseJSON(errMsg string) CommonResp {
-	resp := CommonResp{Msg: errMsg, State: 0}
+	resp := CommonResp{Code: ErrorCommitFail, Msg: errMsg, State: 0}
 	return resp
 }
 

models/dbmodels.go

@@ -2,6 +2,7 @@ package models
 
 import "time"
 
+//检测项目
 type CheckItem struct {
 	Id              int       `json:"id" gorm:"type:int(11) auto_increment; NOT NULL; primary_key; COMMENT:'检测项目ID'"`
 	CheckItemNumber int       `json:"check_item_number" gorm:"type:int(11); COMMENT:'排序'"`
@@ -25,6 +26,7 @@ func (CheckItem) TableName() string {
 	return "check_item"
 }
 
+//检测记录
 type CheckRecord struct {
 	Id                  int64     `json:"id" gorm:"type:bigint(20); NOT NULL; primary_key; COMMENT:'检测记录ID'"`
 	CheckType           string    `json:"check_type" gorm:"type:varchar(255); COMMENT:'检测类型(试纸类型)'"`
@@ -46,6 +48,7 @@ func (CheckRecord) TableName() string {
 	return "check_record"
 }
 
+//检测记录详情
 type CheckRecordItem struct {
 	Id              int64     `json:"id" gorm:"type:bigint(20) auto_increment; NOT NULL; primary_key"`
 	CheckId         int64     `json:"check_id" gorm:"type:bigint(20); NOT NULL; DEFAULT:'0'"`
@@ -61,6 +64,7 @@ func (CheckRecordItem) TableName() string {
 	return "check_record_item"
 }
 
+//设备表
 type Device struct {
 	Id                   uint64    `json:"id" gorm:"type:bigint(20) unsigned auto_increment; NOT NULL; primary_key; COMMENT:'设备ID'"`
 	Name                 string    `json:"name" gorm:"type:varchar(255); COMMENT:'设备名称'"`
@@ -92,6 +96,7 @@ func (Device) TableName() string {
 	return "device"
 }
 
+//设备消息日志
 type DeviceMessageLog struct {
 	Id         uint64    `json:"id" gorm:"type:bigint(20) unsigned auto_increment; NOT NULL; primary_key"`
 	MessageId  string    `json:"message_id" gorm:"type:varchar(255)"`
@@ -106,6 +111,7 @@ func (DeviceMessageLog) TableName() string {
 	return "device_message_log"
 }
 
+//设备绑定表
 type DeviceRelate struct {
 	Id         int64     `json:"id" gorm:"type:bigint(20) auto_increment; NOT NULL; primary_key; COMMENT:'id'"`
 	Name       string    `json:"name" gorm:"type:varchar(255); COMMENT:'名称'"`
@@ -134,6 +140,7 @@ func (SysDictionary) TableName() string {
 	return "sys_dictionary"
 }
 
+//用户健康档案
 type UserHealthProfile struct {
 	Id                  uint64    `json:"id" gorm:"type:bigint(20) unsigned auto_increment; NOT NULL; primary_key; COMMENT:'Primary Key ID'"`
 	UserId              uint64    `json:"user_id" gorm:"type:bigint(20) unsigned; NOT NULL; COMMENT:'用户ID'"`
@@ -165,6 +172,7 @@ func (UserHealthProfile) TableName() string {
 	return "user_health_profile"
 }
 
+//小程序用户表（个人中心）
 type XcxUser struct {
 	Id                      uint64    `json:"id" gorm:"type:bigint(20) unsigned auto_increment; NOT NULL; primary_key; COMMENT:'Primary Key ID'"`
 	Phone                   string    `json:"phone" gorm:"type:varchar(32); COMMENT:'手机号码'"`

routers/router.go

@@ -2,6 +2,7 @@
 // @Title sws xcx api doc
 // @Description 圣卫士小程序API接口文档
 // @License 领透科技
+// @SecurityDefinition token apiKey Authorization header
 package routers
 
 import (

service/redis.go

@@ -12,8 +12,8 @@ func RedisClient() *redis.Client {
 	address := fmt.Sprintf("%s:%s", beego.AppConfig.String("redishost"), beego.AppConfig.String("redisport"))
 	client := redis.NewClient(&redis.Options{
 		Addr:     address,
-		Password: beego.AppConfig.String("redispasswrod"), // no password set
-		DB:       0,                                       // use default DB
+		Password: beego.AppConfig.String("redispasswrod"),  // no password set
+		DB:       beego.AppConfig.DefaultInt("redisdb", 4), // use default DB
 	})
 	pong, err := client.Ping().Result()
 	if err != nil {

service/userservice.go

@@ -28,7 +28,11 @@ func (s *XcxUserService) GetUser(id uint64) (*models.XcxUser, error) {
 func (s *XcxUserService) GetOrCreate(openId string, unionId string) (*models.XcxUser, error) {
 
 	user := &models.XcxUser{OpenId: openId, UnionId: unionId}
-	db := writeDb.Where("open_id = ?", openId).Or("union_id = ?", unionId).FirstOrCreate(user)
+	db := writeDb.Where("open_id = ?", openId)
+	if unionId != "" {
+		db = db.Or("union_id = ?", unionId)
+	}
+	db.FirstOrCreate(user)
 
 	return user, db.Error
 

swagger/swagger.json

@@ -68,7 +68,12 @@
                     "500": {
                         "description": "error"
                     }
-                }
+                },
+                "security": [
+                    {
+                        "token": []
+                    }
+                ]
             }
         },
         "/api/user/getuserinfo": {
@@ -88,7 +93,12 @@
                     "500": {
                         "description": "error"
                     }
-                }
+                },
+                "security": [
+                    {
+                        "token": []
+                    }
+                ]
             }
         },
         "/api/user/login": {
@@ -147,7 +157,12 @@
                     "500": {
                         "description": "error"
                     }
-                }
+                },
+                "security": [
+                    {
+                        "token": []
+                    }
+                ]
             }
         },
         "/api/user/saveuserinfo": {
@@ -175,7 +190,12 @@
                     "500": {
                         "description": "error"
                     }
-                }
+                },
+                "security": [
+                    {
+                        "token": []
+                    }
+                ]
             }
         },
         "/api/user/updatephonebycode": {
@@ -206,7 +226,12 @@
                     "500": {
                         "description": "error"
                     }
-                }
+                },
+                "security": [
+                    {
+                        "token": []
+                    }
+                ]
             }
         }
     },
@@ -519,5 +544,12 @@
             "title": "type",
             "type": "object"
         }
+    },
+    "securityDefinitions": {
+        "token": {
+            "type": "apiKey",
+            "name": "Authorization",
+            "in": "header"
+        }
     }
 }

swagger/swagger.yml

@@ -53,6 +53,8 @@ paths:
             $ref: '#/definitions/models.HealthProfileResp'
         "500":
           description: error
+      security:
+      - token: []
   /api/user/getuserinfo:
     get:
       tags:
@@ -68,6 +70,8 @@ paths:
             $ref: '#/definitions/models.UserInfoResp'
         "500":
           description: error
+      security:
+      - token: []
   /api/user/login:
     post:
       tags:
@@ -110,6 +114,8 @@ paths:
           description: success
         "500":
           description: error
+      security:
+      - token: []
   /api/user/saveuserinfo:
     post:
       tags:
@@ -130,6 +136,8 @@ paths:
           description: success
         "500":
           description: error
+      security:
+      - token: []
   /api/user/updatephonebycode:
     post:
       tags:
@@ -152,6 +160,8 @@ paths:
             $ref: '#/definitions/models.XcxUser'
         "500":
           description: error
+      security:
+      - token: []
 definitions:
   models.HealthProfileResp:
     title: HealthProfileResp
@@ -371,3 +381,8 @@ definitions:
   models.type:
     title: type
     type: object
+securityDefinitions:
+  token:
+    type: apiKey
+    name: Authorization
+    in: header