xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source 
# Conflicts:
#	config/route.php
This commit is contained in:
mzl
2025-11-11 16:46:22 +08:00
parent 6c59fdef10
commit 80fbf6c35a
17 changed files with 1030 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controller/IndexController.php
+21 -9
View File
@@ -15,9 +15,9 @@ use GuzzleHttp\Client;
class IndexController
{
protected $noNeedLogin = ['index', 'view', 'perm', 'createResource', 'test'];
protected $noNeedLogin = ['index', 'view', 'perm', 'createResource', 'pdf', 'test'];
protected $noNeedHeaderData = ['index', 'view', 'perm', 'createResource', 'test'];
protected $noNeedHeaderData = ['index', 'view', 'perm', 'createResource', 'pdf', 'test'];
public function index(Request $request)
{
@@ -74,25 +74,25 @@ class IndexController
$options = [
'controller' => [
'module' => 'common',
'name' => 'stock_orders_files'
'name' => 'finance_recon_dubai_files'
],
'model' => [
'module' => 'common',
'name' => 'stock_orders_files'
'name' => 'finance_recon_dubai_files'
],
'service' => [
'module' => 'common',
'name' => 'stock_orders_files'
'name' => 'finance_recon_dubai_files'
],
'logic' => [
'module' => 'common',
'name' => 'stock_orders_files'
'name' => 'finance_recon_dubai_files'
],
'validate' => [
'module' => 'common',
'name' => 'stock_orders_files'
'name' => 'finance_recon_dubai_files'
],
'table' => 'stock_orders_files'
'table' => 'finance_recon_dubai_files'
];
$result = (new Generate($options))->doGenerate();
@@ -114,7 +114,7 @@ class IndexController
}
public function test(Request $request)
public function pdf(Request $request)
{
$id = $request->get('id');
$service = new \app\common\service\StockOrdersService();
@@ -154,4 +154,16 @@ class IndexController
$data = array('header' => $header,'body' => $response);
return $data;
}
public function test(Request $request)
{
$tmp = (new \app\common\service\OssService)->generatePrivateUrl('fdesk_test/20251104/20251104_财务.xlsx');;
$service = new \app\common\service\FinanceRecoDubaiFilesService();
$result = $service->import($tmp, true);
return json(['code' => 0, 'msg' => 'ok', 'data' => $result]);
}
}