Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
Y
ybf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xulili
ybf
Commits
c2e6d86d
Commit
c2e6d86d
authored
Jan 19, 2020
by
xd
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://114.67.93.201/xulili/ybf
parents
ad97a262
14bec745
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
73 additions
and
29 deletions
+73
-29
main.js
ybf_admin/src/api/login/main.js
+13
-0
main.js
ybf_wx/src/api/test/main.js
+2
-2
bRequestEa.js
ybf_wx/src/utils/bRequestEa.js
+57
-26
vue.config.js
ybf_wx/vue.config.js
+1
-1
No files found.
ybf_admin/src/api/login/main.js
View file @
c2e6d86d
import
request
from
'@/utils/request'
import
qs
from
'qs'
// export function ApiTestGet() {
// return request({
// url: '/admin/common/findLoginType',
// method: 'get'
// })
// }
// export function ApiLoginSubmit(inData) {
// return request({
// url: '/admin/common/login',
// method: 'post',
// data: qs.stringify(inData)
// })
// }
export
function
ApiTestGet
()
{
return
request
({
url
:
'/admin/common/findLoginType'
,
...
...
ybf_wx/src/api/test/main.js
View file @
c2e6d86d
...
...
@@ -13,8 +13,8 @@ export function ApiTestCfPost(inData) {
}
return
request
({
url
:
''
,
method
:
'
pos
t'
,
data
:
postData
method
:
'
ge
t'
,
params
:
postData
})
}
...
...
ybf_wx/src/utils/bRequestEa.js
View file @
c2e6d86d
...
...
@@ -2,7 +2,8 @@ import axios from 'axios'
import
md5
from
"js-md5"
// let BASE_API = "https://gd.chfatech.com/guangdian"
let
BASE_API
=
"/api/"
// let BASE_API = "/api/"
let
BASE_API
=
"/api"
const
zlog
=
console
.
log
.
bind
(
console
)
...
...
@@ -18,7 +19,7 @@ const createSign = (inPostData, inAppSecret) => {
// URL 编码
for
(
let
key
in
args
)
{
res
+=
encodeURIComponent
(
key
)
+
"%3d"
+
encodeURIComponent
(
args
[
key
]).
toLowerCase
()
+
"%26"
;
res
+=
encodeURIComponent
(
key
)
+
"%3d"
+
encodeURIComponent
(
args
[
key
]).
toLowerCase
()
+
"%26"
;
}
res
=
res
.
slice
(
0
,
-
3
);
...
...
@@ -26,12 +27,14 @@ const createSign = (inPostData, inAppSecret) => {
res
+=
`&appUser=
${
appUser
}
&appCode=
${
appCode
}
&
${
ts
}
${
appSecret
}
`
return
res
;
};
};
// Basic Info
let
basicInfo
=
{
appUser
:
"user001"
,
// appUser: "user001",
appUser
:
"YBF001"
,
ver
:
"v2.17"
,
// appSecret: "JeC0mmE2ZjZmOfdmTGImYzU5Yjg1AYU2M3F="
appSecret
:
"JeC0mmE2ZjZmOfdmTGImYzU5Yjg1AYU2M3F="
}
...
...
@@ -44,31 +47,59 @@ const service = axios.create({
// request 拦截器
service
.
interceptors
.
request
.
use
(
req
=>
{
// log('--->axios: req.data:', req.data)
let
oldPostData
=
JSON
.
parse
(
JSON
.
stringify
(
req
.
data
))
let
newPostData
=
{
appUser
:
basicInfo
.
appUser
,
appCode
:
oldPostData
.
args
.
appCode
,
ts
:
String
(
Date
.
parse
(
new
Date
())),
ver
:
basicInfo
.
ver
,
args
:
oldPostData
.
args
// zlog('--->axios: req.params: start:', req.params)
let
apiMethod
=
req
.
method
if
(
apiMethod
===
'post'
)
{
// log('--->axios: req.data:', req.data)
let
oldPostData
=
JSON
.
parse
(
JSON
.
stringify
(
req
.
data
))
let
newPostData
=
{
appUser
:
basicInfo
.
appUser
,
appCode
:
oldPostData
.
args
.
appCode
,
ts
:
String
(
Date
.
parse
(
new
Date
())),
ver
:
basicInfo
.
ver
,
args
:
oldPostData
.
args
}
delete
newPostData
.
args
.
appCode
let
postData
=
{
appUser
:
newPostData
.
appUser
,
appCode
:
newPostData
.
appCode
,
ts
:
newPostData
.
ts
,
sign
:
md5
(
createSign
(
newPostData
,
basicInfo
.
appSecret
)),
ver
:
newPostData
.
ver
,
args
:
newPostData
.
args
}
req
.
data
=
postData
}
delete
newPostData
.
args
.
appCode
let
postData
=
{
appUser
:
newPostData
.
appUser
,
appCode
:
newPostData
.
appCode
,
ts
:
newPostData
.
ts
,
sign
:
md5
(
createSign
(
newPostData
,
basicInfo
.
appSecret
)),
ver
:
newPostData
.
ver
,
args
:
newPostData
.
args
if
(
apiMethod
===
'get'
)
{
// log('--->axios: req.data:', req.data)
let
oldPostData
=
JSON
.
parse
(
JSON
.
stringify
(
req
.
params
))
let
newPostData
=
{
appUser
:
basicInfo
.
appUser
,
appCode
:
oldPostData
.
args
.
appCode
,
ts
:
String
(
Date
.
parse
(
new
Date
())),
ver
:
basicInfo
.
ver
,
args
:
oldPostData
.
args
}
delete
newPostData
.
args
.
appCode
let
postData
=
{
appUser
:
newPostData
.
appUser
,
appCode
:
newPostData
.
appCode
,
ts
:
newPostData
.
ts
,
sign
:
md5
(
createSign
(
newPostData
,
basicInfo
.
appSecret
)),
ver
:
newPostData
.
ver
,
args
:
newPostData
.
args
}
req
.
params
=
postData
}
zlog
()
req
.
data
=
postData
// zlog('--->axios: req.params: end:', req.params)
return
req
},
error
=>
{
...
...
ybf_wx/vue.config.js
View file @
c2e6d86d
...
...
@@ -16,7 +16,7 @@ module.exports = {
proxy
:
{
'/api'
:
{
ws
:
false
,
target
:
'http://111.26.165.55:8010'
,
target
:
'http://111.26.165.55:8010
/crminterface.ashx
'
,
changeOrigin
:
true
,
pathRewrite
:
{
'^/api'
:
''
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment