周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 9c550b654857e94f955e24c8e0cd55c419460565 2 个父辈 666f00cf 99cb7996

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

内嵌 并排对比
正在显示 8 个修改的文件 包含 24 行增加 和 37 行删除
... ... @@ -238,24 +238,9 @@ class SyncProject extends Command
* @time :2023/8/30 15:53
*/
public function saveProject($param){
if(isset($param['level']) && !empty($param['level'])){
$param['level'] = Arr::arrToSet($param['level']);
}
if(isset($param['channel']) && !empty($param['channel'])){
$param['channel'] = Arr::a2s($param['channel']);
}
if(isset($param['notice_file']) && !empty($param['notice_file'])){
foreach ($param['notice_file'] as &$v1) {
$v1['url'] = basename($v1['url']);
}
$param['notice_file'] = Arr::a2s($param['notice_file']);
}
if(isset($param['confirm_file']) && !empty($param['confirm_file'])){
foreach ($param['confirm_file'] as &$v2) {
$v2['url'] = basename($v2['url']);
}
$param['confirm_file'] = Arr::a2s($param['confirm_file']);
}
$projectModel = new Project();
return $projectModel->addReturnId($param);
}
... ... @@ -282,9 +267,6 @@ class SyncProject extends Command
protected function savePayment($param,$id){
$param['project_id'] = $id;
$paymentModel= new Payment();
if(isset($param['renewal_record']) && !empty($param['renewal_record'])){
$param['renewal_record'] = Arr::a2s($param['renewal_record']);
}
if(isset($param['contract']) && !empty($param['contract'])){
$param['contract'] = Arr::a2s($param['contract']);
}
... ... @@ -319,12 +301,6 @@ class SyncProject extends Command
*/
protected function saveDeployOptimize($param,$id){
$param['project_id'] = $id;
if(isset($param['minor_languages']) && !empty($param['minor_languages'])){
$param['minor_languages'] = Arr::a2s($param['minor_languages']);
}
if(isset($param['minor_keywords']) && !empty($param['minor_keywords'])){
$param['minor_keywords'] = Arr::a2s($param['minor_keywords']);
}
$deployOptimizeModel = new DeployOptimize();
return $deployOptimizeModel->add($param);
}
... ...
... ... @@ -74,13 +74,21 @@ class TaskController extends BaseController
$map['manage_id'] = $this->map['manage_id'];
}
}
}
if(isset($this->map['manage_id']) && !empty($this->map['manage_id'])){
}elseif (isset($this->map['content']) && !empty($this->map['content'])){
$ids = $task->where('content', 'like','%'.$this->map['content'].'%')->pluck('id')->toArray();
$manage_ids = $taskOwnerModel->formatQuery(['task_id'=>['in',$ids]])->pluck('manage_id')->toArray();
$map['manage_id'] = ['in',$manage_ids];
}elseif (isset($this->map['search_type']) && !empty($this->map['search_type'])){
if(isset($this->map['search']) && !empty($this->map['search'])) {
$projectModel = new Project();
$ids = $projectModel->where('title', 'like', '%' . $this->map['search'] . '%')->pluck('id')->toArray();
$manage_ids = $taskOwnerModel->formatQuery(['project'=>['in',$ids]])->pluck('manage_id')->toArray();
$map['manage_id'] = ['in',$manage_ids];
}
}else{
$map['manage_id'] = $this->map['manage_id'];
}
if(isset($this->map['content']) && !empty($this->map['content'])){
}
return $map;
}
... ...
... ... @@ -18,6 +18,7 @@ use App\Helper\Wechat;
use App\Http\Logic\Bside\User\UserLogic;
use App\Http\Logic\Bside\User\UserLoginLogic;
use App\Models\File\Image as ImageModel;
use App\Models\Project\Project;
use App\Models\Service\Service;
use App\Models\Sms\SmsLog;
use App\Models\Template\Template;
... ...
... ... @@ -117,13 +117,13 @@ class ProjectLogic extends BaseLogic
}
if(isset($param['notice_file']) && !empty($param['notice_file'])){
foreach ($param['notice_file'] as &$v1) {
$v1['url'] = basename($v1['url']);
$v1['url'] = str_replace_url($v1['url']);
}
$param['notice_file'] = Arr::a2s($param['notice_file']);
}
if(isset($param['confirm_file']) && !empty($param['confirm_file'])){
foreach ($param['confirm_file'] as &$v2) {
$v2['url'] = basename($v2['url']);
$v2['url'] = str_replace_url($v2['url']);
}
$param['confirm_file'] = Arr::a2s($param['confirm_file']);
}
... ...
... ... @@ -29,17 +29,17 @@ class ServiceLogic extends BaseLogic
case 'images':
$arr = explode(',',$v['values']);
foreach ($arr as $k1 => $v1){
$v['images_link'][$k1] = url('a/image/'.$v1);
$v['images_link'][$k1] = getImageUrl($v1);
}
break;
case 'android':
$v['android_link'] = url('a/image/'.$v['values']);
$v['android_link'] = getImageUrl($v['values']);
break;
case 'official_account':
$v['android_link'] = url('a/image/'.$v['values']);
$v['android_link'] = getImageUrl($v['values']);
break;
case 'ios':
$v['ios_link'] = url('a/image/'.$v['values']);
$v['ios_link'] = getImageUrl($v['values']);
break;
}
$lists[$k] = $v;
... ...
... ... @@ -186,6 +186,8 @@ class BTemplateLogic extends BaseLogic
$this->model->edit($this->param,['id'=>$info['id']]);
}
$this->setTemplateLog($this->param);
//路由映射
RouteMap::setRoute('index', RouteMap::SOURCE_PAGE, 0, $this->user['project_id']);
DB::commit();
}catch (\Exception $e){
DB::rollBack();
... ...
... ... @@ -155,7 +155,7 @@ class UserLoginLogic
$info['from_order_id'] = $project['from_order_id'] ?? '';
$info['aicc'] = $project['aicc'] ?? '';
$info['hagro'] = $project['hagro'] ?? '';
$info['plan'] = $project['deploy_build']['plan'];
$info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
$info['domain'] = (!empty($project['deploy_optimize']['domain']) ?
$project['deploy_optimize']['domain'] : ($project['deploy_build']['test_domain'] ?? ''));
//保存项目缓存
... ...
... ... @@ -226,7 +226,7 @@ class Project extends Base
$value = Arr::s2a($value);
if(!empty($value)) {
foreach ($value as &$v) {
$v['url'] = getImageUrl($v['url']);
$v['url'] = getFileUrl($v['url']);
}
}
return $value;
... ... @@ -245,7 +245,7 @@ class Project extends Base
$value = Arr::s2a($value);
if(!empty($value)) {
foreach ($value as &$v) {
$v['url'] = getImageUrl($v['url']);
$v['url'] = getFileUrl($v['url']);
}
}
return $value;
... ...