周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 02e499af5795ce3911b18f0b5a88ba51f7e2e1c9 2 个父辈 02e185d8 415b138c

Merge remote-tracking branch 'origin/master' into akun

内嵌 并排对比
正在显示 12 个修改的文件 包含 302 行增加 和 21 行删除
... ... @@ -12,6 +12,7 @@ use App\Models\Nav\BNav;
use App\Models\Nav\BNavGroup;
use App\Models\Project\OnlineCheck;
use App\Models\Project\Project;
use App\Models\Project\ProjectUpdateTdk;
use App\Models\SyncSubmitTask\SyncSubmitTask as SyncSubmitTaskModel;
use App\Models\WebSetting\Translate as TranslateModel;
use App\Models\WebSetting\WebLanguage;
... ... @@ -58,6 +59,13 @@ class Test extends Command
*/
public function handle()
{
$ids = '295,792,1788,968,1678,1408,1780,104,1720,160,1337,1382,1773,1787,1261,1872,185,1889,1823,1572,696,1632,1504,1042,1252,491,1867,1277,1712,1939,1577,499,1812,1852,235,732,388,1848,1880,1885,1920,826,1368,1535,1679,1584,1665,773,1841,1303,1442,13,1591,1894,2066,1887,1888,1817,1778,1673,1391,1751,1607,2010,1483,2062,2000,2019,2091,1602,1985,1514,1768,1703,1596,1955,1989,1900,1373,1779,1619,1824,404,1869,1891,1215,1589,1686,1322,1681,1378,1487,1431,1133,1415,1876,1911,1672,1992,1715,1929,1171,1997,1816,1842,2017,2107,1644,2104,2201,1468,2092,211,2097,1993,829,2124,1241';
$ids = explode(',' ,$ids);
foreach ($ids as $id){
ProjectUpdateTdk::add_task($id);
}
exit;
$date = '2024-05-16';
$list = $this->getProjectList();
foreach ($list as $item){
... ...
... ... @@ -76,6 +76,9 @@ class ExtensionModuleController extends BaseController
$v['is_use'] = 1;
}
$list[$k] = $v;
if(!empty($v['data'])){
$v['data'] = json_decode($v['data'],true);
}
}
$this->response('success',Code::SUCCESS,$list);
}
... ... @@ -224,7 +227,34 @@ class ExtensionModuleController extends BaseController
* @time :2024/8/20 10:31
*/
public function sendUniqueStr(){
$uniqueString = md5(time() . rand(1000, 9999));
$this->request->validate([
'id'=>'required',
],[
'id.required' => '字段id不能为空',
]);
$uniqueString = '';
//查看当前字段id的data
$moduleFieldModel = new ExtensionModuleField();
$info = $moduleFieldModel->read(['id'=>$this->param['id']]);
if(empty($info['data'])){
$uniqueString = md5(time() . rand(1000, 9999));
}else{
$data = json_decode($info['data']);
foreach ($data as $v){
foreach ($v as $k => $sonV){
if($k == 1){
$uniqueString .= $sonV;
}elseif ($k == 2){
$uniqueString .= date('YmdHis');
}elseif ($k == 3){
$uniqueString .= uniqid();
}else{
$randomString = md5(uniqid(mt_rand(), true));
$uniqueString .= substr($randomString, 0, (int)$sonV);
}
}
}
}
$this->response('success',Code::SUCCESS,['str'=>$uniqueString]);
}
}
... ...
... ... @@ -14,6 +14,7 @@ use App\Models\Project\Project;
use App\Services\AmazonS3Service;
use App\Services\CosService;
use App\Services\TencentCosService;
use App\Services\UpyunService;
use Illuminate\Http\Exceptions\HttpResponseException;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Cache;
... ... @@ -514,4 +515,72 @@ class ImageController extends Controller
$data = ['image_download'=>url('a/download_images?path='.$info['path']), 'name' => $info['name']];
$this->response('success',Code::SUCCESS,$data);
}
/**
* @remark :覆盖原图
* @name :coverOriginalImage
* @author :lyh
* @method :post
* @time :2024/8/21 11:45
*/
public function coverOriginalImage(){
$this->request->validate([
'url'=>['required'],
'saveUrl'=>['required'],
],[
'url.required'=>'请填写预览的链接',
'saveUrl.required'=>'保存的路径',
]);
$cos = new CosService();
$url = $cos->coverOriginalImage($this->param['url'],$this->param['saveUrl']);
$upYun = new UpyunService();
$upYun->purgePush($url);
$this->response('success',Code::SUCCESS,['url'=>$url]);
}
/**
* @remark :设置图片水印
* @name :setWatermark
* @author :lyh
* @method :post
* @time :2024/8/21 9:15
*/
public function setWatermark(){
$this->request->validate([
'url'=>['required'],
'is_image'=>['required'],
],[
'url.required'=>'请填写需要处理图片的相对路径',
'is_image.required'=>'请设置文本水印还是图片水印',
]);
$cos = new CosService();
$url = $cos->setWatermark($this->param['url'], $this->param['data'],$this->param['is_image']);
$this->response('success',Code::SUCCESS,['url'=>$url]);
}
/**
* @remark :获取字体
* @name :getFont
* @author :lyh
* @method :post
* @time :2024/8/21 9:47
*/
public function getFont(){
$cos = new CosService();
$data = $cos->getFont();
$this->response('success',Code::SUCCESS,$data);
}
/**
* @remark :处理9宫格数据
* @name :getPosition
* @author :lyh
* @method :post
* @time :2024/8/21 9:47
*/
public function getPosition(){
$cos = new CosService();
$data = $cos->getPosition();
$this->response('success',Code::SUCCESS,$data);
}
}
... ...
... ... @@ -114,7 +114,7 @@ class BTemplateLogic extends BaseLogic
$condition = ['common_type'=>BTemplate::COMMON_HEAD,'source'=>'','is_list'=>$is_list,'is_custom'=>$is_custom,'template_id'=>$template_id];
$headComInfo = $this->getHeadComHtml($condition,$source,$is_list,$is_custom,$template_id);
$bTemplateComModel = new BTemplateCom();
$otherInfo = $bTemplateComModel->read(['source'=>$headComInfo['source'],'common_type'=>BTemplate::COMMON_OTHER,'is_list'=>$headComInfo['is_list'],'is_custom'=>$headComInfo['is_custom']]);
$otherInfo = $bTemplateComModel->read(['source'=>$headComInfo['source'],'common_type'=>BTemplate::COMMON_OTHER,'is_list'=>$headComInfo['is_list'],'is_custom'=>$headComInfo['is_custom'],'template_id'=>$template_id]);
if($otherInfo === false){
$this->fail('获取失败，请联系管理员222');
}
... ... @@ -139,7 +139,7 @@ class BTemplateLogic extends BaseLogic
$headComInfo = $bTemplateComModel->read($condition);
if($headComInfo === false){
//取默认公共的
$headComInfo = $bTemplateComModel->read(['source'=>BTemplate::SOURCE_COM,'common_type'=>BTemplate::COMMON_HEAD]);
$headComInfo = $bTemplateComModel->read(['source'=>BTemplate::SOURCE_COM,'common_type'=>BTemplate::COMMON_HEAD,'template_id'=>$template_id]);
if($headComInfo === false){
$this->fail('获取失败，请联系管理员111');
}
... ... @@ -160,7 +160,7 @@ class BTemplateLogic extends BaseLogic
$footerComInfo = $bTemplateComModel->read($condition);
if($footerComInfo === false){
//取默认首页的
$footerComInfo = $bTemplateComModel->read(['source'=>BTemplate::SOURCE_COM,'common_type'=>BTemplate::COMMON_FOOTER]);
$footerComInfo = $bTemplateComModel->read(['source'=>BTemplate::SOURCE_COM,'common_type'=>BTemplate::COMMON_FOOTER,'template_id'=>$template_id]);
if($footerComInfo === false){
$this->fail('获取失败，请联系管理员');
}
... ...
... ... @@ -51,33 +51,50 @@ class CustomTemplateLogic extends BaseLogic
$this->fail('当前数据不存在');
}
if($info['is_visualization'] == 0 || $info['is_visualization'] == 1){
$html = $this->getTemplateComHtml($info['html'],$info['html_style']);
$template_id = $this->getTemplateId();
$html = $this->getTemplateComHtml($info['html'],$info['html_style'],$template_id);
$info['html'] = $this->getHeadFooter($html);
}
return $this->success($info);
}
/**
* @remark :获取模版id
* @name :getTemplateId
* @author :lyh
* @method :post
* @time :2023/12/27 10:51
*/
public function getTemplateId(){
$bSettingModel = new Setting();
$bSettingInfo = $bSettingModel->read(['project_id'=>$this->user['project_id']],['id','template_id']);
if($bSettingInfo === false){
$this->fail('请先设置模板');
}
return $this->success($bSettingInfo['template_id']);
}
/**
* @remark :非定制获取头部+底部
* @name :getTemplateComHtml
* @author :lyh
* @method :post
* @time :2024/4/29 16:53
*/
public function getTemplateComHtml($html,$html_style){
public function getTemplateComHtml($html,$html_style,$template_id){
if(empty($html)){
$html = "<main></main>";
$html_style = "<style id='globalsojs-styles'></style>";
}
$headComInfo = $this->getHeadComHtml(['common_type'=>BTemplate::COMMON_HEAD]);
$headComInfo = $this->getHeadComHtml(['common_type'=>BTemplate::COMMON_HEAD,'template_id'=>$template_id]);
$bTemplateComModel = new BTemplateCom();
$condition['common_type'] = BTemplate::COMMON_OTHER;
$condition['source'] = $headComInfo['source'];
$condition['template_id'] = $template_id;
$otherInfo = $bTemplateComModel->read($condition);
if($otherInfo === false){
$this->fail('获取失败，请联系管理员');
}
$footerComInfo = $this->getFooterComHtml();
$footerComInfo = $this->getFooterComHtml($template_id);
$commonInfo = ['head_html'=>$headComInfo['html'] ?? '', 'head_style'=>$headComInfo['html_style'] ?? '', 'other'=>$otherInfo['html'] ?? '',
'footer_html'=>$footerComInfo['html'] ?? '','footer_style'=>$footerComInfo['html_style'] ?? ''];
$html = $commonInfo['head_style'].$html_style.$commonInfo['footer_style'].$commonInfo['other']. $commonInfo['head_html'].$html.$commonInfo['footer_html'];
... ... @@ -98,6 +115,7 @@ class CustomTemplateLogic extends BaseLogic
$headComInfo = $bTemplateComModel->read($condition);
if($headComInfo === false){
//取默认公共的
$template_id = $this->getTemplateId();
$condition['source'] = BTemplate::SOURCE_COM;
$headComInfo = $bTemplateComModel->read($condition);
if($headComInfo === false){
... ... @@ -113,12 +131,14 @@ class CustomTemplateLogic extends BaseLogic
* @method :post
* @time :2024/4/29 17:18
*/
public function getFooterComHtml(){
public function getFooterComHtml($template_id){
$bTemplateComModel = new BTemplateCom();
$condition['template_id'] = $template_id;
$condition['common_type'] = BTemplate::COMMON_FOOTER;
$condition['source'] = $this->getType(BTemplate::COMMON_FOOTER);
$footerComInfo = $bTemplateComModel->read($condition);
if($footerComInfo === false){
$template_id = $this->getTemplateId();
//取默认首页的
$condition['source'] = BTemplate::SOURCE_COM;
$footerComInfo = $bTemplateComModel->read($condition);
... ...
... ... @@ -57,6 +57,7 @@ class InitHtmlLogic extends BaseLogic
$html = $commonInfo['head_style'].$main_style.$commonInfo['footer_style'].$commonInfo['other'].$commonInfo['head_html'].$main_html.$commonInfo['footer_html'];
$html = $this->getHeadFooter($html);//组装数据
$data['html'] = $html;
$data['template_id'] = $template_id;
return $this->success($data);
}
... ... @@ -71,7 +72,7 @@ class InitHtmlLogic extends BaseLogic
$condition = ['common_type'=>BTemplate::COMMON_HEAD,'source'=>$source,'is_list'=>$is_list,'is_custom'=>$is_custom,'template_id'=>$template_id];
$headComInfo = $this->getHeadComHtml($condition,$source,$is_list,$is_custom,$template_id);
$bTemplateComModel = new BTemplateCom();
$otherInfo = $bTemplateComModel->read(['source'=>$headComInfo['source'],'common_type'=>BTemplate::COMMON_OTHER,'is_list'=>$headComInfo['is_list'],'is_custom'=>$headComInfo['is_custom']]);
$otherInfo = $bTemplateComModel->read(['template_id'=>$template_id,'source'=>$headComInfo['source'],'common_type'=>BTemplate::COMMON_OTHER,'is_list'=>$headComInfo['is_list'],'is_custom'=>$headComInfo['is_custom']]);
if($otherInfo === false){
$this->fail('获取失败，请联系管理员2');
}
... ... @@ -96,7 +97,7 @@ class InitHtmlLogic extends BaseLogic
$headComInfo = $bTemplateComModel->read($condition);
if($headComInfo === false){
//取默认公共的
$headComInfo = $bTemplateComModel->read(['source'=>BTemplate::SOURCE_COM,'common_type'=>BTemplate::COMMON_HEAD]);
$headComInfo = $bTemplateComModel->read(['source'=>BTemplate::SOURCE_COM,'common_type'=>BTemplate::COMMON_HEAD,'template_id'=>$template_id]);
if($headComInfo === false){
$this->fail('获取失败，请联系管理员1');
}
... ... @@ -117,7 +118,7 @@ class InitHtmlLogic extends BaseLogic
$footerComInfo = $bTemplateComModel->read($condition);
if($footerComInfo === false){
//取默认首页的
$footerComInfo = $bTemplateComModel->read(['source'=>BTemplate::SOURCE_COM,'common_type'=>BTemplate::COMMON_FOOTER]);
$footerComInfo = $bTemplateComModel->read(['source'=>BTemplate::SOURCE_COM,'common_type'=>BTemplate::COMMON_FOOTER,'template_id'=>$template_id]);
if($footerComInfo === false){
$this->fail('获取失败，请联系管理员3');
}
... ...
... ... @@ -39,7 +39,16 @@ class ExtensionModuleFieldLogic extends BaseLogic
if($info !== false){
$this->fail('当前字段名已存在');
}
$id = $this->model->addReturnId($this->param);
if(isset($this->param['data']) && !empty($this->param['data'])){
$this->param['data'] = json_encode($this->param['data']);
}
if(isset($this->param['id']) && !empty($this->param['id'])){
$id = $this->param['id'];
$this->model->edit($this->param,['id'=>$id]);
}else{
$id = $this->model->addReturnId($this->param);
}
return $this->success(['id'=>$id]);
}
... ... @@ -53,11 +62,11 @@ class ExtensionModuleFieldLogic extends BaseLogic
public function delModuleField(){
//查看当前字段是否在使用
$moduleValueModel = new ExtensionModuleValue();
$info = $moduleValueModel->read(['filed_id'=>$this->param['filed_id']]);
$info = $moduleValueModel->read(['field_id'=>$this->param['field_id']]);
if($info !== false){
$this->fail('当前字段正在使用中,不允许删除');
}
$this->model->del(['id'=>$this->param['filed_id']]);
$this->model->del(['id'=>$this->param['field_id']]);
return $this->success();
}
}
... ...
... ... @@ -182,18 +182,18 @@ class CosService
South：底部中间
SouthEast：右下角
*/
public function addFieldImage($cdnUrl = '',$data = [],$is_image = false){
public function setWatermark($cdnUrl = '',$data = [],$is_image = false){
$domain = 'http://globalso-v6-1309677403.cos.ap-hongkong.myqcloud.com';//cos域名
$url = $domain . $cdnUrl;
if($is_image){
$param = [
'image/'.$this->urlSafeBase64Encode($domain.$data['image'] ?? ''),//文字水印名称
'image/'.$this->urlSafeBase64Encode($domain.$data['image'] ?? ''),//图片
'gravity/'.($data['gravity'] ?? 'SouthEast'),
'dx/'.($data['dx'] ?? 0),
'dy/'. ($data['dy'] ?? 0),
'batch/'.($data['batch'] ?? 0),//平铺水印功能
'dissolve/'.($data['dissolve'] ?? 50),//透明度
'degree/'.($data['degree'] ?? 0),//文字水印的旋转角度设置，取值范围为0 - 360，默认0
'degree/'.($data['degree'] ?? 0),//旋转角度设置，取值范围为0 - 360，默认0
];
$url = $url.'?watermark/1/'.implode('/',$param);
}else{
... ... @@ -216,13 +216,13 @@ class CosService
}
/**
* @remark :添加水印后保存图片（覆盖）
* @remark :添加水印后保存图片（覆盖/非覆盖的文件未存入数据库）
* @name :uploadImages
* @author :lyh
* @method :post
* @time :2024/8/19 17:06
*/
public function uploadImages($url,$cdnUrl){
public function coverOriginalImage($url,$cdnUrl){
// 获取水印后的图片内容
$imageContent = file_get_contents($url);
// 使用 COS SDK 将图片重新上传并覆盖原图
... ...
<?php
/**
* Created by PhpStorm.
* User: zhl
* Date: 2024/8/20
* Time: 11:01
*/
namespace App\Services;
class UpyunService
{
/**
* 刷新进度查询
* @param $task_id
* @return mixed
*/
public function purgePull($task_id)
{
$action = '/purge';
if (FALSE == is_array($task_id))
$task_id = [$task_id];
$task_ids = implode(',', $task_id);
$param = [
'task_ids' => $task_ids, // 需要查询进度的 task_id
];
list($status, $result) = $this->curlRequest($action, $param, 'GET', $this->getHeader());
return $result;
}
/**
* URL 刷新
* @param $url
* @return mixed
*/
public function purgePush($url)
{
$action = '/purge';
if (FALSE == is_array($url))
$url = [$url];
$urls = implode(PHP_EOL, $url);
$param = [
'bucket' => '',
'urls' => $urls, // 需要批量刷新的文件 URL，多个 URL 通过换行符分隔
];
list($status, $result) = $this->curlRequest($action, $param, 'POST', $this->getHeader());
return $result;
}
/**
* URL 预热
* @param $url
* @return mixed
*/
public function preheatPush($url)
{
$action = '/preheat';
if (FALSE == is_array($url))
$url = [$url];
$urls = implode(PHP_EOL, $url);
$param = [
'bucket' => '',
'urls' => $urls, // 需要批量刷新的文件 URL，多个 URL 通过换行符分隔
'range_bytes' => ''
];
list($status, $result) = $this->curlRequest($action, $param, 'POST', $this->getHeader());
return $result;
}
/**
* 头信息需要携带授权token
* @return array
*/
public function getHeader()
{
return [
'Authorization: Bearer ' . config('custom.upyun.token'),
];
}
/**
* @param $url
* @param $data
* @param string $method
* @param array $header
* @param int $time_out
* @return array
*/
public function curlRequest($url, $data, $method = 'POST', $header = [], $time_out = 60)
{
$url = config('custom.upyun.api_url') . $url;
$ch = curl_init();
curl_setopt($ch, CURLOPT_TIMEOUT, $time_out);
curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, FALSE);
if ($data)
curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data));
curl_setopt($ch, CURLOPT_HTTPHEADER, array_merge([
'Expect:',
'Content-type: application/json',
'Accept: application/json',
], $header)
);
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
$response = curl_exec($ch);
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
curl_close($ch);
return [$code, $response];
}
/**
* 创建token
* 该功能请不要重复使用
* 注意：出于安全考虑，token 只有在调用该接口创建时返回一次，后续无法再通过其他接口查询token值，调用该接口后，请务必记录token值
* {"access_token":"fe64817b-1f32-46f3-9ac3-a2993725708a","name":"v6-66c4333f60644","scope":"global","services":[],"created_at":1724134209,"expired_at":9999999999}
* @return mixed
*/
public function createToken()
{
$action = '/oauth/tokens';
$param = [
'username' => '', // 用户名
'password' => '', // 密码
'code' => md5(uniqid()), // 20-32位随机字符串，每次请求不能重复。只能包含数字、字母和中划线
'name' => 'v6-' . uniqid(), // token 备注名，长度 20 的字符串，不能和其他 token 重复
'scope' => 'global', // 权限 Valid Values:'global''bucket''operator''domain''cache''log''stats''oauth''security''srs'
// 'expired_at' => '', // integer token 过期时间的秒级时间戳，当该参数不设置时，表示永不过期
];
list($status, $result) = $this->curlRequest($action, $param);
return $result;
}
}
\ No newline at end of file
... ...
... ... @@ -24,5 +24,10 @@ return [
["69.172.229.12","69.172.229.13","69.172.229.14","69.172.229.15","69.172.229.16","69.172.229.36","69.172.229.59","69.172.229.60","69.172.229.61","69.172.229.62","69.172.229.63","69.172.229.64","69.172.229.65"],
["69.172.233.75","69.172.233.76","69.172.233.77","69.172.233.78","69.172.233.79","69.172.233.80","69.172.233.81","69.172.233.82","69.172.233.83","69.172.233.84","69.172.233.85","69.172.233.86","69.172.233.87"],
["76.74.220.18","76.74.220.19","76.74.220.20","76.74.220.21","76.74.220.22","76.74.220.23","76.74.220.24","76.74.220.25","76.74.220.26","76.74.220.27","76.74.220.28","76.74.220.29","76.74.220.30"],
["64.34.205.152","64.34.205.170","64.34.205.171","64.34.205.172","64.34.205.173","64.34.205.174","64.34.205.210","64.34.205.211","64.34.205.212","64.34.205.213","64.34.205.214","64.34.205.215","64.34.205.216"]]
["64.34.205.152","64.34.205.170","64.34.205.171","64.34.205.172","64.34.205.173","64.34.205.174","64.34.205.210","64.34.205.211","64.34.205.212","64.34.205.213","64.34.205.214","64.34.205.215","64.34.205.216"]],
'upyun' => [
'api_url' => 'https://api.upyun.com',
'token' => 'fe64817b-1f32-46f3-9ac3-a2993725708a',
],
];
... ...
... ... @@ -253,6 +253,8 @@ Route::middleware(['aloginauth'])->group(function () {
//图片操作
Route::prefix('images')->group(function () {
Route::post('/upload', [\App\Http\Controllers\File\ImageController::class, 'upload'])->name('images_upload');
Route::post('/getFont', [\App\Http\Controllers\File\ImageController::class, 'getFont'])->name('images_getFont');
Route::post('/getPosition', [\App\Http\Controllers\File\ImageController::class, 'getPosition'])->name('images_getPosition');
Route::post('/getDownloadUrl', [\App\Http\Controllers\File\ImageController::class, 'getDownloadUrl'])->name('images_getDownloadUrl');
});
//文件操作
... ...
... ... @@ -316,6 +316,10 @@ Route::middleware(['bloginauth'])->group(function () {
//图片操作
Route::prefix('images')->group(function () {
Route::post('/upload', [\App\Http\Controllers\File\ImageController::class, 'upload'])->name('image_upload');
Route::post('/getFont', [\App\Http\Controllers\File\ImageController::class, 'getFont'])->name('images_getFont');
Route::post('/getPosition', [\App\Http\Controllers\File\ImageController::class, 'getPosition'])->name('images_getPosition');
Route::post('/setWatermark', [\App\Http\Controllers\File\ImageController::class, 'setWatermark'])->name('images_setWatermark');
Route::post('/coverOriginalImage', [\App\Http\Controllers\File\ImageController::class, 'coverOriginalImage'])->name('images_coverOriginalImage');
Route::any('/getImageList', [\App\Http\Controllers\File\ImageController::class, 'getImageList'])->name('image_getImageList');
});
//文件操作
... ...