diff --git a/app-ht/modules/device/views/device/export.php b/app-ht/modules/device/views/device/export.php index 51188fb..a7d86ac 100644 --- a/app-ht/modules/device/views/device/export.php +++ b/app-ht/modules/device/views/device/export.php @@ -35,6 +35,7 @@ $cnt = 0; 设备ID 申请时间 授权时间 + 生成时间 状态 @@ -72,6 +73,9 @@ $cnt = 0; + + + diff --git a/app-ht/modules/manufacturer/controllers/ManufacturerController.php b/app-ht/modules/manufacturer/controllers/ManufacturerController.php index 207160d..f1b1189 100644 --- a/app-ht/modules/manufacturer/controllers/ManufacturerController.php +++ b/app-ht/modules/manufacturer/controllers/ManufacturerController.php @@ -50,7 +50,11 @@ class ManufacturerController extends BaseController $where = ['and']; if ($name) { - $where[] = ['like', 'name', $name]; + $where[] = [ + 'or', + ['like', 'name', $name], + ['like', 'manufacture_no', $name], + ]; } if ($phone) { $where[] = ['like', 'phone', $phone]; diff --git a/app-ht/modules/model/controllers/ModelController.php b/app-ht/modules/model/controllers/ModelController.php index e2410a1..bf6218a 100644 --- a/app-ht/modules/model/controllers/ModelController.php +++ b/app-ht/modules/model/controllers/ModelController.php @@ -53,7 +53,11 @@ class ModelController extends BaseController $where[] = ['<=', 'm.created_at', $endTime]; } if ($name) { - $where[] = ['like', 'm.name', $name]; + $where[] = [ + 'or', + ['like', 'm.name', $name], + ['like', 'm.model_no', $name], + ]; } if ($type == 0) { $pageList = ModelRepository::getPageList($where, 0 , 0); diff --git a/app-ht/modules/production/controllers/ProductionController.php b/app-ht/modules/production/controllers/ProductionController.php index 4050e9f..eed961c 100644 --- a/app-ht/modules/production/controllers/ProductionController.php +++ b/app-ht/modules/production/controllers/ProductionController.php @@ -62,6 +62,7 @@ class ProductionController extends BaseController $productionEndTime = strtotime($productionEndTime) + 86400; $where[] = ['<=', 'p.name', $productionEndTime]; } + if ($type == 0) { $pageList = ProductionRepository::getPageList($where, 0 , 0); $pages = null; diff --git a/app-ht/modules/project/controllers/ProjectController.php b/app-ht/modules/project/controllers/ProjectController.php index 035a497..da64c82 100644 --- a/app-ht/modules/project/controllers/ProjectController.php +++ b/app-ht/modules/project/controllers/ProjectController.php @@ -53,7 +53,12 @@ class ProjectController extends BaseController $where[] = ['<=', 'p.created_at', $endTime]; } if ($name) { - $where[] = ['like', 'p.name', $name]; + + $where[] = [ + 'or', + ['like', 'p.name', $name], + ['like', 'p.project_no', $name], + ]; } if ($type == 0) { $pageList = ProjectRepository::getPageList($where, 0, 0); diff --git a/app-ht/modules/upgrade/controllers/UpgradeController.php b/app-ht/modules/upgrade/controllers/UpgradeController.php index b523697..e25d923 100644 --- a/app-ht/modules/upgrade/controllers/UpgradeController.php +++ b/app-ht/modules/upgrade/controllers/UpgradeController.php @@ -125,7 +125,7 @@ class UpgradeController extends BaseController { $request = Yii::$app->request; $version = $request->post("version"); // 版本 - if (empty($version)) { + if (empty(trim($version))) { Yii::$app->session->setFlash('error', '版本不能为空'); return $this->render('create'); } @@ -237,7 +237,7 @@ class UpgradeController extends BaseController $params = $this->dataList(1); return $this->render('index', $params); } - if (empty($version)) { + if (empty(trim($version))) { Yii::$app->session->setFlash('error', '版本不能为空'); return $this->render('edit', ["info" => $upgrade]); } diff --git a/app-ht/modules/upgrade/views/upgrade/index.php b/app-ht/modules/upgrade/views/upgrade/index.php index f0ad31f..3bef4c7 100644 --- a/app-ht/modules/upgrade/views/upgrade/index.php +++ b/app-ht/modules/upgrade/views/upgrade/index.php @@ -72,8 +72,8 @@ $this->params['breadcrumbs'][] = $this->title; - - + + diff --git a/console/controllers/TestController.php b/console/controllers/TestController.php index 04ef072..d582d47 100644 --- a/console/controllers/TestController.php +++ b/console/controllers/TestController.php @@ -7,14 +7,15 @@ namespace console\controllers; * Time: 11:32 AM */ +use Yii; use common\exts\Aes; use common\exts\RSACrypt; use common\exts\Http; use common\helpers\Utils; -use domain\device\Device; + use GuzzleHttp\Psr7; use yii\console\Controller; -use GuzzleHttp\Psr7\Request; + use function chr; class TestController extends Controller @@ -33,33 +34,7 @@ class TestController extends Controller //md5($arr['']) } - public function actionDeviceAuth() - { - $url = 'http://kingb:8012/app-api/web/authDevice'; - //$url = 'http://47.107.95.101/app-api/web/authDevice'; - $manufactureNo = '0001'; - $device_id = 'DEVICE00000A'; - $projectNo = '0001'; - $modelNo = '0001'; - $productionNo = '0001'; - $timestamp = time(); - $salt = '13456'; - $sign = md5($manufactureNo. $projectNo. $modelNo . $productionNo . $timestamp .$device_id. $salt); - $params = [ - 'manufacture' => $manufactureNo, - 'device_id' => $device_id, - 'project' => $projectNo, - 'model' => $modelNo, - 'production' => $productionNo, - 'timestamp' => $timestamp, - 'sign' => $sign, - ]; - $params = json_encode($params); - //$params = '{"manufacture":"0002","device_id":"6705BF36C37F","project":"0002","model":"0003","production":"0002","timestamp":"1500000000","sign":"2b67361ba972020496f1a1b3df388499"}'; - $postResult = Http::POST($url, $params); - echo $postResult; - } public function actionUpgrade() { @@ -181,7 +156,8 @@ class TestController extends Controller { $url = 'http://kingb:8012/app-api/web/CryptTxt'; $randKey = '98765432';//Utils::rand(32); - $rsa = new RSACrypt(); + $rsaKeys = Yii::$app->params['AUTH_DEVICE_RSA_PKCS_1']; + $rsa = new RSACrypt($rsaKeys['PRIVATE'], $rsaKeys['PUBLIC']); $aes = new Aes($randKey); $deviceId = 'oelooeloeloeloe'; $manufactureNo = '0001'; @@ -202,19 +178,19 @@ class TestController extends Controller /** * */ - public function actionAuthDeviceT() + public function actionAuthDevice() { - $url = 'http://kingb:8012/app-api/web/authDeviceT'; - //$url = 'http://47.107.95.101/app-api/web/authDeviceT'; + $url = 'http://kingb:8012/app-api/web/authDevice'; + $url = 'http://47.107.95.101/app-api/web/authDevice'; $manufactureNo = '0001'; - $device_id = 'DEVICE00000A'; + $device_id = 'DEVICE00000B'; $projectNo = '0001'; $modelNo = '0001'; $productionNo = '0001'; $timestamp = time(); - $randKey = Utils::rand(16).$timestamp; + $randKey = Utils::rand(16); $salt = "13456"; $sign = md5($manufactureNo. $projectNo. $modelNo . $productionNo . $timestamp .$device_id. $salt); $deviceParams = [ @@ -227,9 +203,11 @@ class TestController extends Controller 'sign' => $sign, ]; $deviceParams = json_encode($deviceParams); - $rsa = new RSACrypt(); + $rsaKeys = Yii::$app->params['AUTH_DEVICE_RSA_PKCS_1']; + $rsa = new RSACrypt($rsaKeys['PRIVATE'], $rsaKeys['PUBLIC']); + $randomKey = $rsa->encrypt($randKey); - $aes = new Aes($randKey); + $aes = new Aes(substr(md5($randKey.'12356'), 8, 16)); $params = [ 'randomKey' => $randomKey, 'content' => $aes->encrypt($deviceParams) @@ -247,11 +225,18 @@ class TestController extends Controller public function actionA() { $str = "87654321"; - $rsa = new RSACrypt(); - $deStr = "i5fNIUnPIFuSWeSIfh6f2Ehrm101XQMKRKuJ86QdrswO90jzcTw6LxWZDDe9YaS6KEnnUP8QaKuFKNEZlY+UsLWxBSKLwPEt3Qf7TAV6bXQBIYBzOXZTFpjvaBa+v1nQFrBPhYBo\/2RF5uVhk8xEilIe7A2XQLEvvhowIjFJevE="; + $rsaKeys = Yii::$app->params['AUTH_DEVICE_RSA_PKCS_1']; + $rsa = new RSACrypt($rsaKeys['PRIVATE'], $rsaKeys['PUBLIC']); + $deStr = "SRAeq\/pjyDA+0TtCTo06cbskERUUXvmGh3FdocS9AFmMsYDN\/TACQeU9pZhB5zKYHsJSTo\/JawuN\nG0ZBFd1B6TvJ\/1PkX30cvL9i03Ujo1JVe1njhMrig3mvNd7RDAylNzaFAAHU\/Wb\/94kf7gRGNyTj\ngj78Oe0bLdwasz4vBFE=\n"; //echo $deStr."\r\n"; - echo $rsa->decrypt($deStr); + $randKey = $rsa->decrypt($deStr); +echo $randKey."\r\n"; + $randKey = substr(md5($randKey.'12356'), 8, 16)."\r\n"; + echo $randKey."\r\n"; + $aes = new Aes($randKey); + echo $aes->decrypt("nZ8U4BlG0vxckrPM0lquvGDZ9Yuv32+MbYKZG8cqfMGJcltEEquc9v88bzpzm2dpkX5nR4ugLxfw\nc65yqYouozxyX+UdXPNHqaOYIQK\/MVWi+GkYsEafezJhozyGrLWAo7hHIdYcV\/fnm7xyEAaN\/91Q\nWdrhYmGvMf1IusGPBDaRnZtJ+mR1MhElZP73mQppFlusI8EJVFcEx\/z\/SkE9ywhPqAsK721xV+Fe\ncd7sNKs=\n"); + } } diff --git a/domain/upgrade/Upgrade.php b/domain/upgrade/Upgrade.php index 6c8ab97..282afda 100644 --- a/domain/upgrade/Upgrade.php +++ b/domain/upgrade/Upgrade.php @@ -20,6 +20,9 @@ class Upgrade static function create($item) { try { + if (isset($item["version"])) { + $item["version"] = trim($item["version"]); + } $where = [ 'version' => $item["version"], 'manufacture_id' => $item["manufacture_id"], @@ -67,6 +70,9 @@ class Upgrade if (empty($upgradeModel)) { return false; } + if (isset($item['version'])) { + $item['version'] = trim($item['version']); + } if (isset($item['version']) && $upgradeModel->version != $item['version']) { $where = [ 'version' => $item["version"], -- libgit2 0.21.0
APP版本号安装包名称版本号包名称 升级批次信息 上传时间 发布状态