合并分支 'lyh-server' 到 'master'

变更数据



查看合并请求 !3196

@@ -93,6 +93,7 @@ class Project5CateController extends BaseController
             $this->response('当前项目不存在或数据未同步',Code::SYSTEM_ERROR);
             $this->response('当前项目不存在或数据未同步',Code::SYSTEM_ERROR);
         }
         }
         $project5CateModel = new Project5Cate();
         $project5CateModel = new Project5Cate();
+        //todo::目前写死，上线放开
         $projectInfo['website'] = 'https://devmark.globalso.com/';
         $projectInfo['website'] = 'https://devmark.globalso.com/';
         $action = $project5CateModel->saveCateTypeAction($this->param['type']);
         $action = $project5CateModel->saveCateTypeAction($this->param['type']);
         $url = $projectInfo['website'].'wp-admin/admin-ajax.php?action='.$action;
         $url = $projectInfo['website'].'wp-admin/admin-ajax.php?action='.$action;

@@ -39,7 +39,7 @@ class GeoConf extends Base
             return $optimize;
             return $optimize;
         }
         }
         // 没有搜索条件时使用缓存
         // 没有搜索条件时使用缓存
-        $key = 'geo_manage_list_' . date('Ymd');
+        $key = 'geo_manage_list';
         $optimize = Cache::get($key);
         $optimize = Cache::get($key);
         if (empty($optimize)) {
         if (empty($optimize)) {
             $optimize = ManageHr::where(function($query) {
             $optimize = ManageHr::where(function($query) {