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');
...@@ -349,9 +350,11 @@ class SmartUpdateController extends Controller ...@@ -349,9 +350,11 @@ class SmartUpdateController extends Controller
$serverId = DB::table('conf_server_license') $serverId = DB::table('conf_server_license')
->where('SNKEY', $serverKeyClient) ->where('SNKEY', $serverKeyClient)
->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;
...@@ -423,10 +429,11 @@ class SmartUpdateController extends Controller ...@@ -423,10 +429,11 @@ class SmartUpdateController extends Controller
ConfServerLicense::where('SNKEY', $serverKeyClient) ConfServerLicense::where('SNKEY', $serverKeyClient)
->update(['PHP_VERSION_ID' => $PHP_VERSION_ID]); ->update(['PHP_VERSION_ID' => $PHP_VERSION_ID]);
} }
if (!empty($clientVersion['JAVAVERSION'])) { if (!empty($clientVersion['JAVAVERSION'])) {
$fullText = implode(" || ", $clientVersion['JAVAVERSION']); $fullText = implode(" || ", $clientVersion['JAVAVERSION']);
$javaVersion = new ConfServerLicenseJavaversion; $javaVersion = new ConfServerLicenseJavaversion;
$javaVersion->SNKEY = $serverKeyClient; $javaVersion->SNKEY = $serverKeyClient;
$javaVersion->javaversion = $clientVersion['JAVAVERSION'][0]; $javaVersion->javaversion = $clientVersion['JAVAVERSION'][0];
...@@ -438,14 +445,14 @@ class SmartUpdateController extends Controller ...@@ -438,14 +445,14 @@ class SmartUpdateController extends Controller
->where('SNKEY', $serverKeyClient) ->where('SNKEY', $serverKeyClient)
->delete(); ->delete();
} }
if (!empty($clientVersion['GETORGANIZE'])) { if (!empty($clientVersion['GETORGANIZE'])) {
$checkDuplicate = ConfServerLicenseOrgcontrol::where('SNKEY', $serverKeyClient) $checkDuplicate = ConfServerLicenseOrgcontrol::where('SNKEY', $serverKeyClient)
->whereDate('createDate', now()) ->whereDate('createDate', now())
->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([
...@@ -459,7 +466,7 @@ class SmartUpdateController extends Controller ...@@ -459,7 +466,7 @@ class SmartUpdateController extends Controller
'spnOrganize' => $arrayData['ORG'], 'spnOrganize' => $arrayData['ORG'],
]); ]);
} }
} }
} else { } else {
ConfServerLicense::where('SNKEY', $serverKeyClient) ConfServerLicense::where('SNKEY', $serverKeyClient)
->update(['cur_version' => $clientVersion]); ->update(['cur_version' => $clientVersion]);
...@@ -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