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
public function finishPatch($request)
{
$serverKeyClient = $request->input('SERVERKEYCLIENT');
$action = $request->input('ACTION');
$clientVersion = $request->input('CLIENTVERSION');
......@@ -349,9 +350,11 @@ class SmartUpdateController extends Controller
$serverId = DB::table('conf_server_license')
->where('SNKEY', $serverKeyClient)
->value('ID');
if ($feedback != '') {
$total = explode(';', $feedback);
$total_tariff = '2397';
$total_imduty = '325087';
$total_stat = '19943';
......@@ -413,9 +416,12 @@ class SmartUpdateController extends Controller
'BACKUP_FEEDBACK' => $feedback
]);
}
try {
//code...
if (!empty($clientVersion)) {
if (is_array($clientVersion)) {
if (!empty($clientVersion['PHPVERSION'])) {
$serverkeyPHPVersion = $clientVersion['PHPVERSION'];
$PHP_VERSION_ID = strpos($serverkeyPHPVersion, "5.2") !== false ? 1 : 2;
......@@ -423,10 +429,11 @@ class SmartUpdateController extends Controller
ConfServerLicense::where('SNKEY', $serverKeyClient)
->update(['PHP_VERSION_ID' => $PHP_VERSION_ID]);
}
if (!empty($clientVersion['JAVAVERSION'])) {
$fullText = implode(" || ", $clientVersion['JAVAVERSION']);
$javaVersion = new ConfServerLicenseJavaversion;
$javaVersion->SNKEY = $serverKeyClient;
$javaVersion->javaversion = $clientVersion['JAVAVERSION'][0];
......@@ -438,14 +445,14 @@ class SmartUpdateController extends Controller
->where('SNKEY', $serverKeyClient)
->delete();
}
if (!empty($clientVersion['GETORGANIZE'])) {
$checkDuplicate = ConfServerLicenseOrgcontrol::where('SNKEY', $serverKeyClient)
->whereDate('createDate', now())
->first();
if ($checkDuplicate) {
$this->deleteGetOrganize($checkDuplicate->id);
$checkDuplicate->delete();
}
$controlId = DB::table('conf_server_license_orgcontrol')->insertGetId([
......@@ -459,7 +466,7 @@ class SmartUpdateController extends Controller
'spnOrganize' => $arrayData['ORG'],
]);
}
}
}
} else {
ConfServerLicense::where('SNKEY', $serverKeyClient)
->update(['cur_version' => $clientVersion]);
......@@ -480,7 +487,9 @@ class SmartUpdateController extends Controller
'TaskFinish' => now(),
'TaskRunner' => $userRunner
]);
} catch (\Throwable $th) {
echo $th;die();
}
$patchName = DB::table('conf_smartupdate')->where('pid', $patchId)->value('PATCHNAME');
echo base64_encode("\$PATCHNAME=\"$patchName\";");
}
......
......@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
class ConfServerLicenseJavaversion extends Model
{
protected $table = 'conf_server_license_javaversion';
public $timestamps = false;
protected $fillable = [
'id',
'SNKEY',
......
......@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
class ConfServerLicenseOrgcontrol extends Model
{
protected $table = 'conf_server_license_orgcontrol';
public $timestamps = false;
protected $fillable = [
'id',
'SNKEY',
......
......@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
class ConfServerLicenseOrglist extends Model
{
protected $table = 'conf_server_license_orglist';
public $timestamps = false;
protected $fillable = [
'id',
'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