作者 lyh

Merge branch 'master-server' of http://47.244.231.31:8099/zhl/globalso-v6

... ... @@ -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(){
$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]);
}
}
... ...
... ... @@ -514,4 +514,50 @@ 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 :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'],true);
$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);
}
}
... ...
... ... @@ -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);
}
... ... @@ -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,6 +39,9 @@ class ExtensionModuleFieldLogic extends BaseLogic
if($info !== false){
$this->fail('当前字段名已存在');
}
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]);
... ... @@ -59,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,7 +182,7 @@ 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){
... ...
<?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,9 @@ 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::any('/getImageList', [\App\Http\Controllers\File\ImageController::class, 'getImageList'])->name('image_getImageList');
});
//文件操作
... ...