Commit 9e646702 by BANice

修改redis和rabbitmq的host

parent 7b2c69d2
...@@ -5,7 +5,7 @@ GATEWAY_COUNT=4 ...@@ -5,7 +5,7 @@ GATEWAY_COUNT=4
GATEWAY_NAME=cdz GATEWAY_NAME=cdz
REGISTER_PORT=1239 REGISTER_PORT=1239
REGISTER_IP=127.0.0.1 REGISTER_IP=127.0.0.1
REDIS_HOST=redis.staging.senthink.com REDIS_HOST=redis.defult.svc.cluster.local
REDIS_PORT=6379 REDIS_PORT=6379
START_FILES=start_gateway|start_businessworker|start_register START_FILES=start_gateway|start_businessworker|start_register
DB_USER=cdz DB_USER=cdz
...@@ -13,7 +13,7 @@ DB_NAME=cdzpay ...@@ -13,7 +13,7 @@ DB_NAME=cdzpay
DB_PASSWORD=senthink123 DB_PASSWORD=senthink123
DB_PORT=3306 DB_PORT=3306
DB_HOST=127.0.0.1 DB_HOST=127.0.0.1
RABBIT_HOST=rabbitmq.staging.senthink.com RABBIT_HOST=rabbitmq.default.svc.cluster.local
RABBIT_PORT=5672 RABBIT_PORT=5672
RABBIT_LOGIN=rabbitmq RABBIT_LOGIN=rabbitmq
RABBIT_PASSWORD=senthink123! RABBIT_PASSWORD=senthink123!
......
...@@ -207,6 +207,8 @@ class AccessController extends Controller ...@@ -207,6 +207,8 @@ class AccessController extends Controller
$redis->hSet(sprintf(RedisKey::GATEWAY_PORT_LOGIC_ID_HASH, $_SESSION['gateway_id']), (int)$logic, $portId); $redis->hSet(sprintf(RedisKey::GATEWAY_PORT_LOGIC_ID_HASH, $_SESSION['gateway_id']), (int)$logic, $portId);
} }
Log::debug('mac => logic',[$mac=>$logic]);
$portModel->update([ $portModel->update([
'state' => $stateArray[$i], 'state' => $stateArray[$i],
...@@ -397,7 +399,7 @@ class AccessController extends Controller ...@@ -397,7 +399,7 @@ class AccessController extends Controller
foreach ($macs as $mac) { foreach ($macs as $mac) {
$macLogic[$mac] = sprintf('%02x', $logicStart++); $macLogic[$mac] = $logicStart++;
} }
......
...@@ -42,7 +42,7 @@ class Model ...@@ -42,7 +42,7 @@ class Model
{ {
return $this->db->single("SELECT $column FROM $this->table WHERE $where"); return $this->db->single("SELECT $column FROM $this->table WHERE $where and deleted_at is null ");
} }
...@@ -55,7 +55,7 @@ class Model ...@@ -55,7 +55,7 @@ class Model
{ {
$columns = implode(',',$columns); $columns = implode(',',$columns);
return $this->db->row("SELECT $columns FROM $this->table WHERE $where"); return $this->db->row("SELECT $columns FROM $this->table WHERE $where and deleted_at is null");
} }
...@@ -68,7 +68,7 @@ class Model ...@@ -68,7 +68,7 @@ class Model
{ {
$columns = implode(',',$columns); $columns = implode(',',$columns);
return $this->db->query("SELECT $columns FROM $this->table WHERE $where"); return $this->db->query("SELECT $columns FROM $this->table WHERE $where and deleted_at is null ");
...@@ -81,7 +81,7 @@ class Model ...@@ -81,7 +81,7 @@ class Model
public function getRow($where) public function getRow($where)
{ {
return $this->db->row("SELECT * FROM $this->table WHERE $where"); return $this->db->row("SELECT * FROM $this->table WHERE $where and deleted_at is null");
} }
......
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