XMLWAN il y a 3 ans
Parent
révision
8147df03b7

+ 1 - 1
conf/app.conf Voir le fichier

@@ -1,5 +1,5 @@
1 1
 appname = 小程序
2
-httpport = 9529
2
+httpport = 9539
3 3
 runmode = dev
4 4
 
5 5
 #

+ 7 - 12
controllers/xcx_mobile_api_controller.go/xcx_api_controller.go Voir le fichier

@@ -184,19 +184,14 @@ func (this *XcxApiController) GetLoginInfor() {
184 184
 }
185 185
 
186 186
 func (this *XcxApiController) GetPatientList() {
187
-	//var appid = "wx4f4bc4dec97d474b"
188
-	//var key = "tiihtNczf5v6AKRyjwEUhQ=="
189
-	//var iv = "r7BXXKkLb8qrSNn05n0qiA=="
190
-	//var strs = "CiyLU1Aw2KjvrjMdj8YKliAjtP4gsMZMQmRzooG2xrDcvSnxIMXFufNstNGTyaGS9uT5geRa0W4oTOb1WT7fJlAC+oNPdbB+3hVbJSRgv+4lGOETKUQz6OYStslQ142dNCuabNPGBzlooOmB231qMM85d2/fV6ChevvXvQP8Hkue1poOFtnEtpyxVLW1zAo6/1Xx1COxFvrc2d7UL/lmHInNlxuacJXwu0fjpXfz/YqYzBIBzD6WUfTIF9GRHpOn/Hz7saL8xz+W//FRAUid1OksQaQx4CMs8LOddcQhULW4ucetDf96JcR3g0gfRK4PC7E/r7Z6xNrXd2UIeorGj5Ef7b1pJAYB6Y5anaHqZ9J6nKEBvB4DnNLIVWSgARns/8wR2SiRS7MNACwTyrGvt9ts8p12PKFdlqYTopNHR1Vf7XjfhQlVsAJdNiKdYmYVoKlaRv85IfVunYzO0IKXsyl7JCUjCpoG20f0a04COwfneQAGGwd5oa+T8yO5hzuyDb/XcxxmK01EpqOyuxINew=="
191
-
192
-	//appid := "wx20b60369111b063a"
187
+	appid := "wx20b60369111b063a"
193 188
 	key := "Yz1HgsFX3yJvWPJSEdwJDA=="
194 189
 	strs := "uSevGQ5ShkiHjQuqz7s36SKZisVGA4fHH/dy+etg0W7ibVeidl6TyFS+kQZ6B9AI2T+1kOtKXeyveQR7q2TXJdu3fhKCFoLKVFzICNEvkiHMnchJ0T0OpRO3oT+icYq80+egvT+jMSgP7yi0cAgmiKaK/4QURD7+nvxRAj9drzz77sbeFt8KElb1LN/+Wn8dIoQzisxbON9G1VJYYtyBkQ=="
195 190
 	iv := "JgsbDhJ613uaAgAoBVh0Zw=="
196
-	data, err := service.Dncrypt(strs, key, iv)
197
-	fmt.Println(err)
191
+	//data, err := service.Dncrypt(strs, key, iv)
192
+	//fmt.Println(err)
198 193
 
199
-	//data, err := service.DecryptData(appid, key, iv, strs)
194
+	data, err := service.DecryptData(appid, key, iv, strs)
200 195
 	patient_id, _ := this.GetInt64("patient_id")
201 196
 	patient, err := service.GetPatientListByPatientId(patient_id)
202 197
 
@@ -212,14 +207,14 @@ func (this *XcxApiController) GetPatientList() {
212 207
 }
213 208
 
214 209
 func (this *XcxApiController) GetDataInfo() {
215
-	
210
+
216 211
 	appid := this.GetString("appid")
217 212
 	fmt.Println(appid)
218 213
 	key := this.GetString("key")
219 214
 	iv := this.GetString("iv")
220 215
 	encryptedData := this.GetString("encryptedData")
221
-	//list, _ := service.DecryptData(appid, key, iv, encryptedData)
222
-	list, _ := service.Dncrypt(encryptedData, key, iv)
216
+	list, _ := service.DecryptData(appid, key, iv, encryptedData)
217
+	//list, _ := service.Dncrypt(encryptedData, key, iv)
223 218
 
224 219
 	this.ServeSuccessJSON(map[string]interface{}{
225 220
 		"list": list,

+ 2 - 14
service/xcx_mobile_api_service.go Voir le fichier

@@ -9,7 +9,6 @@ import (
9 9
 	"errors"
10 10
 	"fmt"
11 11
 	"github.com/jinzhu/gorm"
12
-	"strings"
13 12
 	"time"
14 13
 )
15 14
 
@@ -54,33 +53,24 @@ func GetPatientListByPatientId(id int64) (models.XcxPatients, error) {
54 53
 }
55 54
 
56 55
 func DecryptData(app_id, session_key, iv, encrypted_data string) (map[string]interface{}, error) {
57
-	if len := strings.Count(session_key, "") - 1; len != 24 {
58
-		return nil, errors.New("Invalid value session_key!")
59
-	}
56
+
60 57
 	aesKey, err := base64.StdEncoding.DecodeString(session_key)
61 58
 	if err != nil {
62 59
 		return nil, err
63 60
 	}
64 61
 
65
-	if len := strings.Count(iv, "") - 1; len != 24 {
66
-		return nil, errors.New("Invalid value iv!")
67
-	}
68 62
 	ivKey, err := base64.StdEncoding.DecodeString(iv)
69 63
 	if err != nil {
70 64
 		return nil, err
71 65
 	}
72 66
 
73
-	if len := strings.Count(encrypted_data, "") - 1; len != 24 {
74
-		return nil, errors.New("Invalid value encrypted_data!")
75
-	}
76
-
77 67
 	decodeData, err := base64.StdEncoding.DecodeString(encrypted_data)
78 68
 	if err != nil {
79 69
 		return nil, err
80 70
 	}
81 71
 
82 72
 	dataBytes, err := AesDecrypt(decodeData, aesKey, ivKey)
83
-	fmt.Println("err232332232332232232323", err)
73
+
84 74
 	if err != nil {
85 75
 		return nil, err
86 76
 	}
@@ -106,13 +96,11 @@ func AesDecrypt(crypted, key, iv []byte) ([]byte, error) {
106 96
 
107 97
 	blockMode := cipher.NewCBCDecrypter(block, iv)
108 98
 	origData := make([]byte, len(crypted))
109
-	fmt.Println("4443434344334434334343434", origData)
110 99
 	blockMode.CryptBlocks(origData, crypted)
111 100
 
112 101
 	// 去除填充
113 102
 	length := len(origData)
114 103
 	unp := int(origData[length-1])
115
-	fmt.Println("hhh23h2323232332", origData[:(length-unp)], nil)
116 104
 	return origData[:(length - unp)], nil
117 105
 
118 106
 }