Merge branch 'master' of http://git.shengws.com/xmg123/Xcx_New

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 小程序
-httpport = 9539
+httpport = 9529
 runmode = prod
 
 #
@@ -113,21 +113,6 @@ writepatientuser = syh
 writepatientpass = xhPECP2nFObR8aUK
 writepatientname = sgj_cdm
 
-
-readswshost = shengws1.mysql.rds.aliyuncs.com
-readswsport = 3306
-readswsuser = syh
-readswspass = xhPECP2nFObR8aUK
-readswsname = shengws
-
-
-
-writeswshost = shengws1.mysql.rds.aliyuncs.com
-writeswsport = 3306
-writeswsuser = syh
-writeswspass = xhPECP2nFObR8aUK
-writeswsname = shengws
-
 redishost = 349e580b2a524290.redis.rds.aliyuncs.com
 redisport = 6379
 redispasswrod = TZtBW098WId3i27clkpj3q8dnUaVFP

service/xcx_mobile_api_service.go

@@ -9,7 +9,6 @@ import (
 	"errors"
 	"fmt"
 	"github.com/jinzhu/gorm"
-	"net/http"
 	"time"
 )
 
@@ -131,8 +130,8 @@ func GetWeekDayOfWeek() (weekMonday string) {
 func GetMobilePatient(mobile string, idcard string) (*models.XcxPatients, error) {
 
 	patient := models.XcxPatients{}
-	err := XTReadDB().Model(&patient).Where("(phone = ? or relative_phone =?) and id_card_no = ?", mobile, mobile, idcard).Find(&patient).Error
-
+	err := XTReadDB().Model(&patient).Where("(phone = ? or relative_phone =？) and id_card_no =?", mobile, mobile, idcard).Find(&patient).Error
+	//err := XTReadDB().Model(&patient).Where("id_card_no = ? and status = 1", mobile).Find(&patient).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -154,7 +153,7 @@ func GetTemplateMode(orgid int64) (models.XcxGobalTemplate, error) {
 func GetMobilePatientOne(mobile string) (*models.XcxAdminUserRole, error) {
 
 	patient := models.XcxAdminUserRole{}
-	err := UserReadDB().Model(&patient).Where("mobile = ? and status = 1", mobile).Find(&patient).Error
+	err := XTReadDB().Model(&patient).Where("mobile = ? and status = 1", mobile).Find(&patient).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}