Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
孙龙
/
note-library
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
2d39b246
authored
May 12, 2020
by
肖康
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'master' of
http://119.23.72.7/sunlong_v5/note-library
parents
a75a369f
90ebb945
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
13 deletions
.env
.gitignore
app/Http/Controllers/AjaxController.php
app/Http/Controllers/WebController.php
.env
View file @
2d39b246
...
@@ -57,5 +57,5 @@ MAIL_ENCRYPTION=tls
...
@@ -57,5 +57,5 @@ MAIL_ENCRYPTION=tls
ADMIN=liuzhiyong@teshehui.com
ADMIN=liuzhiyong@teshehui.com
LOGIN_DOMAIN='user.liexin.net'
LOGIN_DOMAIN='user.liexin.net'
ERP_SUPPLY_DOMAIN=http://192.168.1.235:6888
ERP_DOMAIN=http://192.168.1.235:6888
ERP_SUPPLY_DB_NAME=demo
ERP_DB_NAME=ICHUNT
\ No newline at end of file
\ No newline at end of file
.gitignore
View file @
2d39b246
...
@@ -14,4 +14,5 @@ Homestead.json
...
@@ -14,4 +14,5 @@ Homestead.json
/.idea
/.idea
/storage/debugbar
/storage/debugbar
.DS_Store
.DS_Store
*/.DS_Store
*/.DS_Store
\ No newline at end of file
.env
\ No newline at end of file
app/Http/Controllers/AjaxController.php
View file @
2d39b246
...
@@ -92,9 +92,10 @@ Class AjaxController extends Controller
...
@@ -92,9 +92,10 @@ Class AjaxController extends Controller
$tmpl
->
status
=
(
$tmpl
->
status
==
-
1
)
?
1
:-
1
;
$tmpl
->
status
=
(
$tmpl
->
status
==
-
1
)
?
1
:-
1
;
$tmpl
->
save
();
$tmpl
->
save
();
//此处推送到erp
//此处推送到erp
$this
->
pushTemplateErp
();
$a
=
$this
->
erp
->
createIssueLabel
(
1
,
"测试模板0001"
,
"田超"
,
1
);
// dump($this->erp);
dump
(
$a
);
// $a = $this->erp->createIssueLabel(1,"测试模板0001","田超",1);
// dump($a);
return
$this
->
ajaxReturn
(
0
,
"修改成功"
);
return
$this
->
ajaxReturn
(
0
,
"修改成功"
);
...
@@ -140,12 +141,21 @@ Class AjaxController extends Controller
...
@@ -140,12 +141,21 @@ Class AjaxController extends Controller
protected
function
pushTemplateErp
(){
protected
function
pushTemplateErp
(){
try
{
try
{
//登录
//登录
$soap
=
new
\SoapClient
(
env
(
"ERP_
SUPPLY_
DOMAIN"
)
.
'/ormrpc/services/EASLogin?wsdl'
);
$soap
=
new
\SoapClient
(
env
(
"ERP_DOMAIN"
)
.
'/ormrpc/services/EASLogin?wsdl'
);
$res
=
$soap
->
login
(
'PT'
,
'123456'
,
'eas'
,
env
(
'ERP_
SUPPLY_
DB_NAME'
),
'L2'
,
1
,
'BaseDB'
);
$res
=
$soap
->
login
(
'PT'
,
'123456'
,
'eas'
,
env
(
'ERP_DB_NAME'
),
'L2'
,
1
,
'BaseDB'
);
//接口
//接口
$this
->
erp
=
new
\SoapClient
(
ENV
(
"ERP_SUPPLY_DOMAIN"
)
.
'/ormrpc/services/WSIchuntjKFacade?wsdl'
);
$this
->
erp
=
new
\SoapClient
(
ENV
(
"ERP_DOMAIN"
)
.
'/ormrpc/services/WSIchuntjKFacade?wsdl'
);
// dump($this->erp);
$this
->
erp
->
createIssueLabel
(
json_encode
([
"templateId"
=>
1
,
"templateNmae"
=>
"aaaa"
,
"createUser"
=>
"bbbb"
,
"status"
=>
1
,
]));
return
true
;
}
catch
(
\Exception
$e
){
}
catch
(
\Exception
$e
){
return
false
;
// dump($e->getMessage());
}
}
}
}
...
...
app/Http/Controllers/WebController.php
View file @
2d39b246
...
@@ -54,7 +54,7 @@ class WebController extends Controller
...
@@ -54,7 +54,7 @@ class WebController extends Controller
// 首页
// 首页
public
function
index
(
Request
$request
)
public
function
index
(
Request
$request
)
{
{
$JobsModel
=
new
JobsModel
();
//
$JobsModel = new JobsModel();
$info
=
$this
->
getPageInfo
(
$request
);
$info
=
$this
->
getPageInfo
(
$request
);
...
...
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