a426f1e2 by root

Changed something

1 parent bb6d7fbe
File mode changed
...@@ -29,7 +29,9 @@ class ApiController extends Controller ...@@ -29,7 +29,9 @@ class ApiController extends Controller
29 29
30 public function insert($json) 30 public function insert($json)
31 { 31 {
32 $json = '{"pdf":[{"name":"SISKINDS_test file","folder":"SISKINDS_test","pdfLocation":"https://www.polyu.edu.hk/iaee/files/pdf-sample.pdf"}],"changes":[{"label":"none","locationUp":"400","locationRight":90,"pages":"1","content":"LOGO_text_black.jpg","z-index":null,"idstylesPDF":1,"order":"2","style":null,"idchange_typePDF":2,"change_type":"2","fileLocation":"http://www.arielpremium.com/images/vsample_images/LOGO_text_black.jpg"},{"label":"text style","locationUp":"60","locationRight":290,"pages":"1","content":"519.660.2121 siskinds.com\/change","z-index":null,"idstylesPDF":2,"order":"1","style":"a:3:{s:11:\"font-family\";s:11:\"TradeGothic\";s:9:\"font-size\";s:2:\"14\";s:10:\"font-color\";s:14:\"cmyk 0 0 0.5 0\";}","idchange_typePDF":1,"change_type":"1"}]}'; 32
33
34 $json = '{"pdf":[{"name":"SISKINDS_test file","folder":"SISKINDS_test","pdfLocation":"https://www.ets.org/Media/Tests/GRE/pdf/gre_research_validity_data.pdf"}],"changes":[{"label":"none","locationUp":"400","locationRight":90,"pages":"1","content":"LOGO_text_black.jpg","z-index":null,"idstylesPDF":1,"order":"2","style":null,"idchange_typePDF":2,"change_type":"2","fileLocation":"http://www.arielpremium.com/images/vsample_images/LOGO_text_black.jpg"},{"label":"text style","locationUp":"60","locationRight":290,"pages":"1","content":"519.660.2121 siskinds.com\/change","z-index":null,"idstylesPDF":2,"order":"1","style":"a:3:{s:11:\"font-family\";s:11:\"TradeGothic\";s:9:\"font-size\";s:2:\"14\";s:10:\"font-color\";s:14:\"cmyk 0 0 0.5 0\";}","idchange_typePDF":1,"change_type":"1"}]}';
33 35
34 $apiCallId = new pdfModel(); 36 $apiCallId = new pdfModel();
35 $apiCallId = $apiCallId->addApiCall('1',$json); 37 $apiCallId = $apiCallId->addApiCall('1',$json);
......
...@@ -34,7 +34,7 @@ class PdfController extends Controller ...@@ -34,7 +34,7 @@ class PdfController extends Controller
34 $outfile=""; 34 $outfile="";
35 $title = "Test Pages"; 35 $title = "Test Pages";
36 $storagePath = Storage::disk('local')->getDriver()->getAdapter()->getPathPrefix(); 36 $storagePath = Storage::disk('local')->getDriver()->getAdapter()->getPathPrefix();
37 $outfile = $storagePath.$searchpath."/new_".$rows[0]->file; 37 // $outfile = $storagePath.$searchpath."/new_".$rows[0]->file;
38 38
39 try { 39 try {
40 40
...@@ -154,13 +154,13 @@ try { ...@@ -154,13 +154,13 @@ try {
154 154
155 /// To turn on pdf screen out put uncomment below lines and remove the text in $output="" Var 155 /// To turn on pdf screen out put uncomment below lines and remove the text in $output="" Var
156 156
157 //$buf = $p->get_buffer(); 157 $buf = $p->get_buffer();
158 //$len = strlen($buf); 158 $len = strlen($buf);
159 159
160 //header("Content-type: application/pdf"); 160 header("Content-type: application/pdf");
161 //header("Content-Length: $len"); 161 header("Content-Length: $len");
162 //header("Content-Disposition: inline; filename=test_pages.pdf"); 162 header("Content-Disposition: inline; filename=test_pages.pdf");
163 //print $buf; 163 print $buf;
164 164
165 165
166 166
......
...@@ -22,7 +22,7 @@ class pdfModel extends Model ...@@ -22,7 +22,7 @@ class pdfModel extends Model
22 ->join('changesPDF', 'PDF_idPDF', '=', 'idPDF') 22 ->join('changesPDF', 'PDF_idPDF', '=', 'idPDF')
23 ->join('stylesPDF', 'stylesPDF_idstylesPDF', '=', 'idstylesPDF') 23 ->join('stylesPDF', 'stylesPDF_idstylesPDF', '=', 'idstylesPDF')
24 ->join('change_typePDF', 'idchange_typePDF', '=', 'change_typePDF_idchange_typePDF') 24 ->join('change_typePDF', 'idchange_typePDF', '=', 'change_typePDF_idchange_typePDF')
25 ->where('pdf.idPDF','=', $id); 25 ->where('PDF.idPDF','=', $id);
26 26
27 27
28 return $rows; 28 return $rows;
...@@ -31,7 +31,7 @@ class pdfModel extends Model ...@@ -31,7 +31,7 @@ class pdfModel extends Model
31 31
32 public function getList($id){ 32 public function getList($id){
33 33
34 $rows = DB::table('PDF')->where('pdf.custId','=', $id); 34 $rows = DB::table('PDF')->where('PDF.custId','=', $id);
35 35
36 return $rows; 36 return $rows;
37 } 37 }
......
...@@ -11,7 +11,11 @@ ...@@ -11,7 +11,11 @@
11 "itbz/fpdf": "^1.7", 11 "itbz/fpdf": "^1.7",
12 "barryvdh/laravel-snappy": "^0.3.0", 12 "barryvdh/laravel-snappy": "^0.3.0",
13 "vsmoraes/laravel-pdf": "^1.0", 13 "vsmoraes/laravel-pdf": "^1.0",
14 "php-curl-class/php-curl-class": "^4.11" 14 "php-curl-class/php-curl-class": "^4.11",
15 "ext-PDO": "^7.0",
16 "ext-pdo_pgsql": "^7.0",
17 "slim/pdo": "^1.9",
18 "doctrine/dbal": "^2.5"
15 19
16 20
17 }, 21 },
......
...@@ -108,7 +108,7 @@ return [ ...@@ -108,7 +108,7 @@ return [
108 | 108 |
109 */ 109 */
110 110
111 'log' => env('APP_LOG', 'single'), 111 'log' => env('APP_LOG', 'single'),
112 112
113 /* 113 /*
114 |-------------------------------------------------------------------------- 114 |--------------------------------------------------------------------------
......
1 html>
2 <head>
3 <title>www.nginxsite.com</title>
4 </head>
5 <body>
6 <h1>Success! Nginx is properly serving on this domain!</h1>
7 </body>
8 </html>
1 <?php echo "hello world";
2
3
4 ?>
...@@ -46,7 +46,6 @@ $app = require_once __DIR__.'/../bootstrap/app.php'; ...@@ -46,7 +46,6 @@ $app = require_once __DIR__.'/../bootstrap/app.php';
46 | and wonderful application we have prepared for them. 46 | and wonderful application we have prepared for them.
47 | 47 |
48 */ 48 */
49
50 $kernel = $app->make(Illuminate\Contracts\Http\Kernel::class); 49 $kernel = $app->make(Illuminate\Contracts\Http\Kernel::class);
51 50
52 $response = $kernel->handle( 51 $response = $kernel->handle(
......