Commit e4b91a1c authored by Sarun Mungthanya's avatar Sarun Mungthanya
Browse files

issue patch exchangerate

parent 1ed4e792
...@@ -339,6 +339,7 @@ class SmartUpdateController extends Controller ...@@ -339,6 +339,7 @@ class SmartUpdateController extends Controller
public function finishPatch($request) public function finishPatch($request)
{ {
$serverKeyClient = $request->input('SERVERKEYCLIENT'); $serverKeyClient = $request->input('SERVERKEYCLIENT');
$action = $request->input('ACTION'); $action = $request->input('ACTION');
$clientVersion = $request->input('CLIENTVERSION'); $clientVersion = $request->input('CLIENTVERSION');
...@@ -351,7 +352,9 @@ class SmartUpdateController extends Controller ...@@ -351,7 +352,9 @@ class SmartUpdateController extends Controller
->value('ID'); ->value('ID');
if ($feedback != '') { if ($feedback != '') {
$total = explode(';', $feedback); $total = explode(';', $feedback);
$total_tariff = '2397'; $total_tariff = '2397';
$total_imduty = '325087'; $total_imduty = '325087';
$total_stat = '19943'; $total_stat = '19943';
...@@ -413,9 +416,12 @@ class SmartUpdateController extends Controller ...@@ -413,9 +416,12 @@ class SmartUpdateController extends Controller
'BACKUP_FEEDBACK' => $feedback 'BACKUP_FEEDBACK' => $feedback
]); ]);
} }
try {
//code...
if (!empty($clientVersion)) { if (!empty($clientVersion)) {
if (is_array($clientVersion)) { if (is_array($clientVersion)) {
if (!empty($clientVersion['PHPVERSION'])) { if (!empty($clientVersion['PHPVERSION'])) {
$serverkeyPHPVersion = $clientVersion['PHPVERSION']; $serverkeyPHPVersion = $clientVersion['PHPVERSION'];
$PHP_VERSION_ID = strpos($serverkeyPHPVersion, "5.2") !== false ? 1 : 2; $PHP_VERSION_ID = strpos($serverkeyPHPVersion, "5.2") !== false ? 1 : 2;
...@@ -425,6 +431,7 @@ class SmartUpdateController extends Controller ...@@ -425,6 +431,7 @@ class SmartUpdateController extends Controller
} }
if (!empty($clientVersion['JAVAVERSION'])) { if (!empty($clientVersion['JAVAVERSION'])) {
$fullText = implode(" || ", $clientVersion['JAVAVERSION']); $fullText = implode(" || ", $clientVersion['JAVAVERSION']);
$javaVersion = new ConfServerLicenseJavaversion; $javaVersion = new ConfServerLicenseJavaversion;
...@@ -445,7 +452,7 @@ class SmartUpdateController extends Controller ...@@ -445,7 +452,7 @@ class SmartUpdateController extends Controller
->first(); ->first();
if ($checkDuplicate) { if ($checkDuplicate) {
$this->deleteGetOrganize($checkDuplicate->id); $checkDuplicate->delete();
} }
$controlId = DB::table('conf_server_license_orgcontrol')->insertGetId([ $controlId = DB::table('conf_server_license_orgcontrol')->insertGetId([
...@@ -480,7 +487,9 @@ class SmartUpdateController extends Controller ...@@ -480,7 +487,9 @@ class SmartUpdateController extends Controller
'TaskFinish' => now(), 'TaskFinish' => now(),
'TaskRunner' => $userRunner 'TaskRunner' => $userRunner
]); ]);
} catch (\Throwable $th) {
echo $th;die();
}
$patchName = DB::table('conf_smartupdate')->where('pid', $patchId)->value('PATCHNAME'); $patchName = DB::table('conf_smartupdate')->where('pid', $patchId)->value('PATCHNAME');
echo base64_encode("\$PATCHNAME=\"$patchName\";"); echo base64_encode("\$PATCHNAME=\"$patchName\";");
} }
......
...@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model; ...@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
class ConfServerLicenseJavaversion extends Model class ConfServerLicenseJavaversion extends Model
{ {
protected $table = 'conf_server_license_javaversion'; protected $table = 'conf_server_license_javaversion';
public $timestamps = false;
protected $fillable = [ protected $fillable = [
'id', 'id',
'SNKEY', 'SNKEY',
......
...@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model; ...@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
class ConfServerLicenseOrgcontrol extends Model class ConfServerLicenseOrgcontrol extends Model
{ {
protected $table = 'conf_server_license_orgcontrol'; protected $table = 'conf_server_license_orgcontrol';
public $timestamps = false;
protected $fillable = [ protected $fillable = [
'id', 'id',
'SNKEY', 'SNKEY',
......
...@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model; ...@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
class ConfServerLicenseOrglist extends Model class ConfServerLicenseOrglist extends Model
{ {
protected $table = 'conf_server_license_orglist'; protected $table = 'conf_server_license_orglist';
public $timestamps = false;
protected $fillable = [ protected $fillable = [
'id', 'id',
'controlId', 'controlId',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment