Browse Source

Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

陈少旭 1 month ago
parent
commit
706b10be7a
3 changed files with 22 additions and 21 deletions
  1. BIN
      XT_New.exe
  2. 10 10
      controllers/base_api_controller.go
  3. 12 11
      controllers/fapiao_controller.go

BIN
XT_New.exe View File


+ 10 - 10
controllers/base_api_controller.go View File

72
 	this.BaseAPIController.Prepare()
72
 	this.BaseAPIController.Prepare()
73
 	if this.GetAdminUserInfo() == nil {
73
 	if this.GetAdminUserInfo() == nil {
74
 		var userAdmin models.AdminUser
74
 		var userAdmin models.AdminUser
75
-		userAdmin.Id = 4522
75
+		userAdmin.Id = 3207
76
 		userAdmin.Mobile = "13318599895"
76
 		userAdmin.Mobile = "13318599895"
77
 
77
 
78
-		userAdmin.Id = 4522 //4,809
78
+		userAdmin.Id = 3207 //4,809
79
 		userAdmin.Mobile = "12222222222"
79
 		userAdmin.Mobile = "12222222222"
80
 		userAdmin.IsSuperAdmin = true
80
 		userAdmin.IsSuperAdmin = true
81
 		userAdmin.Status = 1
81
 		userAdmin.Status = 1
83
 		userAdmin.ModifyTime = 1530786071
83
 		userAdmin.ModifyTime = 1530786071
84
 		var subscibe models.ServeSubscibe
84
 		var subscibe models.ServeSubscibe
85
 		subscibe.ID = 11
85
 		subscibe.ID = 11
86
-		subscibe.OrgId = 10028 //机构id
86
+		subscibe.OrgId = 10721 //机构id
87
 		subscibe.PeriodStart = 1547447814
87
 		subscibe.PeriodStart = 1547447814
88
 		subscibe.PeriodEnd = 1550039814
88
 		subscibe.PeriodEnd = 1550039814
89
 		subscibe.State = 1
89
 		subscibe.State = 1
93
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
93
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
94
 		subscibes[4] = &subscibe
94
 		subscibes[4] = &subscibe
95
 		var adminUserInfo service.AdminUserInfo
95
 		var adminUserInfo service.AdminUserInfo
96
-		adminUserInfo.CurrentOrgId = 10028 //机构id小英9675或4
97
-		adminUserInfo.CurrentAppId = 12123 //4
96
+		adminUserInfo.CurrentOrgId = 10721 //机构id小英9675或4
97
+		adminUserInfo.CurrentAppId = 14655 //4
98
 		adminUserInfo.AdminUser = &userAdmin
98
 		adminUserInfo.AdminUser = &userAdmin
99
 		adminUserInfo.Subscibes = subscibes
99
 		adminUserInfo.Subscibes = subscibes
100
 		this.SetSession("admin_user_info", &adminUserInfo)
100
 		this.SetSession("admin_user_info", &adminUserInfo)
318
 	this.BaseAPIController.Prepare()
318
 	this.BaseAPIController.Prepare()
319
 	if this.GetAdminUserInfo() == nil {
319
 	if this.GetAdminUserInfo() == nil {
320
 		var userAdmin models.AdminUser
320
 		var userAdmin models.AdminUser
321
-		userAdmin.Id = 4522
321
+		userAdmin.Id = 3207
322
 		userAdmin.Mobile = "13318599895"
322
 		userAdmin.Mobile = "13318599895"
323
 
323
 
324
-		userAdmin.Id = 4522 //4,809
324
+		userAdmin.Id = 3207 //4,809
325
 		userAdmin.Mobile = "12222222222"
325
 		userAdmin.Mobile = "12222222222"
326
 		userAdmin.IsSuperAdmin = false
326
 		userAdmin.IsSuperAdmin = false
327
 		userAdmin.Status = 1
327
 		userAdmin.Status = 1
329
 		userAdmin.ModifyTime = 1530786071
329
 		userAdmin.ModifyTime = 1530786071
330
 		var subscibe models.ServeSubscibe
330
 		var subscibe models.ServeSubscibe
331
 		subscibe.ID = 11
331
 		subscibe.ID = 11
332
-		subscibe.OrgId = 10028 //机构id小英9675或4
332
+		subscibe.OrgId = 10721 //机构id小英9675或4
333
 		subscibe.PeriodStart = 1538035409
333
 		subscibe.PeriodStart = 1538035409
334
 		subscibe.PeriodEnd = 1569571409
334
 		subscibe.PeriodEnd = 1569571409
335
 		subscibe.State = 1
335
 		subscibe.State = 1
339
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
339
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
340
 		subscibes[4] = &subscibe
340
 		subscibes[4] = &subscibe
341
 		var adminUserInfo service.AdminUserInfo
341
 		var adminUserInfo service.AdminUserInfo
342
-		adminUserInfo.CurrentOrgId = 10028 //机构id小英9675或4
343
-		adminUserInfo.CurrentAppId = 12123 //4
342
+		adminUserInfo.CurrentOrgId = 10721 //机构id小英9675或4
343
+		adminUserInfo.CurrentAppId = 14655 //4
344
 		adminUserInfo.AdminUser = &userAdmin
344
 		adminUserInfo.AdminUser = &userAdmin
345
 		adminUserInfo.Subscibes = subscibes
345
 		adminUserInfo.Subscibes = subscibes
346
 		this.SetSession("admin_user_info", &adminUserInfo)
346
 		this.SetSession("admin_user_info", &adminUserInfo)

+ 12 - 11
controllers/fapiao_controller.go View File

1
 package controllers
1
 package controllers
2
 
2
 
3
 import (
3
 import (
4
-	"XT_New/common"
5
-	"XT_New/enums"
6
-	"XT_New/invoice"
7
-	"XT_New/models"
8
-	"XT_New/models/bwfapiao"
9
-	"XT_New/service"
10
-	"XT_New/service/fapiao"
11
-	"XT_New/utils"
12
 	"bytes"
4
 	"bytes"
13
 	"crypto/md5"
5
 	"crypto/md5"
14
 	"crypto/sha1"
6
 	"crypto/sha1"
17
 	"encoding/json"
9
 	"encoding/json"
18
 	"errors"
10
 	"errors"
19
 	"fmt"
11
 	"fmt"
20
-	"github.com/astaxie/beego"
21
-	"github.com/shopspring/decimal"
22
 	"io/ioutil"
12
 	"io/ioutil"
23
 	"math"
13
 	"math"
24
 	"net/http"
14
 	"net/http"
26
 	"strconv"
16
 	"strconv"
27
 	"strings"
17
 	"strings"
28
 	"time"
18
 	"time"
19
+
20
+	"XT_New/common"
21
+	"XT_New/enums"
22
+	"XT_New/invoice"
23
+	"XT_New/models"
24
+	"XT_New/models/bwfapiao"
25
+	"XT_New/service"
26
+	"XT_New/service/fapiao"
27
+	"XT_New/utils"
28
+	"github.com/astaxie/beego"
29
+	"github.com/shopspring/decimal"
29
 )
30
 )
30
 
31
 
31
 func FaPiaoApiRegistRouters() {
32
 func FaPiaoApiRegistRouters() {
1370
 // GetAccessToken 获取登录授权的 access_token
1371
 // GetAccessToken 获取登录授权的 access_token
1371
 func GetAccessToken(apiURL, plainPassword, salt, clientID, clientSecret, username, orgAuthCode string) (AuthResponse, error) {
1372
 func GetAccessToken(apiURL, plainPassword, salt, clientID, clientSecret, username, orgAuthCode string) (AuthResponse, error) {
1372
 	// 当前时间戳(毫秒级)
1373
 	// 当前时间戳(毫秒级)
1373
-	timestamp := fmt.Sprintf("%d", time.Now().UnixMilli())
1374
+	timestamp := ""
1374
 
1375
 
1375
 	// 密码加密:MD5 + SHA1
1376
 	// 密码加密:MD5 + SHA1
1376
 	encryptedPassword := md5AndSha1(plainPassword + salt)
1377
 	encryptedPassword := md5AndSha1(plainPassword + salt)