- {{pageName}}
+ {{pageName}}
{{ t('addArticle') }}
diff --git a/niucloud/app/service/admin/install/InstallSystemService.php b/niucloud/app/service/admin/install/InstallSystemService.php
index ff8d9ce5a..040c9b504 100644
--- a/niucloud/app/service/admin/install/InstallSystemService.php
+++ b/niucloud/app/service/admin/install/InstallSystemService.php
@@ -17,6 +17,7 @@ use app\service\admin\sys\MenuService;
use app\service\core\menu\CoreMenuService;
use core\base\BaseAdminService;
use think\facade\Cache;
+use think\facade\Db;
/**
* 系统安装
@@ -48,7 +49,8 @@ class InstallSystemService extends BaseAdminService
$admin_menus = $this->loadMenu(AppTypeDict::ADMIN);
$site_menus = $this->loadMenu(AppTypeDict::SITE);
$menus = array_merge($admin_menus, $site_menus);
- $sys_menu->where([ [ 'id', '>', 0 ] ])->delete();
+ Db::name("sys_menu")->where([ [ 'id', '>', 0 ] ])->delete();
+ //$sys_menu->where([ [ 'id', '>', 0 ] ])->force(true)->delete();
$sys_menu->replace()->insertAll($menus);
//插件菜单
(new CoreMenuService())->refreshAllAddonMenu();
diff --git a/niucloud/app/service/admin/schedule/ScheduleService.php b/niucloud/app/service/admin/schedule/ScheduleService.php
index ca2dfdaa5..4a0077a82 100644
--- a/niucloud/app/service/admin/schedule/ScheduleService.php
+++ b/niucloud/app/service/admin/schedule/ScheduleService.php
@@ -67,7 +67,7 @@ class ScheduleService extends BaseAdminService
public function add(array $data)
{
$res = (new CoreScheduleService())->add($data);
- return $res->id;
+ return true;
}
@@ -75,6 +75,7 @@ class ScheduleService extends BaseAdminService
* 编辑
* @param int $id
* @param array $data
+ * @return true
*/
public function edit(int $id, array $data)
{
@@ -85,9 +86,19 @@ class ScheduleService extends BaseAdminService
/**
* 删除
* @param int $id
+ * @return true
*/
public function del(int $id)
{
- return (new CoreScheduleService())->del($id);
+ (new CoreScheduleService())->del($id);
+ return true;
+ }
+
+ /**
+ * 计划任务模板
+ * @return array|null
+ */
+ public function getTemplateList(){
+ return (new CoreScheduleService())->getTemplateList();
}
}
\ No newline at end of file
diff --git a/niucloud/app/service/admin/site/SiteService.php b/niucloud/app/service/admin/site/SiteService.php
index 38660d821..ccd000795 100644
--- a/niucloud/app/service/admin/site/SiteService.php
+++ b/niucloud/app/service/admin/site/SiteService.php
@@ -46,7 +46,7 @@ class SiteService extends BaseAdminService
{
$field = 'site_id, site_name, front_end_name, front_end_logo, app_type, keywords, logo, icon, `desc`, status, latitude, longitude, province_id, city_id,
- district_id, address, full_address, phone, business_hours, create_time, expire_time, group_id, site_code';
+ district_id, address, full_address, phone, business_hours, create_time, expire_time, group_id';
$search_model = $this->model->where([ [ 'app_type', '<>', 'admin' ] ])->withSearch([ 'create_time', 'expire_time', 'keywords', 'status', 'group_id' ], $where)->with('groupName')->field($field)->append([ 'status_name' ])->order('create_time desc');
$list = $this->pageQuery($search_model);
return $list;
@@ -60,7 +60,7 @@ class SiteService extends BaseAdminService
public function getInfo(int $site_id)
{
$field = 'site_id, site_name, front_end_name, front_end_logo, app_type, keywords, logo, icon, `desc`, status, latitude, longitude, province_id, city_id,
- district_id, address, full_address, phone, business_hours, create_time, expire_time, group_id, site_code';
+ district_id, address, full_address, phone, business_hours, create_time, expire_time, group_id';
return $this->model->where([ [ 'site_id', '=', $site_id ] ])->with('groupName')->field($field)->append([ 'status_name' ])->findOrEmpty()->toArray();
}
@@ -88,7 +88,6 @@ class SiteService extends BaseAdminService
try {
$site = $this->model->create($data_site);
$site_id = $site->site_id;
- $this->model->where([ [ 'site_id', '=', $site_id ] ])->update([ 'site_code' => $this->createSiteCodeBySiteId($site_id) ]);
//添加用户
$data_user = [
'username' => $data[ 'username' ],
@@ -112,24 +111,6 @@ class SiteService extends BaseAdminService
}
}
- /**
- * 通过站点id生成站点code
- * @param int $site_id
- */
- public function createSiteCodeBySiteId(int $site_id)
- {
- return ( $site_id + 1000000 ) * 11 + 1;
- }
-
- /**
- * 通过站点code获取站点id
- * @param $site_code
- */
- public function getSiteIdBySiteCode($site_code)
- {
- return ( $site_code - 1 ) / 11 - 1000000;
- }
-
/**
* 修改站点
* @param int $site_id
@@ -168,7 +149,7 @@ class SiteService extends BaseAdminService
$where = [
[ 'site_id', '=', $site_id ],
];
- $site = $this->model->where($where)->field('site_id, app_type,site_name,front_end_name,front_end_logo,logo,icon,group_id, status, expire_time, site_code')->append([ 'status_name' ])->findOrEmpty();
+ $site = $this->model->where($where)->field('site_id, app_type,site_name,front_end_name,front_end_logo,logo,icon,group_id, status, expire_time')->append([ 'status_name' ])->findOrEmpty();
return $site->toArray();
},
self::$cache_tag_name . $site_id
diff --git a/niucloud/app/service/admin/stat/SiteStatService.php b/niucloud/app/service/admin/stat/SiteStatService.php
index f062673db..c5b746b1f 100644
--- a/niucloud/app/service/admin/stat/SiteStatService.php
+++ b/niucloud/app/service/admin/stat/SiteStatService.php
@@ -40,64 +40,9 @@ class SiteStatService extends BaseAdminService
*/
public function getIndexData(){
$data = [
-
- 'today_data' => [
- 'member_count' => 1,
- 'order_money' => 1388.5,
- 'visit_count' => 650,
- 'total_member_count' => 0,
- 'total_order_money' => 13851.12,
- 'total_visit_count' => 6580,
- 'total_order_count' => 29
- ],
- 'system' => [],
- 'version' => [],
- 'visit_stat' => [
- 'date' => [],
- 'value' => []
- ],
- 'member_stat' => [
- 'type' => ['男','女','未知'],
- 'value' => []
- ],
'site_info' => '',
- 'about' => [
- [
- 'name' => 'Niucloud官方公众号',
- 'image' => 'static/resource/icon/index_icon/wx_qrcode.jpg',
- 'desc' => '微信扫码关注'
- ],
- [
- 'name' => '添加企业微信群',
- 'image' => 'static/resource/icon/index_icon/wework_qrcode.png',
- 'desc' => '更多内容请扫码加入'
- ]
- ]
+
];
- $data['today_data']['total_member_count'] = (new MemberService())->getCount([['create_time', '>=', Carbon::today()->timestamp]]);
- $data['today_data']['total_order_money'] = $this->orderMoney(Carbon::today()->timestamp, time());
- $data['today_data']['total_order_count'] = $this->orderCount(Carbon::today()->timestamp, time());
- $data['today_data']['total_visit_count'] = (new MemberService())->getCount([['last_visit_time', '>=', Carbon::today()->timestamp]]);
- $data['today_data']['today_member_visit_count'] = (new CoreMemberService())->getCount(['site_id' => $this->site_id,'last_visit_time' => get_start_and_end_time_by_day()]);
-
- $data['total_data']['total_member_count'] = (new MemberService())->getCount();
- $data['total_data']['total_order_money'] = number_format($this->orderMoney(0, time()), 2);
- $data['total_data']['total_order_count'] = $this->orderCount(0, time());
- $data['total_data']['total_visit_count'] = (new MemberService())->getCount();
-
- $data['system'] = (new SystemService())->getInfo();
- $data['version'] = $data['system']['version'] ?? [];
- $time = time();
- for ($i=1; $i<=7; $i++){
- $time_data = date('Y-m-d', strtotime( '+' . $i-7 .' days', $time));
- $data['visit_stat']['date'][] = $time_data;
- $time_arr = get_start_and_end_time_by_day($time_data);
- $data['visit_stat']['value'][] = (new MemberService())->getCount([[ '', 'exp', Db::raw('(`create_time` >= ' . $time_arr[0] . ') and (`create_time` < ' . $time_arr[1] . ')') ]]);
- }
- $member_count = (new MemberService())->getCount();
- $man_count = (new MemberService())->getCount([ ['sex', '=', '1'] ]);
- $woman_count = (new MemberService())->getCount([ ['sex', '=', '2'] ]);
- $data['member_stat']['value'] = [$man_count, $woman_count, (int)($member_count - $man_count - $woman_count)];
$data['site_info'] = (new SiteService())->getInfo($this->site_id);
$site_create_time = strtotime($data['site_info']['create_time']);
$site_expire_time = strtotime($data['site_info']['expire_time']);
diff --git a/niucloud/app/service/admin/sys/AreaService.php b/niucloud/app/service/admin/sys/AreaService.php
index 16601a4bc..94beee2ae 100644
--- a/niucloud/app/service/admin/sys/AreaService.php
+++ b/niucloud/app/service/admin/sys/AreaService.php
@@ -124,7 +124,7 @@ class AreaService extends BaseAdminService
public function getAreaId($name, $level){
$field = 'id';
$info = $this->model->field($field)->where([['name', 'like', '%' . $name . '%' ], ['level', '=', $level]])->findOrEmpty()->toArray();
- return $info;
+ return $info['id'];
}
/**
diff --git a/niucloud/app/service/admin/sys/AttachmentService.php b/niucloud/app/service/admin/sys/AttachmentService.php
index ba9f48cb0..690940b1c 100644
--- a/niucloud/app/service/admin/sys/AttachmentService.php
+++ b/niucloud/app/service/admin/sys/AttachmentService.php
@@ -11,6 +11,8 @@
namespace app\service\admin\sys;
+use app\dict\sys\FileDict;
+use app\dict\sys\IconDict;
use app\model\sys\SysAttachment;
use app\model\sys\SysAttachmentCategory;
use app\service\core\sys\CoreAttachmentService;
@@ -39,7 +41,7 @@ class AttachmentService extends BaseAdminService
*/
public function add(array $data)
{
- $data['site_id'] = $this->site_id;
+ $data[ 'site_id' ] = $this->site_id;
return $this->core_attachment_service->add($data);
}
@@ -63,11 +65,11 @@ class AttachmentService extends BaseAdminService
*/
public function modifyCategory($att_id, $cate_id)
{
- $where = array(
- ['att_id', '=', $att_id],
- ['site_id', '=', $this->site_id],
+ $where = array (
+ [ 'att_id', '=', $att_id ],
+ [ 'site_id', '=', $this->site_id ],
);
- $this->model->where($where)->update(['cate_id' => $cate_id, 'update_time' => time()]);
+ $this->model->where($where)->update([ 'cate_id' => $cate_id, 'update_time' => time() ]);
return true;
}
@@ -80,11 +82,11 @@ class AttachmentService extends BaseAdminService
public function batchModifyCategory($att_ids, $cate_id)
{
- $where = array(
- ['att_id', 'in', is_string($att_ids) ? explode($att_ids) : $att_ids],
- ['site_id', '=', $this->site_id],
+ $where = array (
+ [ 'att_id', 'in', is_string($att_ids) ? explode($att_ids) : $att_ids ],
+ [ 'site_id', '=', $this->site_id ],
);
- $this->model->where($where)->update(['cate_id' => $cate_id, 'update_time' => time()]);
+ $this->model->where($where)->update([ 'cate_id' => $cate_id, 'update_time' => time() ]);
return true;
}
@@ -115,19 +117,22 @@ class AttachmentService extends BaseAdminService
*/
public function getPage(array $data)
{
- $where = array(
- ['site_id', '=', $this->site_id]
+ $where = array (
+ [ 'site_id', '=', $this->site_id ]
);
- if (!empty($data['att_type'])) {
- $where[] = ['att_type', '=', $data['att_type']];
+ if (!empty($data[ 'att_type' ])) {
+ $where[] = [ 'att_type', '=', $data[ 'att_type' ] ];
}
- if (!empty($data['cate_id'])) {
- $where[] = ['cate_id', '=', $data['cate_id']];
+ if (!empty($data[ 'cate_id' ])) {
+ $where[] = [ 'cate_id', '=', $data[ 'cate_id' ] ];
}
- if (!empty($data['real_name'])) {
- $where[] = ['real_name', 'like', '%' . $data['real_name'] . '%'];
+ if (!empty($data[ 'real_name' ])) {
+ $where[] = [ 'real_name', 'like', '%' . $data[ 'real_name' ] . '%' ];
}
- return $this->getPageList($this->model, $where, 'att_id,path,real_name,att_type,url', 'att_id desc');
+ return $this->getPageList($this->model, $where, 'att_id,path,real_name,att_type,url', 'att_id desc', each:function($item, $key)
+ {
+ $item[ 'thumb' ] = get_thumb_images($this->site_id, $item[ 'url' ], FileDict::SMALL);
+ });
}
/**
@@ -136,7 +141,7 @@ class AttachmentService extends BaseAdminService
*/
public function addCategory(array $data)
{
- $data['site_id'] = $this->site_id;
+ $data[ 'site_id' ] = $this->site_id;
$category_model = new SysAttachmentCategory();
$attachment = $category_model->create($data);
if (!$attachment->id)
@@ -151,9 +156,9 @@ class AttachmentService extends BaseAdminService
*/
public function findCategory(int $site_id, int $id)
{
- $where = array(
- ['site_id', '=', $site_id],
- ['id', '=', $id]
+ $where = array (
+ [ 'site_id', '=', $site_id ],
+ [ 'id', '=', $id ]
);
$category_model = new SysAttachmentCategory();
$category = $category_model->where($where)->findOrEmpty();
@@ -169,9 +174,9 @@ class AttachmentService extends BaseAdminService
*/
public function editCategory(int $id, array $data)
{
- $where = array(
- ['site_id', '=', $this->site_id],
- ['id', '=', $id]
+ $where = array (
+ [ 'site_id', '=', $this->site_id ],
+ [ 'id', '=', $id ]
);
$category_model = new SysAttachmentCategory();
return $category_model->where($where)->update($data);
@@ -186,7 +191,7 @@ class AttachmentService extends BaseAdminService
{
//查询是否有下级菜单或按钮
$category = $this->findCategory($this->site_id, $id);
- if ($this->model->where([['cate_id', '=', $id]])->count() > 0)
+ if ($this->model->where([ [ 'cate_id', '=', $id ] ])->count() > 0)
throw new AdminException('ATTACHMENT_GROUP_HAS_IMAGE');
//下级存在图片不能删除
@@ -203,16 +208,16 @@ class AttachmentService extends BaseAdminService
*/
public function getCategoryPage(array $data)
{
- $where = array(
- ['site_id', '=', $this->site_id]
+ $where = array (
+ [ 'site_id', '=', $this->site_id ]
);
- if (!empty($data['type'])) {
- $where[] = ['type', '=', $data['type']];
+ if (!empty($data[ 'type' ])) {
+ $where[] = [ 'type', '=', $data[ 'type' ] ];
}
- if (!empty($data['name'])) {
- $where[] = ['name', 'like', '%' . $data['name'] . '%'];
+ if (!empty($data[ 'name' ])) {
+ $where[] = [ 'name', 'like', '%' . $data[ 'name' ] . '%' ];
}
- return $this->getPageList((new SysAttachmentCategory()), $where, 'id,name', 'id desc');
+ return $this->getPageList(( new SysAttachmentCategory() ), $where, 'id,name', 'id desc');
}
/**
@@ -222,16 +227,90 @@ class AttachmentService extends BaseAdminService
*/
public function getCategoryList(array $data)
{
- $where = array(
- ['site_id', '=', $this->site_id]
+ $where = array (
+ [ 'site_id', '=', $this->site_id ]
);
- if (!empty($data['type'])) {
- $where[] = ['type', '=', $data['type']];
+ if (!empty($data[ 'type' ])) {
+ $where[] = [ 'type', '=', $data[ 'type' ] ];
}
- if (!empty($data['name'])) {
- $where[] = ['name', 'like', '%' . $data['name'] . '%'];
+ if (!empty($data[ 'name' ])) {
+ $where[] = [ 'name', 'like', '%' . $data[ 'name' ] . '%' ];
}
return SysAttachmentCategory::where($where)->field('id,name,type')->order('id desc')->select()->toArray();
}
+ /**
+ * 获取图标库分类列表
+ * @param array $data
+ * @return array|null
+ */
+ public function getIconCategoryList(array $data)
+ {
+ $icon_list = IconDict::getIcon();
+ foreach ($icon_list as $k => $v) {
+ unset($icon_list[ $k ][ 'glyphs' ]);
+ if (!empty($data[ 'name' ]) && strpos($v[ 'name' ], $data[ 'name' ]) === false) {
+ unset($icon_list[ $k ]);
+ }
+ }
+ $icon_list = array_values($icon_list);
+ return $icon_list;
+ }
+
+ /**
+ * 获取图标库列表
+ * @param array $data
+ * @return array|null
+ */
+ public function getIconList(array $data)
+ {
+ $icon_list = IconDict::getIcon();
+
+ $res = [
+ 'current_page' => intval($data[ 'page' ]),
+ 'per_page' => intval($data[ 'limit' ]),
+ 'data' => [],
+ 'total' => 0
+ ];
+
+ $temp_data = [];
+
+ foreach ($icon_list as $k => $v) {
+
+ $icon = $icon_list[ $k ][ 'glyphs' ]; // 图标列表
+
+ foreach ($icon as $ck => $cv) {
+ // 素材表中数据保持要一致
+ $icon[ $ck ][ 'att_id' ] = $cv[ 'icon_id' ];
+ $icon[ $ck ][ 'url' ] = $icon_list[ $k ][ 'font_family' ] . '-' . $icon_list[ $k ][ 'css_prefix_text' ] . $cv[ 'font_class' ];
+ $icon[ $ck ][ 'real_name' ] = $cv[ 'name' ];
+
+ // 查询名称
+ if (!empty($data[ 'real_name' ]) && strpos($cv[ 'name' ], $data[ 'real_name' ]) === false) {
+ unset($icon[ $ck ]);
+ }
+ }
+
+ $icon = array_values($icon);
+
+ if (!empty($data[ 'cate_id' ]) && $data[ 'cate_id' ] == $v[ 'id' ]) {
+ // 查询指定分类下的图标
+ $temp_data = $icon;
+ break;
+ } else {
+ // 查询全部图标
+ $temp_data = array_merge($temp_data, $icon);
+ }
+ }
+
+ // 手动分页
+ $res[ 'total' ] = count($temp_data); // 总数量
+ $start = ( $res[ 'current_page' ] - 1 ) * $res[ 'per_page' ]; // 数组下标从0 开始
+ $icon_list = array_slice($temp_data, $start, $res[ 'per_page' ]);
+
+ $res[ 'data' ] = $icon_list;
+
+ return $res;
+ }
+
}
\ No newline at end of file
diff --git a/niucloud/app/service/admin/sys/ConfigService.php b/niucloud/app/service/admin/sys/ConfigService.php
index 0859d18eb..3e1482993 100644
--- a/niucloud/app/service/admin/sys/ConfigService.php
+++ b/niucloud/app/service/admin/sys/ConfigService.php
@@ -164,6 +164,31 @@ class ConfigService extends BaseAdminService
$config['value'] = [
'view_path' => 'index/site_index'
];
+ }else{
+ $result = event("SiteIndex");
+ $index_list = [];
+ foreach ($result as $k => $v)
+ {
+ $index_list = empty($index_list) ? $v: array_merge($index_list, $v);
+ }
+ $tag = 0;
+ $view_path = $config['value']['view_path'];
+ foreach ($index_list as $k => $v)
+ {
+ $v_view_path = $v['view_path'] ?? '';
+ if($view_path == $v_view_path)
+ {
+ $tag = 1;
+ break;
+ }
+ }
+ if($tag == 0)
+ {
+ $config['value'] = [
+ 'view_path' => 'index/site_index'
+ ];
+ }
+
}
return $config['value']['view_path'];
}
@@ -235,9 +260,16 @@ class ConfigService extends BaseAdminService
$menu = $config['value'] ?? [];
if(!empty($menu)){
$menu_service = new MenuService();
- foreach($menu as &$v){
- $item_router_path = $v['router_path'] ?? '';
- if(!$item_router_path) $v['router_path'] = $menu_service->getFullRouterPath($v['menu_key']);
+ foreach($menu as $k => &$v){
+ $menu_key = $v['menu_key'] ?? '';
+ if($menu_key != ''){
+ $item_router_path = $menu_service->getFullRouterPath($menu_key);
+ if(empty($item_router_path)){
+ unset($v[$k]);
+ }else{
+ $v['router_path'] = $item_router_path;
+ }
+ }
}
}
return $menu;
diff --git a/niucloud/app/service/admin/sys/MenuService.php b/niucloud/app/service/admin/sys/MenuService.php
index 48668f316..0e8d54d1c 100644
--- a/niucloud/app/service/admin/sys/MenuService.php
+++ b/niucloud/app/service/admin/sys/MenuService.php
@@ -380,7 +380,8 @@ class MenuService extends BaseAdminService
* @return string
*/
public function getFullRouterPath($menu_key){
- $menu = $this->find($menu_key);
+ $menu = $this->model->where([['menu_key', '=', $menu_key]])->findOrEmpty($menu_key);
+ if($menu->isEmpty()) return '';
$parents = [];
$this->getParentDirectory($menu, $parents);
$parents = array_reverse($parents);
diff --git a/niucloud/app/service/admin/sys/SystemService.php b/niucloud/app/service/admin/sys/SystemService.php
index 306dfbf38..7474ddfe0 100644
--- a/niucloud/app/service/admin/sys/SystemService.php
+++ b/niucloud/app/service/admin/sys/SystemService.php
@@ -48,16 +48,13 @@ class SystemService extends BaseAdminService
*/
public function getUrl()
{
- $site = Site::find($this->site_id);
- $site_tag = $site[ 'site_code' ];
-
$wap_domain = !empty(env("system.wap_domain")) ? preg_replace('#/$#', '', env("system.wap_domain")) : request()->domain();
$web_domain = !empty(env("system.web_domain")) ? preg_replace('#/$#', '', env("system.web_domain")) : request()->domain();
$data = [
'wap_domain' => env("system.wap_domain"),
- 'wap_url' => $wap_domain . "/wap/" . $site_tag,
- 'web_url' => $web_domain . "/web/" . $site_tag,
+ 'wap_url' => $wap_domain . "/wap/" . $this->site_id,
+ 'web_url' => $web_domain . "/web/" . $this->site_id,
];
return $data;
}
diff --git a/niucloud/app/service/admin/file/StorageConfigService.php b/niucloud/app/service/admin/upload/StorageConfigService.php
similarity index 98%
rename from niucloud/app/service/admin/file/StorageConfigService.php
rename to niucloud/app/service/admin/upload/StorageConfigService.php
index 326dda844..5a1daa02a 100644
--- a/niucloud/app/service/admin/file/StorageConfigService.php
+++ b/niucloud/app/service/admin/upload/StorageConfigService.php
@@ -9,7 +9,7 @@
// | Author: Niucloud Team
// +----------------------------------------------------------------------
-namespace app\service\admin\file;
+namespace app\service\admin\upload;
use app\dict\sys\StorageDict;
use app\service\core\upload\CoreStorageService;
diff --git a/niucloud/app/service/admin/file/UploadConfigService.php b/niucloud/app/service/admin/upload/UploadConfigService.php
similarity index 97%
rename from niucloud/app/service/admin/file/UploadConfigService.php
rename to niucloud/app/service/admin/upload/UploadConfigService.php
index bb18ec8a4..5af2842f8 100644
--- a/niucloud/app/service/admin/file/UploadConfigService.php
+++ b/niucloud/app/service/admin/upload/UploadConfigService.php
@@ -9,7 +9,7 @@
// | Author: Niucloud Team
// +----------------------------------------------------------------------
-namespace app\service\admin\file;
+namespace app\service\admin\upload;
use app\model\sys\SysConfig;
use app\service\core\upload\CoreUploadConfigService;
diff --git a/niucloud/app/service/admin/file/UploadService.php b/niucloud/app/service/admin/upload/UploadService.php
similarity index 88%
rename from niucloud/app/service/admin/file/UploadService.php
rename to niucloud/app/service/admin/upload/UploadService.php
index 08af08edb..909c4162d 100644
--- a/niucloud/app/service/admin/file/UploadService.php
+++ b/niucloud/app/service/admin/upload/UploadService.php
@@ -9,7 +9,7 @@
// | Author: Niucloud Team
// +----------------------------------------------------------------------
-namespace app\service\admin\file;
+namespace app\service\admin\upload;
use app\dict\sys\FileDict;
use app\dict\sys\StorageDict;
@@ -29,8 +29,8 @@ class UploadService extends BaseAdminService
/**
* 附件库上传图片
+ * @param $file
* @param int $cate_id
- * @param string $dir
* @return array
*/
public function image($file, int $cate_id = 0){
@@ -55,14 +55,14 @@ class UploadService extends BaseAdminService
/**
* 文件上传
* @param $file
- * @param bool $is_local
+ * @param string $type
* @return array
*/
- public function document($file, string $type,bool $is_local = false){
+ public function document($file, string $type){
if(!in_array($type, FileDict::getSceneType()))
- throw new UploadFileException('CERT_TYPE_ERROR');
+ throw new UploadFileException('UPLOAD_TYPE_ERROR');
$dir = $this->root_path.'/document/'.$type.'/'.$this->site_id.'/'.date('Ym').'/'.date('d');
$core_upload_service = new CoreUploadService();
- return $core_upload_service->document($file, $this->site_id, $type, $dir, StorageDict::LOCAL, true);
+ return $core_upload_service->document($file, $this->site_id, $type, $dir, StorageDict::LOCAL);
}
}
\ No newline at end of file
diff --git a/niucloud/app/service/admin/weapp/WeappPackageService.php b/niucloud/app/service/admin/weapp/WeappPackageService.php
new file mode 100644
index 000000000..84ae7dc53
--- /dev/null
+++ b/niucloud/app/service/admin/weapp/WeappPackageService.php
@@ -0,0 +1,35 @@
+model = new Applet();
+ }
+
+ public function add(array $data)
+ {
+ $data['version_num'] = version_to_int($data['version']);//版本号数字
+ $data['u'] = $this->uid;//发布者
+ $data['status'] = '';
+ }
+}
\ No newline at end of file
diff --git a/niucloud/app/service/admin/weapp/WeappTemplateService.php b/niucloud/app/service/admin/weapp/WeappTemplateService.php
index 03f202f70..50434361f 100644
--- a/niucloud/app/service/admin/weapp/WeappTemplateService.php
+++ b/niucloud/app/service/admin/weapp/WeappTemplateService.php
@@ -69,15 +69,15 @@ class WeappTemplateService extends BaseAdminService
public function syncItem($item){
$key = $item['key'] ?? '';
$weapp = $item['weapp'] ?? [];
- $temp_key = $weapp['temp_key'] ?? '';
- if(empty($temp_key)) $error = 'WECHAT_TEMPLATE_NEED_NO';
+ $tid = $weapp['tid'] ?? '';
+ if(empty($tid)) $error = 'WECHAT_TEMPLATE_NEED_NO';
$weapp_template_id = $item['weapp_template_id'];
//删除原来的消息模板
$template_loader = (new TemplateLoader(NoticeTypeDict::WEAPP, ['site_id' => $this->site_id]));
$template_loader->delete(['template_id' => $weapp_template_id ]);
// (new CoreWeappTemplateService())->deleteTemplate($this->site_id, $weapp_template_id);
//新的消息模板
- $tid = $weapp['tid'] ?? '';
+
$kid_list = $weapp['kid_list'] ?? [];
$scene_desc = $weapp['scene_desc'] ?? '';
// $res = (new CoreWeappTemplateService())->addTemplate($this->site_id, $tid, $kid_list, $scene_desc);
diff --git a/niucloud/app/service/api/article/ArticleService.php b/niucloud/app/service/api/article/ArticleService.php
index 0c7277caf..78eb0d7f4 100644
--- a/niucloud/app/service/api/article/ArticleService.php
+++ b/niucloud/app/service/api/article/ArticleService.php
@@ -38,7 +38,7 @@ class ArticleService extends BaseApiService
$where[] = [ 'site_id', '=', $this->site_id ];
$field = 'id, category_id, site_id, title, intro, summary, image, author, content, visit, visit_virtual, is_show, sort, create_time, update_time';
$order = 'create_time desc';
- $search_model = $this->model->where([ [ 'site_id', '=', $this->site_id ] ])->withSearch([ 'title', 'category_id'], $where)->with('articleCategory')->field($field)->order($order);
+ $search_model = $this->model->where([ [ 'site_id', '=', $this->site_id ] ])->withSearch([ 'title', 'category_id'], $where)->with('articleCategory')->field($field)->order($order)->append(['image_thumb_mid']);
return $this->pageQuery($search_model);
}
@@ -54,7 +54,7 @@ class ArticleService extends BaseApiService
$where[] = [ 'site_id', '=', $this->site_id ];
$field = 'id, category_id, site_id, title, intro, summary, image, author, content, visit, visit_virtual, is_show, sort, create_time, update_time';
$order = 'create_time desc';
- return $this->model->where([ [ 'site_id', '=', $this->site_id ] , ['is_show', '=', 1]])->withSearch([ 'title', 'category_id', 'ids' ], $where)->limit($limit)->with('articleCategory')->field($field)->order($order)->select()->toArray();
+ return $this->model->where([ [ 'site_id', '=', $this->site_id ] , ['is_show', '=', 1]])->withSearch([ 'title', 'category_id', 'ids' ], $where)->limit($limit)->with('articleCategory')->field($field)->append(['image_thumb_mid'])->order($order)->select()->toArray();
}
/**
@@ -65,7 +65,7 @@ class ArticleService extends BaseApiService
{
$field = 'id, category_id, site_id, title, intro, summary, image, author, content, visit, visit_virtual, is_show, sort, create_time, update_time';
- return $this->model->with('articleCategory')->field($field)->where([ [ 'id', '=', $id ], [ 'site_id', '=', $this->site_id ] ])->findOrEmpty()->toArray();
+ return $this->model->with('articleCategory')->field($field)->where([ [ 'id', '=', $id ], [ 'site_id', '=', $this->site_id ] ])->append(['image_thumb_big'])->findOrEmpty()->toArray();
}
}
\ No newline at end of file
diff --git a/niucloud/app/service/api/login/AuthService.php b/niucloud/app/service/api/login/AuthService.php
index 1e547d531..dfcfb4e78 100644
--- a/niucloud/app/service/api/login/AuthService.php
+++ b/niucloud/app/service/api/login/AuthService.php
@@ -50,14 +50,13 @@ class AuthService extends BaseApiService
* @return true
*/
public function checkSite(Request $request){
- $site_code = $request->apiSiteId();//todo 可以是依赖传值,也可以通过domain域名来获取site_id
- $site_info = (new CoreSiteService())->getSiteInfoBySiteCode($site_code);
+ $site_id = $request->apiSiteId();//todo 可以是依赖传值,也可以通过domain域名来获取site_id
+ $site_info = (new CoreSiteService())->getSiteCache($site_id);
if(empty($site_info)) throw new AuthException('SITE_NOT_EXIST');
if($site_info['status'] == SiteDict::CLOSE){
$rule = trim(strtolower($request->rule()->getRule()));
if($rule != 'site') throw new AuthException('SITE_CLOSE_NOT_ALLOW');
}
- $site_id = $site_info['site_id'];
$request->siteId($site_id);
return true;
}
diff --git a/niucloud/app/service/api/notice/NoticeService.php b/niucloud/app/service/api/notice/NoticeService.php
index fc662bdb5..1aa8149e5 100644
--- a/niucloud/app/service/api/notice/NoticeService.php
+++ b/niucloud/app/service/api/notice/NoticeService.php
@@ -11,6 +11,7 @@
namespace app\service\api\notice;
+use app\model\sys\SysNotice;
use core\base\BaseApiService;
/**
@@ -36,4 +37,14 @@ class NoticeService extends BaseApiService
{
return ( new \app\service\core\notice\NoticeService() )->send($this->site_id, $key, $data);
}
+
+ /**
+ * 获取微信小程序订阅消息模板id
+ * @param string $keywords
+ * @return void
+ */
+ public function getWeappNoticeTemplateId(string $keys) {
+ $column = (new SysNotice())->where([ ['site_id', '=', $this->site_id], ['key', 'in', explode(',', $keys) ], ['weapp_template_id', '<>', ''], ['is_weapp', '=', 1] ])->column('weapp_template_id');
+ return $column;
+ }
}
\ No newline at end of file
diff --git a/niucloud/app/service/api/upload/UploadService.php b/niucloud/app/service/api/upload/UploadService.php
index 103d03f09..be58b7cb5 100644
--- a/niucloud/app/service/api/upload/UploadService.php
+++ b/niucloud/app/service/api/upload/UploadService.php
@@ -11,9 +11,11 @@
namespace app\service\api\upload;
+use app\dict\sys\FileDict;
use app\dict\sys\StorageDict;
use app\service\core\upload\CoreUploadService;
use core\base\BaseApiService;
+use core\exception\UploadFileException;
/**
* 用户服务层
@@ -54,13 +56,14 @@ class UploadService extends BaseApiService
/**
* 文件上传
* @param $file
- * @param bool $is_local
* @return array
*/
- public function document($file, bool $is_local = false)
+ public function document($file, string $type = '')
{
- $dir = $this->root_path . '/' . 'document' . '/' . $this->site_id . '/' . date('Ym') . '/' . date('d');
+ if(!in_array($type, FileDict::getSceneType()))
+ throw new UploadFileException('UPLOAD_TYPE_ERROR');
+ $dir = $this->root_path.'/document/'.$type.'/'.$this->site_id.'/'.date('Ym').'/'.date('d');
$core_upload_service = new CoreUploadService();
- return $core_upload_service->document($file, $this->site_id, '', $dir, StorageDict::LOCAL);
+ return $core_upload_service->document($file, $this->site_id, $type, $dir, StorageDict::LOCAL);
}
}
\ No newline at end of file
diff --git a/niucloud/app/service/core/addon/CoreAddonInstallService.php b/niucloud/app/service/core/addon/CoreAddonInstallService.php
index bfbc5730b..7cf636f1f 100644
--- a/niucloud/app/service/core/addon/CoreAddonInstallService.php
+++ b/niucloud/app/service/core/addon/CoreAddonInstallService.php
@@ -40,13 +40,13 @@ class CoreAddonInstallService extends CoreAddonBaseService
'wap' => [],
'resource' => []
];
- //安装流程
+
+ // 安装流程
private $flow_path = [
'file',
'sql',
'menu',
- 'diy',
- ''
+ 'diy'
];
/**
@@ -60,12 +60,12 @@ class CoreAddonInstallService extends CoreAddonBaseService
];
private $addon;
- private $install_addon_path;//待安装的插件目录
+ private $install_addon_path;// 待安装的插件目录
- //对象实例
+ // 对象实例
public static $instance;
- //状态关键字
+ // 状态关键字
const WAIT_INSTALL = 'wait_install';
const DIR_INSTALLED = 'dir_installed';
@@ -73,6 +73,7 @@ class CoreAddonInstallService extends CoreAddonBaseService
const SQL_INSTALLED = 'sql_installed';
const MENU_INSTALLED = 'menu_installed';
+
const SCHEDULE_INSTALLED = 'schedule_installed';
const WAIT_DEPEND = 'wait_depend';
@@ -101,7 +102,6 @@ class CoreAddonInstallService extends CoreAddonBaseService
return self::$instance;
}
-
public function __construct($addon)
{
parent::__construct();
@@ -122,11 +122,13 @@ class CoreAddonInstallService extends CoreAddonBaseService
$from_web_dir = $this->install_addon_path . "web" . DIRECTORY_SEPARATOR;
$from_wap_dir = $this->install_addon_path . "uni-app" . DIRECTORY_SEPARATOR;
$from_resource_dir = $this->install_addon_path . "resource" . DIRECTORY_SEPARATOR;
+
// 放入的文件
$to_admin_dir = $this->root_path . "admin" . DIRECTORY_SEPARATOR;
$to_web_dir = $this->root_path . "web" . DIRECTORY_SEPARATOR;
$to_wap_dir = $this->root_path . "uni-app" . DIRECTORY_SEPARATOR;
$to_resource_dir = public_path() . "addon" . DIRECTORY_SEPARATOR . $this->addon . DIRECTORY_SEPARATOR;
+
// 配置文件
$package_path = $this->install_addon_path . 'package' . DIRECTORY_SEPARATOR;
$package_file = [];
@@ -172,7 +174,7 @@ class CoreAddonInstallService extends CoreAddonBaseService
array_column($data[ 'runtime' ], 'status'),
[ $data[ 'job_normal' ] ]
);
- if (count($data['conflict_files'])) array_push($check_res, false);
+ if (count($data[ 'conflict_files' ])) array_push($check_res, false);
// 是否通过校验
$data[ 'is_pass' ] = !in_array(false, $check_res);
@@ -216,7 +218,6 @@ class CoreAddonInstallService extends CoreAddonBaseService
}
}
-
//检测wap的uniapp文件
if (is_dir($from_wap_dir)) {
search_dir($from_wap_dir, $this->install_files[ "wap" ]);
@@ -441,6 +442,7 @@ class CoreAddonInstallService extends CoreAddonBaseService
$from_web_dir = $this->install_addon_path . "web" . DIRECTORY_SEPARATOR;
$from_wap_dir = $this->install_addon_path . "uni-app" . DIRECTORY_SEPARATOR;
$from_resource_dir = $this->install_addon_path . "resource" . DIRECTORY_SEPARATOR;
+
// 放入的文件
$to_admin_dir = $this->root_path . "admin" . DIRECTORY_SEPARATOR;
$to_web_dir = $this->root_path . "web" . DIRECTORY_SEPARATOR;
@@ -450,6 +452,8 @@ class CoreAddonInstallService extends CoreAddonBaseService
// 安装admin管理端
if (file_exists($from_admin_dir)) {
dir_copy($from_admin_dir, $to_admin_dir, $this->files[ 'admin' ]);
+ // 编译后台图标库文件
+ $this->compileAdminIcon();
}
// 安装电脑端
@@ -466,6 +470,7 @@ class CoreAddonInstallService extends CoreAddonBaseService
if (file_exists($from_resource_dir)) {
dir_copy($from_resource_dir, $to_resource_dir, $this->files[ 'resource' ]);
}
+
$this->state = self::DIR_INSTALLED;
return true;
}
@@ -502,7 +507,6 @@ class CoreAddonInstallService extends CoreAddonBaseService
}
}
Db::commit();
- // 返回订单信息
return true;
} catch (PDOException $e) {
Db::rollback();
@@ -559,16 +563,20 @@ class CoreAddonInstallService extends CoreAddonBaseService
if (empty($core_addon_service->getInfoByKey($this->addon))) throw new AddonException('NOT_UNINSTALL');
if (!$this->uninstallSql()) throw new AddonException();
if (!$this->uninstallDir()) throw new AddonException();
+
// 卸载菜单
$this->uninstallMenu();
+
// 卸载计划任务
$this->uninstallSchedule();
+
// 卸载wap
$this->uninstallWap();
$core_addon_service = new CoreAddonService();
$core_addon_service->delByKey($this->addon);
Cache::set("local_install_addons", []);
+
//清理缓存
Cache::tag(self::$cache_tag_name)->clear();
return true;
@@ -585,12 +593,10 @@ class CoreAddonInstallService extends CoreAddonBaseService
$from_web_dir = $this->install_addon_path . "web" . DIRECTORY_SEPARATOR;
$from_wap_dir = $this->install_addon_path . "uni-app" . DIRECTORY_SEPARATOR;
-
search_dir($from_admin_dir, $from_admin_dirs, $from_admin_dir);
search_dir($from_web_dir, $from_web_dirs, $from_web_dir);
search_dir($from_wap_dir, $from_wap_dirs, $from_wap_dir);
-
// 将要删除的根目录
$to_admin_dir = $this->root_path . "admin" . DIRECTORY_SEPARATOR;
$to_web_dir = $this->root_path . "web" . DIRECTORY_SEPARATOR;
@@ -600,6 +606,8 @@ class CoreAddonInstallService extends CoreAddonBaseService
// 卸载admin管理端
if (file_exists($from_admin_dir)) {
dir_remove($to_admin_dir, $from_admin_dirs ?? []);
+ // 编译后台图标库文件
+ $this->compileAdminIcon();
}
// 卸载pc端
@@ -772,7 +780,7 @@ class CoreAddonInstallService extends CoreAddonBaseService
*/
public function installSchedule()
{
- ( new CoreScheduleInstallService())->installAddonSchedule($this->addon);
+ ( new CoreScheduleInstallService() )->installAddonSchedule($this->addon);
$this->state = self::SCHEDULE_INSTALLED;
return true;
}
@@ -783,7 +791,32 @@ class CoreAddonInstallService extends CoreAddonBaseService
*/
public function uninstallSchedule()
{
- ( new CoreScheduleInstallService())->uninstallAddonSchedule($this->addon);
+ ( new CoreScheduleInstallService() )->uninstallAddonSchedule($this->addon);
+ return true;
+ }
+
+ /**
+ * 编译后台图标库文件
+ * 图标开发注意事项，不能占用 iconfont、icon 关键词（会跟系统图标冲突），建议增加业务前缀，比如 旅游业：tourism
+ * @return bool
+ */
+ public function compileAdminIcon()
+ {
+ $compile_path = $this->root_path . str_replace('/', DIRECTORY_SEPARATOR, 'admin/src/styles/icon/');
+
+ $content = "";
+ $root_path = $compile_path . 'addon'; // 插件图标根目录
+ $file_arr = getFileMap($root_path);
+ if (!empty($file_arr)) {
+ foreach ($file_arr as $ck => $cv) {
+ if (strpos($cv, '.css') !== false) {
+ $path = str_replace($root_path . '/', '', $ck);
+ $path = str_replace('/.css', '', $path);
+ $content .= "@import \"addon/{$path}\";\n";
+ }
+ }
+ }
+ $res = file_put_contents($compile_path . 'addon-iconfont.css', $content);
return true;
}
diff --git a/niucloud/app/service/core/addon/WapTrait.php b/niucloud/app/service/core/addon/WapTrait.php
index b6efe10eb..03f9858d8 100644
--- a/niucloud/app/service/core/addon/WapTrait.php
+++ b/niucloud/app/service/core/addon/WapTrait.php
@@ -35,6 +35,7 @@ trait WapTrait
$content .= " \n";
+ $content .= " \n";
$root_path = $compile_path . str_replace('/', DIRECTORY_SEPARATOR, 'components/diy'); // 扩展组件根目录
$file_arr = getFileMap($root_path);
@@ -58,9 +59,9 @@ trait WapTrait
$name = implode('', $name_arr);
$file_name = 'diy-' . $path;
- $content .= " \n";
- $content .= " <$file_name :component=\"component\" :index=\"index\">\n";
- $content .= " \n";
+ $content .= " \n";
+ $content .= " <$file_name :component=\"component\" :index=\"index\" :pullDownRefresh=\"props.pullDownRefresh\">\n";
+ $content .= " \n";
}
}
}
@@ -75,11 +76,11 @@ trait WapTrait
$content .= "\n";
$content .= "
